Commit Graph

956 Commits

Author SHA1 Message Date
Mini-Chiss ce8560bdbf hub news 2014-07-04 23:20:46 -07:00
Mini-Chiss df8562e69a Tourney mode for UHC 2014-07-04 23:11:13 -07:00
Mini-Chiss c65712c260 UHC fixes
Sneaky Assassin listener leak fix
Some map parser stuffs.
2014-07-04 23:04:46 -07:00
CoderTim 6365ec5351 Started on Sneaky Assassins kits and power-ups 2014-07-04 11:14:34 -04:00
CoderTim 2fb2aadf66 Merge remote-tracking branch 'origin/master' 2014-07-04 11:12:52 -04:00
CoderTim 46c979e088 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-04 11:12:33 -04:00
Peter Miller b56855c33c Squished remaining concurrency/checking bugs! Happy 4th o'July! 2014-07-04 02:19:20 -04:00
Peter Miller 2531dd7a8f Implementing user/serverName checks 2014-07-03 00:17:49 -04:00
Mini-Chiss d19b34b0e4 Removed debug 2014-07-02 17:14:52 -07:00
Mini-Chiss 22ceba9841 Fixed Scoreboards! 2014-07-02 17:12:52 -07:00
Jonathan Williams d0fafce585 Reverted change to helper only joining full, now ultras can.
Added check so BETA servers cannot be joined by less than Helper.

Fixed message in AccountAdministrator for rankUpdate
2014-07-02 16:59:31 -07:00
Jonathan Williams 8eaad57516 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-02 16:05:37 -07:00
Jonathan Williams f1393ffb33 Fixed rankUpdate changing existing higher ranked players.
Fixed join limits in arcade and hub.
2014-07-02 16:05:26 -07:00
Mini-Chiss bea6902198 Spectators can use /tp 2014-07-02 13:09:47 -07:00
Mini-Chiss 82dd94de9b Scoreboard fix
Unbreakable boats in hub
2014-07-02 12:50:04 -07:00
Mini-Chiss 05e116ea0d Scoreboard flicker fixed! 2014-07-02 12:38:41 -07:00
Mini-Chiss 558f79fe34 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-07-02 10:58:34 -07:00
Mini-Chiss 17c36026f6 fixed bug where player who comes first was not being added to ranks. (get nothing) 2014-07-02 10:57:30 -07:00
Peter Miller 6c67ff9106 Resolving issues from Portal.java conflict resolution 2014-07-02 04:09:41 -04:00
Peter Miller e7832fd06c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
2014-07-02 03:47:14 -04:00
Peter Miller 1f515565ff Moving improved server/send command code to separate command files 2014-07-02 03:24:48 -04:00
Jonathan Williams 9514f6391e Fixed bug in Arcade with client manager. 2014-07-01 21:42:00 -07:00
CoderTim 44a57a485f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-01 21:39:03 -04:00
Jonathan Williams 41c4d5a0a8 Changed joining full servers to helper+ 2014-07-01 18:33:33 -07:00
Jonathan Williams 081260757d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-01 18:31:26 -07:00
Jonathan Williams 6fd889d8fc Added Player mapping.
Removed joining full servers for ultra.
2014-07-01 18:31:17 -07:00
Mini-Chiss 31772196a9 More scoreboard stuff (TDM)
New Tug game
2014-07-01 18:30:04 -07:00
Jonathan Williams b627e8fdf5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-01 10:25:12 -07:00
Jonathan Williams 9fd3f14248 Added RankUpdate command.
Fixed Lobby joinable issue with server monitor.
Changed server monitor to be fully dynamic for us.
2014-07-01 10:23:22 -07:00
CoderTim 7ea818c0c8 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-01 02:20:45 -04:00
Mini-Chiss 7bc3966feb Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-06-30 16:13:15 -07:00
Mini-Chiss 8c461b3e1b Cooldown on Spec Compass
Hub Forcefield Update
Scoreboard MINEPLEX refactor
2014-06-30 16:12:42 -07:00
Jonathan Williams 8e8e66f8c1 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-27 20:25:09 -07:00
Jonathan Williams 0287cfb2f6 Refactored Punish a bit so punishments don't expire early or jack up based on server's time. 2014-06-27 20:24:44 -07:00
CoderTim ccb17d5ac3 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-27 19:33:34 -04:00
Peter Miller 60a6f22194 Added functionality for retrieving serverName from Bungee 2014-06-27 17:01:54 -04:00
Mini-Chiss f10b081473 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-06-26 18:38:28 -07:00
Mini-Chiss 3d12196b17 Merge
UHC Public
Small refactor for player ranks in games.
Trimed scoreboard teams to 16 chars.
2014-06-26 18:38:11 -07:00
Jonathan Williams 681dfc5f7c Added ability to copy in schematics from build server.
Added in gametype checking on parse.
2014-06-26 12:09:29 -07:00
Jonathan Williams 210264f25b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-25 20:53:39 -07:00
Jonathan Williams 57c52cb9c8 Improved MapParser to allow world loading/saving for immediate testing. 2014-06-25 20:53:28 -07:00
Peter Miller e25101cd59 Continued enhancements... 2014-06-25 20:28:27 -04:00
Jonathan Williams f6ad5c5549 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-25 12:07:49 -07:00
Jonathan Williams 4f3ffde892 Added timing/debugging code. 2014-06-25 12:06:24 -07:00
Peter Miller bb5aa8e0f3 Work on /server and /send commands with permissions (more permissions need to be implemented). 2014-06-24 22:34:17 -04:00
Mini-Chiss 46849745c4 Champions TDM Update 2014-06-23 16:20:50 -07:00
Jonathan Williams f2c82cbf95 Refactored TimeUtil and added totalling option. 2014-06-20 20:42:36 -07:00
Jonathan Williams 6cac04d399 Optimized create scoreboards. 2014-06-19 00:48:04 -07:00
Jonathan Williams 231ffd7234 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-15 17:21:47 -07:00
Jonathan Williams 93fbe70e9c Added more loggingggggg. 2014-06-15 17:21:40 -07:00