Ty
|
36d6a58e0a
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GroupStatusData.java
Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
|
2014-08-11 15:39:56 -04:00 |
|
Shaun Bennett
|
d63137ead2
|
Merge remote-tracking branch 'origin/master'
|
2014-08-11 12:44:28 -05:00 |
|
Shaun Bennett
|
4006c454c3
|
Change order of events when enabling a gadget (Fixes bug where switching gadgets while a gadget is enabled doesn't show up on gadget page)
|
2014-08-11 12:39:26 -05:00 |
|
Shaun Bennett
|
482b964580
|
Display particles when shouldDisplay() is true instead of false
|
2014-08-11 12:30:03 -05:00 |
|
Shaun Bennett
|
7e93ed657f
|
Display boss bar properly while a dragon mount is spawned in arcade
|
2014-08-11 12:26:56 -05:00 |
|
Chiss
|
02270a9d25
|
TNT effect only triggers off self tnt.
|
2014-08-11 15:33:45 +10:00 |
|
Chiss
|
7191d48bd0
|
fixed paintball pre-game bug
|
2014-08-11 14:25:11 +10:00 |
|
Chiss
|
e4871c4988
|
Disabling cosmetics 5s before game starts, was having some carryover due to lag.
|
2014-08-11 11:55:00 +10:00 |
|
Chiss
|
d81b32bd3a
|
Sneaky Assassins balance+polish
|
2014-08-10 21:05:41 +10:00 |
|
Chiss
|
06bcf5079b
|
Disabled Gem hunter (bugged?)
Disabled chicken morph letting people fly
|
2014-08-10 18:36:18 +10:00 |
|
Chiss
|
25b525837f
|
Fixed TNT blowing up lobby when it changed to prepare.
|
2014-08-10 11:07:05 +10:00 |
|
Chiss
|
9057246ab8
|
Arcade Inventory fixes
|
2014-08-10 10:50:31 +10:00 |
|
Chiss
|
3533ce1b7e
|
Particles dont play in stealth games.
|
2014-08-10 01:04:53 +10:00 |
|
Chiss
|
53221e267e
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-08-10 00:57:17 +10:00 |
|
Chiss
|
7aa017772f
|
Spectators will not play particle effects
ALL rank no longer displays on morphs.
|
2014-08-10 00:55:51 +10:00 |
|
Jonathan Williams
|
e50c179e8d
|
Fixed pet tag price.
|
2014-08-09 09:49:00 -05:00 |
|
Jonathan Williams
|
43862ea6bf
|
Moved Particles to Admin and up only.
|
2014-08-09 09:44:00 -05:00 |
|
Jonathan Williams
|
cfd1d868b5
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-09 09:41:07 -05:00 |
|
Jonathan Williams
|
f15e539841
|
Added showing of only 3 full servers in server menu.
|
2014-08-09 09:40:59 -05:00 |
|
Chiss
|
616a0ecf11
|
Staff get all kits unlocked.
|
2014-08-10 00:32:50 +10:00 |
|
Chiss
|
38fd85335f
|
Fixes disguises being disabled.
|
2014-08-10 00:21:45 +10:00 |
|
Chiss
|
62cc422f42
|
FINAL FIX
|
2014-08-10 00:13:04 +10:00 |
|
Chiss
|
c95cf79aa6
|
fxied more
|
2014-08-10 00:10:08 +10:00 |
|
Chiss
|
a43a5b2c0e
|
bacon brawl fix
signel game ultra shows in hub scoreboard
|
2014-08-10 00:09:39 +10:00 |
|
Chiss
|
21b89d2771
|
removed particle debug
|
2014-08-09 23:36:36 +10:00 |
|
Chiss
|
59859b168f
|
Fixed multi-morphs
|
2014-08-09 23:34:12 +10:00 |
|
Chiss
|
1a6540b4d0
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-08-09 23:25:26 +10:00 |
|
Chiss
|
3d1ddecffb
|
Smash Kit fix
Gem Booster (dragons) fix
|
2014-08-09 23:25:13 +10:00 |
|
Jonathan Williams
|
dffc56e3e0
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-09 08:11:01 -05:00 |
|
Chiss
|
cac7f85410
|
Single game ultra kit unlock
|
2014-08-09 23:10:40 +10:00 |
|
Jonathan Williams
|
dbf59a032b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-09 08:08:41 -05:00 |
|
Jonathan Williams
|
0cdfda7765
|
Fixed message on free timer.
|
2014-08-09 08:08:24 -05:00 |
|
Chiss
|
175d9f9886
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-08-09 23:00:07 +10:00 |
|
Chiss
|
23f93e55cf
|
fixed dragons destroying pregame lobby
|
2014-08-09 22:59:54 +10:00 |
|
Jonathan Williams
|
3ea2567079
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-09 07:41:09 -05:00 |
|
Jonathan Williams
|
9b75ef4f96
|
Fixed purchasing -2 cost gadgets.
|
2014-08-09 07:41:00 -05:00 |
|
Chiss
|
066dfbc9a9
|
Morph helmet fix
|
2014-08-09 22:38:58 +10:00 |
|
Jonathan Williams
|
800658ff48
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-09 07:26:05 -05:00 |
|
Jonathan Williams
|
2c75bcbdfe
|
Added ability to store gem boosters in enjin.
|
2014-08-09 07:25:58 -05:00 |
|
Chiss
|
e558796268
|
fixed TNT not being able to hit anyone
|
2014-08-09 22:16:49 +10:00 |
|
Chiss
|
a34ce75252
|
price fix
|
2014-08-09 22:02:40 +10:00 |
|
Chiss
|
6c847e78b7
|
Gem Hunter exp change
|
2014-08-09 20:16:21 +10:00 |
|
Chiss
|
06a444bae6
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-08-09 19:55:35 +10:00 |
|
Chiss
|
ff6ea3c798
|
Added Cosmetics to Arcade
Set prices on cosmetics
|
2014-08-09 19:55:05 +10:00 |
|
Jonathan Williams
|
b0f6435661
|
Fixed items not updating immediately.
|
2014-08-09 04:29:34 -05:00 |
|
Chiss
|
951e1df3d5
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-08-09 19:05:34 +10:00 |
|
Jonathan Williams
|
8fe4e39207
|
Split up Cosmetic shop and Inventory
Added Ammo purchase for item gadgets.
|
2014-08-09 03:57:56 -05:00 |
|
Jonathan Williams
|
4e93707f0d
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-09 00:06:53 -05:00 |
|
Jonathan Williams
|
0de8d22e62
|
Changed invis in hub to only be on server npc shops
Fixed /a for senior mods and developers.
|
2014-08-09 00:06:44 -05:00 |
|
Chiss
|
62eccbcc1e
|
Snr Mod
Creeper knockbak changes
|
2014-08-09 15:06:00 +10:00 |
|