Commit Graph

481 Commits

Author SHA1 Message Date
Jonathan Williams 4856b5d90d Removed derp organize brackets in PunishPage 2013-11-08 15:20:29 -08:00
Chiss 255307088c Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
2013-11-09 10:03:49 +11:00
Chiss 3c5b1fe74f H&S Updates
some punish fixes
hub toggles no longer pulse on pressure plate
2013-11-09 09:48:40 +11:00
Jonathan Williams ef0d233512 Dynamic server tinkering again. 2013-11-08 14:46:05 -08:00
Jonathan Williams cae10fe7b4 Fixes to DynamicServer Monitor
Fixed SSM disguise clunky movement.
2013-11-08 10:52:56 -08:00
Chiss dc062c7bb6 H&S Push 2013-11-07 19:49:21 +11:00
Jonathan Williams 79b739fc14 Project for servermonitor 2013-11-07 00:22:42 -08:00
Jonathan Williams 7cc880afd1 ServerMonitor tweaks. 2013-11-07 00:22:04 -08:00
Chiss 8fa7b9f283 Helpers can use WARNINGS 2013-11-07 17:03:34 +11:00
Jonathan Williams e27f01e916 Fixed punish constructor bugs for dom/mk 2013-11-06 21:36:00 -08:00
Jonathan Williams 2af6da79d2 Added maps for tracking. 2013-11-06 20:58:39 -08:00
Jonathan Williams 079a58d2cd Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-06 20:38:41 -08:00
Jonathan Williams f8567dcfa6 Fix for scoreboard uppercase issue in hub. 2013-11-06 20:38:33 -08:00
Chiss 8e7b5ac6fe Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-07 15:26:37 +11:00
Chiss 6b577af7b4 Punish Update
H&S Additions
2013-11-07 15:25:46 +11:00
Jonathan Williams 49e796c39d Fixed Game.Core build issue.
Cleaned up a lot.

Added missing files for Mineplexer
2013-11-06 20:19:56 -08:00
Jonathan Williams e0d10f6550 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-06 19:48:27 -08:00
Jonathan Williams 41e9ffb018 Removed BungeeSigns
Updated Bungee plugin to pull US servers only.
Added dynamic MOTD from mysql for BungeeCord.jar

Fixed crash for disguise block arm animation.
2013-11-06 19:48:00 -08:00
Chiss 0d5b174ebe Stacker/Party exceptions for YouTubers 2013-11-07 10:33:39 +11:00
Chiss 9f11352f10 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-07 10:19:30 +11:00
Chiss 03731de7f8 Rank changes
MAC no longer kicks lag/fly
some H&S stuff :O
2013-11-07 10:18:36 +11:00
Jonathan Williams 70dae64389 added missing file. 2013-11-06 10:26:33 -08:00
Jonathan Williams 0a50d9b127 ServerMonitor files. 2013-11-06 09:14:08 -08:00
Jonathan Williams 2e7bd5504a depr deprerer 2013-11-06 01:04:17 -08:00
Jonathan Williams 9327e71519 MOre work on dynamic server baby! 2013-11-06 01:03:02 -08:00
Jonathan Williams ff6488b371 safe file separators 2013-11-05 16:10:14 -08:00
Jonathan Williams 43d5b6441b Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-05 10:19:17 -08:00
Jonathan Williams 2064c58d1b Fixed up ServerStatusRepository to insert into specific columns
Fixed Dominate shop.

Some work on Server Monitor
2013-11-05 10:19:04 -08:00
Chiss bcb86fc911 PB gem for healing remove 2013-11-04 09:46:09 +11:00
Chiss e14bc76639 arcade map directory up up right left down up right update!
some paintball fixes
H&S start
2013-11-04 08:59:29 +11:00
Jonathan Williams 6999d7979f Added paintball to LobbyMenu
Fixed Lobby count in lobby menu
Fixed ultra/green kits in Paintball
2013-11-02 12:26:28 -07:00
Jonathan Williams a468ac1ae0 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-02 00:59:39 -07:00
Jonathan Williams b9560cf4da Work on Dynamic server monitor. 2013-11-02 00:56:31 -07:00
Chiss 1545873f62 news feed for hub 2013-11-02 18:56:21 +11:00
Chiss 0cbefc1280 Paintball update! 2013-11-02 15:42:37 +11:00
Chiss 24723cd5e5 paintball update 2013-11-02 10:09:07 +11:00
Chiss c72f1337e8 fixed memory leak in antihack 2013-11-01 10:40:33 +11:00
Chiss 08497e474d mobs no longer move as soon as they spawn. GET IN LINE BOYS! 2013-11-01 08:34:32 +11:00
Chiss 7dcd58ec2d HH debug prints 2013-11-01 08:27:45 +11:00
Chiss d41338b76a Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/Champions.java
2013-10-31 17:38:44 +11:00
Chiss ae4bf75485 Champs update 2013-10-31 17:36:41 +11:00
Jonathan Williams 7b8608de95 Rah Rah, Custom Class Combat in Arcade! 2013-10-30 23:35:24 -07:00
Jonathan Williams bac425235d Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-30 20:26:08 -07:00
Chiss 52ac670f3f More dom changes 2013-10-31 12:43:54 +11:00
Chiss 386e2e3067 Added Champs
MAC update
2013-10-31 09:45:11 +11:00
Jonathan Williams a307a4854f Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-28 18:45:19 -05:00
Chiss 33c7d594a0 robin hood regen nerf 2013-10-29 10:43:04 +11:00
Chiss ad487e48bd THIS IS HALLOWEEN THIS IS HALLOWEEN 2013-10-29 10:41:53 +11:00
Jonathan Williams 7279f58b92 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-28 08:53:36 -05:00
Jonathan Williams c70b5c712b Fixed crash items in Server Game Menu for Hub 2013-10-28 08:52:32 -05:00