Jonathan Williams
|
a395cae764
|
Fixes for Custom tag
Fix for Bridge time
Fix for tournament auto whitelist.
Added UI stuf for tourney
Added build files for arcade.
|
2014-09-13 20:50:27 -10:00 |
|
Shaun Bennett
|
8659422877
|
Merge remote-tracking branch 'origin/master'
|
2014-09-14 00:29:37 -05:00 |
|
Shaun Bennett
|
c1bc9fca2e
|
Small treasure tweaks
|
2014-09-14 00:29:30 -05:00 |
|
Chiss
|
26a51f4ef2
|
Re-allowed opening of chests (for GUIs) during games.
|
2014-09-14 15:28:43 +10:00 |
|
Chiss
|
f3df86a5a9
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-09-14 14:10:51 +10:00 |
|
Chiss
|
7e3b9b4b3a
|
some 1.8 title stuff
|
2014-09-14 14:10:40 +10:00 |
|
Shaun Bennett
|
fc44592edf
|
Merge remote-tracking branch 'origin/master'
|
2014-09-13 23:07:21 -05:00 |
|
Shaun Bennett
|
228cca4805
|
fix bug with reward amounts
|
2014-09-13 23:07:15 -05:00 |
|
Jonathan Williams
|
7ad7dd939d
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-09-12 22:00:18 -10:00 |
|
Jonathan Williams
|
1c3326333d
|
Fix for crash.
|
2014-09-12 21:59:12 -10:00 |
|
Jonathan Williams
|
4f5430e390
|
Added tournament stuff.
|
2014-09-12 21:52:44 -10:00 |
|
Chiss
|
e31ab1b37a
|
disabled treasure again!
|
2014-09-13 16:44:51 +10:00 |
|
Chiss
|
054709a859
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
|
2014-09-13 16:44:11 +10:00 |
|
Chiss
|
31c4a95da5
|
Disabled Treasure Chests
|
2014-09-13 16:43:18 +10:00 |
|
Shaun Bennett
|
1e7ed8d491
|
Treasure rewards + some minor fixes
|
2014-09-13 01:25:14 -05:00 |
|
Jonathan Williams
|
a196e43fde
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
|
2014-09-12 19:46:19 -10:00 |
|
Shaun Bennett
|
0afb0f061c
|
Changes to fireworks animation
|
2014-09-12 23:43:38 -05:00 |
|
Shaun Bennett
|
aafdc555b1
|
Oops, accidentally removed some code!
|
2014-09-12 23:41:50 -05:00 |
|
Shaun Bennett
|
0f44850367
|
Treasure stuff
|
2014-09-12 23:30:00 -05:00 |
|
Shaun Bennett
|
5e9cbcef75
|
Merge remote-tracking branch 'origin/master'
|
2014-09-12 23:15:58 -05:00 |
|
Shaun Bennett
|
71f42c6e7b
|
Treasure updates
|
2014-09-12 23:15:53 -05:00 |
|
Chiss
|
a31e20d709
|
treasure styles
|
2014-09-13 14:09:50 +10:00 |
|
Chiss
|
4454627b32
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-09-13 13:41:48 +10:00 |
|
Chiss
|
e511df4605
|
Merge treasure
|
2014-09-13 13:41:37 +10:00 |
|
Shaun Bennett
|
fc6a2633c9
|
Remove debug message, make sure player is far enough from spawn to open treasure
|
2014-09-12 22:41:10 -05:00 |
|
Shaun Bennett
|
88ef0ce35b
|
Merge remote-tracking branch 'origin/master'
|
2014-09-12 22:33:28 -05:00 |
|
Shaun Bennett
|
a8eeef02dd
|
Adjustments to how treasure rewards are selected
|
2014-09-12 22:33:22 -05:00 |
|
Chiss
|
e36f843feb
|
Fixed bug in MineStrike
|
2014-09-13 12:29:35 +10:00 |
|
Chiss
|
f0fa3469df
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-09-13 09:17:50 +10:00 |
|
Chiss
|
58f784187b
|
UHC Manager for Hub
|
2014-09-13 09:13:46 +10:00 |
|
Jonathan Williams
|
14c4152248
|
Fixed CustomTagFix.
Updated ServerData ServerGroup and SErverMonitor for new flags in Arcade.
|
2014-09-12 10:03:33 -10:00 |
|
Shaun Bennett
|
20680acea0
|
More treasure rewards + tweaks
|
2014-09-12 14:24:30 -05:00 |
|
Shaun Bennett
|
dea6c98fc9
|
Merge remote-tracking branch 'origin/master'
|
2014-09-12 14:08:22 -05:00 |
|
Shaun Bennett
|
4ea786a1a5
|
Fix fireworks for 1.8 client, a bunch more treasure stuff
|
2014-09-12 14:08:10 -05:00 |
|
Chiss
|
5de59b6e0e
|
Hub UHC countdown basics
UHC MOTD timer stuff
|
2014-09-12 18:06:51 +10:00 |
|
Chiss
|
b5152bd621
|
removed some redundant repeated color stuff
|
2014-09-12 11:59:32 +10:00 |
|
Chiss
|
b507571403
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
Plugins/Mineplex.Database/.classpath
|
2014-09-12 11:49:18 +10:00 |
|
Chiss
|
fba1d0e430
|
Required for merge
|
2014-09-12 11:48:32 +10:00 |
|
Chiss
|
0dff0412d1
|
Fixed game flag for not allowing inventory opens
Removed some redundant flags in game
Lots of MineStrike updates
Fixed NPE in WinWithoutLosingTeammateStatTracker
|
2014-09-12 11:47:39 +10:00 |
|
CoderTim
|
f5f9ba6bdf
|
Added .project and .classpath for Mineplex.Database
|
2014-09-11 17:10:24 -04:00 |
|
Chiss
|
092e9ba479
|
Modified UHC borders for release
|
2014-09-11 17:44:57 +10:00 |
|
Chiss
|
2791d54040
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-09-11 13:43:34 +10:00 |
|
Chiss
|
56263718d7
|
Fix for BossBar
|
2014-09-11 13:17:57 +10:00 |
|
Shaun Bennett
|
b910c5098c
|
Cross version Holograms (Alignment might be a tad off)
A bunch of stuff for Treasure Chests
|
2014-09-10 12:16:31 -05:00 |
|
Shaun Bennett
|
32bbecd01a
|
Merge remote-tracking branch 'origin/master'
|
2014-09-09 19:27:16 -05:00 |
|
Shaun Bennett
|
c4ad00bef1
|
add armor stand hologram, just to send code to laptop
|
2014-09-09 19:27:05 -05:00 |
|
CoderTim
|
235cf8cae7
|
Fixed win stats on solo games
|
2014-09-09 02:18:20 -04:00 |
|
Chiss
|
7bbb7ca545
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-09-09 10:53:03 +10:00 |
|
Chiss
|
1943dbeaab
|
Removing PermissionsEx dependency for MapParser
|
2014-09-09 10:52:51 +10:00 |
|
CoderTim
|
b341089cfe
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-09-08 16:28:50 -04:00 |
|