Commit Graph

3220 Commits

Author SHA1 Message Date
libraryaddict 6c9963e1b3 CommandCenter: Cancel command event straight after verifying that its been registered 2015-05-30 05:44:49 +12:00
Shaun Bennett 7d43b146b7 [Core] Display Games Played instead of Losses for a bunch of the arcade games where losses will be greater than wins 2015-05-28 19:05:45 -05:00
Shaun Bennett cc1219fd38 [Spigot] Spigot class change for Ty 2015-05-28 15:24:10 -05:00
Jonathan Williams 2c5471cb34 Added ability to see which server you were sent from. 2015-05-28 09:33:49 -05:00
libraryaddict d84bd4ffe4 Messaging: Now with censors! 2015-05-28 10:13:31 +12:00
Shaun Bennett a900a2a70a [Arcade] Another attempt at fixing spectator gui.... :^) 2015-05-26 19:50:01 -05:00
Shaun Bennett 25ba20e411 [Arcade] Fixes for DMT and DT not counting loses properly 2015-05-26 19:28:42 -05:00
Shaun Bennett 0499e1acf1 Merge remote-tracking branch 'origin/master' 2015-05-26 18:55:42 -05:00
libraryaddict e15e42afae UHC: Expanded from 32 blocks to 36 2015-05-27 02:40:27 +12:00
libraryaddict b8cd2aaece UHC: Expand anti-build protection from 16 blocks to 32 2015-05-26 11:04:27 +12:00
libraryaddict c53d52ee42 UHC: Disable gadgets 2015-05-24 20:17:39 +12:00
libraryaddict 21aa97b3b9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-24 20:13:43 +12:00
libraryaddict 63e28e25c9 HoleInTheWall: Push the failed game 2015-05-24 20:10:56 +12:00
libraryaddict 0d0d5eea64 Game: Change GameFlagManager to use Game.isInsideMap(), change isInsideMap to treat MaxX,Y,Z with a +1 2015-05-24 20:10:16 +12:00
Jonathan Williams 96b1df4ee0 Fixed global player count.
Fixed tasks.
2015-05-22 14:33:25 -07:00
Jonathan Williams 303cfd02fa Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-05-17 23:12:27 -07:00
Jonathan Williams f0c7f2fe76 Merge branch 'MSSQL_Conversion'
Conflicts:
	Website/LOCWebsite.suo
2015-05-17 23:11:50 -07:00
Jonathan Williams 476dd17ffe Fix for null rank in /c staff server. 2015-05-17 23:11:04 -07:00
Shaun Bennett c107f4d0d9 [Arcade] Working on private servers 2015-05-17 16:31:09 -05:00
Shaun Bennett 5cd191f582 Merge remote-tracking branch 'origin/master' 2015-05-17 16:29:01 -05:00
Jonathan Williams 375b23db3c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-05-17 13:46:46 -07:00
Ty Sayers afb0b1cfdf Add Charset argument for reading File lines in ServerManager, ideally to prevent compilation issues with other java versions. 2015-05-17 14:50:22 -04:00
Jonathan Williams e728edb44d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-05-17 01:29:49 -07:00
Jonathan Williams 47ff9101fd Finished up changes for game task conversion. 2015-05-17 01:28:44 -07:00
Ty Sayers e8d5d50162 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-05-16 13:13:53 -04:00
Ty Sayers 672fc99a3e Add fail-safe default connection in case of issue in proper redis-config.dat generation. Add documentation to clarify purposes related to redis configuration. 2015-05-16 13:12:20 -04:00
Ty Sayers a8b0dddf17 Add support for redis configuration file to determine viable redis master and slave connections, that can be set to be region-dependant. Fix leakage issue with command manager with not properly returning broken jedis resources. Funnel all redis connection requests through ServerManager for easier configuration use. 2015-05-16 13:01:21 -04:00
Shaun Bennett 1e9abaf002 [Arcade] Add more games to private servers 2015-05-15 23:38:43 -05:00
libraryaddict f899194e3b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-15 12:23:27 +12:00
libraryaddict 091f98fa9d DrawMyThing: Remove all found words from the checked string when looking for multiple guesses 2015-05-15 12:23:05 +12:00
Shaun Bennett 6b7c52cb87 [Arcade] Add additional hub clock check 2015-05-14 15:17:45 -05:00
Jonathan Williams 5a8f93f3db Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-05-14 00:12:22 -07:00
Jonathan Williams b7cdc82cd2 Fixed server sorter for UHC.
Work on converting to UltraDNS api.
2015-05-14 00:12:13 -07:00
Mini-Chiss d390d83dd1 removed some meh words 2015-05-13 22:35:26 -05:00
Mini-Chiss f49c2ca546 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-13 22:27:41 -05:00
Shaun Bennett 0d2157b4f3 [Core] Fix /stats lava bucket bug 2015-05-13 23:23:43 -05:00
Shaun Bennett 2c020d10a6 Merge remote-tracking branch 'origin/master' 2015-05-13 22:52:22 -05:00
Shaun Bennett 84c53347f8 [Hub] Add UHC to Quick server menu. Better formatting coming soon! 2015-05-13 22:52:14 -05:00
Mini-Chiss e68a2775e8 ex p chnage 2015-05-13 22:27:33 -05:00
libraryaddict 67f1e4ad1f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-14 14:29:43 +12:00
libraryaddict 0fc1d680af UHC: Add 20 seconds of invincibility on game start 2015-05-14 14:29:30 +12:00
Mini-Chiss 44cb6d8a62 increased exp more 2015-05-13 17:08:56 -05:00
libraryaddict 4bc38e3396 Arcade: Removed ocean, river and swampland from biome generation for UHC 2015-05-14 09:55:22 +12:00
Jonathan Williams a6cf1309ff Fix for ranks not applying. 2015-05-13 14:33:31 -07:00
Jonathan Williams 5bb91f4167 Catch null taskList 2015-05-13 14:27:35 -07:00
libraryaddict c46bdfd2dc Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-14 09:18:51 +12:00
libraryaddict 1b27e84e54 DrawMyThing: Fixed a check being in the wrong brackets 2015-05-14 09:18:35 +12:00
Mini-Chiss 093bbde792 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-13 15:45:41 -05:00
Mini-Chiss 2c3116a7a6 removed firework and sound from legend join 2015-05-13 15:45:29 -05:00
Mini-Chiss bd58c06017 fixed being able to team with self in UHC
fixed eventgame admin toggle
2015-05-13 13:32:20 -05:00