Chiss
|
282219fb4c
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-08-14 17:31:27 +10:00 |
|
Chiss
|
74435bac12
|
fixed bug where players kept inventory open, to be able to enable morphs ingame.
|
2014-08-14 17:31:14 +10:00 |
Jonathan Williams
|
f524ffb093
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-13 21:53:15 -05:00 |
|
Jonathan Williams
|
d1e69a34f1
|
Fix chiss path errorrrrrrrrrrrrrrrrrrrrs.
|
2014-08-13 21:53:03 -05:00 |
|
Chiss
|
c72f4b6057
|
Dragon target cancel fix
|
2014-08-14 12:35:49 +10:00 |
|
Chiss
|
5f80d9c57a
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
|
2014-08-14 11:24:51 +10:00 |
|
Chiss
|
b6ba142c5a
|
Mineplex in scoreboard is fancier.
|
2014-08-14 11:23:48 +10:00 |
Shaun Bennett
|
b9534bd245
|
Merge remote-tracking branch 'origin/master'
|
2014-08-13 20:07:01 -05:00 |
|
Shaun Bennett
|
cfe45139b6
|
Adjust lobby text for the removal of premium kits
|
2014-08-13 19:56:47 -05:00 |
|
Shaun Bennett
|
83f04273fa
|
Sort kits properly when a game uses NullKit
|
2014-08-13 19:45:38 -05:00 |
|
Chiss
|
b21ae8ef72
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-08-14 10:32:52 +10:00 |
|
Chiss
|
7a3bba45a7
|
Mergey!
|
2014-08-14 10:32:41 +10:00 |
|
Jonathan Williams
|
27032ac2ed
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
Plugins/Mineplex.Core/src/mineplex/core/portal/PortalRepository.java
|
2014-08-13 18:59:59 -05:00 |
|
Jonathan Williams
|
6039168601
|
Updated code base to build #1604 spigot
|
2014-08-13 18:57:37 -05:00 |
Ty
|
5c5a57b048
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-13 16:37:20 -04:00 |
|
Ty
|
4b4f43ac16
|
Convert PortalRepository's redis host fetch to ServerManager constant, and remove debug code section.
|
2014-08-13 16:37:05 -04:00 |
|
Jonathan Williams
|
93811b200d
|
Small adjustment to lobby balancer code.
|
2014-08-12 17:01:54 -05:00 |
|
Jonathan Williams
|
5363f686e5
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-12 13:00:24 -05:00 |
|
Jonathan Williams
|
5618a3edad
|
Removed extra free version generator in server monitor.
|
2014-08-12 13:00:17 -05:00 |
|
Ty
|
1bbb42214d
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-12 11:14:53 -04:00 |
|
Ty
|
5b059e96ca
|
Commit missing PortalRepository.java file and finish clean() method.
|
2014-08-12 11:14:31 -04:00 |
|
Chiss
|
95394c51cc
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-08-12 11:24:12 +10:00 |
|
Chiss
|
2d67d4ce36
|
Achievement fix + active
|
2014-08-12 11:23:53 +10:00 |
|
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 |