Commit Graph

7816 Commits

Author SHA1 Message Date
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
Chiss ab9cce3910 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-28 22:31:03 +11:00
Chiss 91ec162c88 slightly easier 2013-10-28 22:30:51 +11:00
Chiss 3142bd517d Fixed regen aura... wasnt working at all 2013-10-28 21:35:16 +11:00
Jonathan Williams 9d47864503 Fixed player count in bungee plugin 2013-10-28 03:24:18 -05:00
Jonathan Williams afee32257d Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-28 02:22:30 -05:00
Chiss f0f7a4156f saving heads to file 2013-10-28 17:53:25 +11:00
Jonathan Williams 4306d2444f Updated bungee library
Fixed server ping Event.java
Removed crash item in hub.
2013-10-28 01:37:23 -05:00
Chiss 980b6420fe fixed stacker item for 1.7 2013-10-28 15:48:06 +11:00
Chiss 09a8cbe558 re-enabled waves 2013-10-28 14:08:55 +11:00
Chiss 1d4f902298 HH CPU fixes 2013-10-28 13:54:10 +11:00
Chiss 505dd57715 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-27 15:25:12 +11:00
Chiss 4974fc17aa Halloween balance (slightly easier)
Giant hitbox improved
2013-10-27 15:24:28 +11:00
Jonathan Williams 845535991d Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-26 16:37:07 -05:00
Jonathan Williams 0aee445e00 Added timeout check for status retrieval 2013-10-26 16:36:48 -05:00
Chiss 7948fa6f71 cpu fix ;o 2013-10-27 06:21:43 +11:00