Commit Graph

152 Commits

Author SHA1 Message Date
Jonathan Williams 03627eb0c3 Changed all mysql connections to be persistent. 2013-12-06 01:57:09 -08:00
Chiss f4e3b6efdc hub news/skytext for draw game 2013-11-30 22:11:26 +11:00
Jonathan Williams e04815f077 Removed Beta ultra only checking in server NPc page. 2013-11-23 02:40:56 -08:00
Jonathan Williams b0bfa860c7 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-23 02:04:30 -08:00
Jonathan Williams ae779d063e Added quick menu buttons for Block Hunt and Survival Games 2013-11-23 02:04:22 -08:00
Chiss f299b4f650 hub changes 2013-11-23 20:55:01 +11:00
Jonathan Williams 11378f967f Fixed npc page ultra beta stuff. 2013-11-23 00:39:32 -08:00
Jonathan Williams affc9eeb9c Added inventory click for creative users in Hub
Added Ultra/Survival games beta stuff do servernpcpage
2013-11-22 14:17:00 -08:00
Jonathan Williams 9e8cd9db7d Disabled painting in parkour areas. 2013-11-21 12:38:16 -08:00
Jonathan Williams 44416001b3 Disabled Bat Blaster near Parkour.
Disabled Painting blocks near cactus.
2013-11-21 12:16:24 -08:00
Jonathan Williams be7ea65033 Website bin/obj cleanup
Fixed Pet Rename problem.
Fixed Extra Pet tag problem.

Added ServerStatus for dedicated servers.
2013-11-21 12:08:58 -08:00
Jonathan Williams 0fa953715e Fixed interact cancel in Hub. 2013-11-16 18:49:17 -08:00
Chiss be4de5f7bb Europe server in news 2013-11-17 10:59:02 +11:00
Jonathan Williams 3a725246dc Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-16 02:59:35 -08:00
Jonathan Williams c1de12a8e7 Added autoreconnect to bungee repos
Fixed up disguise for block hunt.
2013-11-16 02:59:28 -08:00
Chiss 07d9610bf7 Hub sky text 2013-11-16 21:21:04 +11:00
Chiss 2a9c11d700 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-16 21:10:23 +11:00
Chiss 1e0a456286 hub changes 2013-11-16 21:09:59 +11:00
Jonathan Williams a9241bc7f3 Changed Hub to normal. 2013-11-16 02:07:51 -08:00
Jonathan Williams 75c2a5fd6e Added sound disguises
Removed purchasable batgun.
2013-11-16 01:55:10 -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 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 6b577af7b4 Punish Update
H&S Additions
2013-11-07 15:25:46 +11: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 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
Chiss 1545873f62 news feed for hub 2013-11-02 18:56:21 +11:00
Chiss 24723cd5e5 paintball update 2013-11-02 10:09:07 +11:00
Jonathan Williams bac425235d Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-30 20:26:08 -07: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 ad487e48bd THIS IS HALLOWEEN THIS IS HALLOWEEN 2013-10-29 10:41:53 +11:00
Jonathan Williams c70b5c712b Fixed crash items in Server Game Menu for Hub 2013-10-28 08:52:32 -05:00
Jonathan Williams afee32257d Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-28 02:22:30 -05: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 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 0aee445e00 Added timeout check for status retrieval 2013-10-26 16:36:48 -05:00
Jonathan Williams 1781ed15c4 Fixed some drop item stuff. 2013-10-26 12:02:18 -05:00
Jonathan Williams 95449fec26 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-26 11:06:19 -05:00
Chiss 64e98c4a30 text now has glowstone behind it (for darkness) 2013-10-27 03:05:19 +11:00
Jonathan Williams 7d8e79a234 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-26 11:01:22 -05:00
Jonathan Williams 88eab4b1a3 Fixed gadget item slot.
Fixed some desc on mounts
2013-10-26 11:01:01 -05:00
Chiss d4affc8bb6 paintballs wont change near portals. 2013-10-27 02:53:38 +11:00
Jonathan Williams df36145800 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/ItemGadget.java
	Plugins/Mineplex.Hub/src/mineplex/hub/mount/types/Mule.java
2013-10-26 10:47:14 -05:00
Jonathan Williams 0b0fa383f6 Finished up Gadget shop. 2013-10-26 10:45:41 -05:00