Commit Graph

1940 Commits

Author SHA1 Message Date
Shaun Bennett 6038c72e86 Add cleaner page for when there is only 1 team 2014-11-13 19:33:39 -06:00
Shaun Bennett ea8b8dca15 Disable spectator menu for castle siege and uhc until I work out a better way to show that many players 2014-11-13 19:18:28 -06:00
Shaun Bennett af31f4cd42 Add Tab handling for MultiCommandBase and "game set" command 2014-11-13 18:22:00 -06:00
Shaun Bennett 48c09aa311 Making spectator gui look better 2014-11-13 18:05:28 -06:00
Shaun Bennett eb4b451e12 Fixing some spectator gui bugs 2014-11-13 16:41:42 -06:00
Shaun Bennett 8b73b89a17 Merging spectator gui with main branch 2014-11-13 16:03:14 -06:00
Chiss c5a873ffab Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-13 14:40:26 +11:00
Chiss f9f7a834c2 geno morf 2014-11-13 14:38:33 +11:00
Jonathan Williams 7cad40044a 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/report/ReportPlugin.java
2014-11-12 19:36:00 -08:00
Jonathan Williams 1372f74921 Refactored some names in MiniPlugin
Work on clans.
2014-11-12 19:21:12 -08:00
Jonathan Williams 0193c397fb Added Kit unlocks to staff server
Added password persistence in db.
2014-11-12 19:20:41 -08:00
Jonathan Williams 2e848c2ac2 Fixed some of twiggy conflicts. 2014-11-12 05:13:58 -08:00
Jonathan Williams 8d62966abc Created Clans project.
Converted Fields code complete (not tested).
2014-11-12 05:13:16 -08:00
Chiss 71a93bead5 Updated punish to be even less confuse. 2014-11-12 09:49:03 +11:00
Chiss d7141e4943 Added warning note to punish 2014-11-11 20:02:35 +11:00
Chiss f7ad986503 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-11 19:05:58 +11:00
Chiss debf8ebcba fixed chat not being unsilenced when someone picks word 2014-11-11 18:52:00 +11:00
Shaun Bennett c0f2f8a88c Remove useless comment/import 2014-11-11 01:47:03 -06:00
Chiss c37026e4df SSM Dom changes 2014-11-11 18:36:32 +11:00
Shaun Bennett 23ab9756dc Merge remote-tracking branch 'origin/master' 2014-11-11 01:32:55 -06:00
Jonathan Williams b08cd54666 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-10 23:31:38 -08:00
Jonathan Williams 827fef535f Some commented out testing code in DisguiseManager 2014-11-10 23:30:41 -08:00
Jonathan Williams 108421164c Added support for stats with spaces in them for GiveStat. 2014-11-10 23:30:16 -08:00
Shaun Bennett cf25d17c66 Update craftbukkit.jar with command event 2014-11-10 23:53:08 -06:00
Shaun Bennett 5b9b7347c6 Add tab complete processing for commands 2014-11-10 23:49:35 -06:00
Chiss 6c6c51e950 fixed compilation problems 2014-11-11 14:28:35 +11:00
Chiss 91f92dc7e1 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-11 12:25:52 +11:00
Chiss a1eff92bbb fixed achievement kit for sneaky not being accessible 2014-11-11 12:25:36 +11:00
MrTwiggy e3c50bfb39 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
	Plugins/Mineplex.ServerData/src/mineplex/serverdata/ServerCommandManager.java
2014-11-10 18:55:57 -05:00
MrTwiggy 920bdad64c Player report system commit, including functionality for long-form MySQL storage of report logs as well as real-time redis based report sessions. 2014-11-10 18:44:46 -05:00
Chiss d2301337d2 fixed non-charged block toss not having any velocity. 2014-11-10 19:28:36 +11:00
Chiss d362fb3b1c fixed punish error 2014-11-10 19:15:56 +11:00
Chiss 0252db5a05 Punish simplification update 2014-11-10 18:40:39 +11:00
Chiss d6ade5a15b ensured that exp cannot be given multiple times for a game 2014-11-09 14:43:06 +11:00
Chiss d5515d11b2 fixed kick reason for bans 2014-11-09 14:27:01 +11:00
Chiss 6405253b1c added word wrap on punish text in GUI
only staff+punishee will now see punishments
2014-11-09 14:09:30 +11:00
Chiss 3c39e3d93a changed sev2/3 hack punishements
updated ban kick/login messages
2014-11-09 13:47:25 +11:00
Chiss a1f7fc5187 warnings are now friendly :)
reach hack detection base
2014-11-09 12:22:55 +11:00
Chiss b65d2f491e exp gives less for losing 2014-11-09 10:33:50 +11:00
Chiss 2a04ed6eda losing games no longer gives exp 2014-11-09 10:30:26 +11:00
Chiss ad933400b9 Sheep Quest update
lowered exp on loss
removed Participation exp
2014-11-09 10:06:04 +11:00
Jonathan Williams 403165edf4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-08 14:32:48 -08:00
Jonathan Williams 2781bb3000 Removed stacking buffers. 2014-11-08 14:32:37 -08:00
Jonathan Williams 7fb679e7f5 Changed lobbyBalancer to send one player to each lobby that wasn't full. 2014-11-08 14:32:24 -08:00
Chiss 7e26def6a1 centralised SneakyAssassins module cleanup 2014-11-08 18:40:23 +11:00
Chiss 5ce38c3030 removed final from npcManager 2014-11-08 18:37:18 +11:00
Chiss b6904f2ae1 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-08 18:36:18 +11:00
Chiss c0ec9f92fc nulled reference too, just to be safe :D 2014-11-08 18:36:05 +11:00
Chiss 2b0befdc13 fixed listener leak in SneakyAssassins 2014-11-08 18:35:34 +11:00
Jonathan Williams f03fe663f6 Simplified Lobby balancer code to randomize server selection on best 10 servers.
Increased rate at which bungee retrieves server information.

Increased rate at with servers sends server information.
2014-11-07 22:04:51 -08:00