Commit Graph

225 Commits

Author SHA1 Message Date
Chiss d92515eef9 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-24 19:14:54 +11:00
Chiss 74e49a3ff1 Hero Rank stuff
New SSM Kit
2013-12-24 19:14:40 +11:00
Jonathan Williams 592d49e57c Added ghost check flag to ender dragon.
Re-enabled Dragon Gadget.
2013-12-24 03:09:15 -05:00
Jonathan Williams 6595d33899 Tuned chunk load for disguise manager.
Disabled dynamic text in hub.
2013-12-24 00:39:33 -05:00
Jonathan Williams 79de7f2bfc Fixed portal breaking with Frost horse.
Added memory clean up for disguises
2013-12-23 04:16:53 -05:00
Jonathan Williams a02ca4513e Added undead/batgun and frost to in game shop for gems. 2013-12-21 07:29:04 -05:00
Chiss e94784a908 dragon mount removed 2013-12-21 23:09:49 +11:00
Chiss c08b7c7b96 hub news update 2013-12-21 22:21:16 +11:00
Chiss bfd76474e8 Dragon particles 2013-12-21 20:44:56 +11:00
Chiss 0585116e78 Hub Gadgets
Hub Dragon (Hero Only)
XMAS block efficiency
2013-12-21 20:05:42 +11:00
Chiss c969775df3 Hub gadgets for xmas 2013-12-21 19:00:30 +11:00
Chiss c52a7d2fe1 Christmas update
Hub Update
2013-12-21 15:06:01 +11:00
Chiss bc9c309aa1 Xmas Game 2013-12-21 10:17:22 +11:00
Jonathan Williams 44145e01f0 Removed weather for hub update. 2013-12-18 13:52:44 -05:00
Jonathan Williams a24e8e233c Enabled pvp in hub for snowballs. 2013-12-18 05:56:59 -05:00
Jonathan Williams e55885c85d itsy 2013-12-18 05:22:40 -05:00
Chiss 54f2cb3467 Christmas hub snowman target cancel 2013-12-18 19:58:39 +11:00
Chiss de99a642d3 Hub tourney text removal 2013-12-17 11:06:04 +11:00
Chiss 4bef100c6a Xmas Hub 2013-12-16 14:32:51 +11:00
Chiss c582b210b5 Hub + Stats + Tournament 2013-12-14 16:51:08 +11:00
Chiss 9af8676307 Hub/Stats 2013-12-14 16:38:16 +11:00
Jonathan Williams 6b92b6c4a8 Added stats manager.
Added lots of missing files.
2013-12-13 21:00:56 -08:00
Jonathan Williams d6544202f0 Added ghost ability for mobs. 2013-12-12 02:19:58 -08:00
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
Chiss 55de25fded removed testing toggle for mount
changed item gadget slot from 2 to 3
2013-10-27 02:22:38 +11:00
Chiss 19e2946ce4 mule rename 2013-10-27 01:44:18 +11:00
Jonathan Williams 9bc9cc2bb8 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Halloween2013_BatGun.java
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Halloween2013_Helmet.java
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/ArmorGadget.java
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/Gadget.java
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/ItemGadget.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/creatures/MobGhast.java
2013-10-26 08:53:38 -05:00
Jonathan Williams 39cf5c3ed1 Tweaking on ghast.
Added gadget costs
Working on Gadget shop.
2013-10-26 08:50:12 -05:00
Chiss 7eb1cc6519 Halloween game additions 2013-10-27 00:06:44 +11:00
Chiss 723b57cd46 Added paintball gun Gadget
Added bat blaster Gadget

Halloween Game near-completed

Added SSM Witch
2013-10-26 19:01:26 +11:00
Chiss 49e8c15f44 important update 2013-10-25 22:56:28 +11:00
Chiss b74b8e3915 Halloween event changes 2013-10-25 21:25:23 +11:00
Chiss 5563d94111 Halloween event update
hub News
hub mounts
hub gadgets
2013-10-25 19:20:14 +11:00
Chiss 1977572ced Added Halloween Minigame
Updated gadgets and other minor things.
2013-10-22 15:46:31 +11:00
Chiss 7cec55713c Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-19 16:52:27 +11:00
Chiss 1944c0003c Hub gadgets 2013-10-19 16:52:15 +11:00
Jonathan Williams 90fbc397ff Converted gem rewards to boolean return from website.
Implemented gem transactions and source.
2013-10-18 00:46:06 -07:00
Jonathan Williams f88c202e07 Added AntiHack to Arcade/Hub
Added AntiHack Offense uploading.
Fixed memory leaks in PreparedStatments
Added Ultra tag in hub chat.
2013-10-17 00:37:57 -07:00
Jonathan Williams 25dec6fb46 Fixed player arm animation bug.
Added EnderDragon AI control and vegetation
2013-10-12 20:31:43 -07:00
Jonathan Williams e723075298 Increased lobby menu size.
Fixed memory leak in Explosion
2013-10-12 02:52:35 -07:00
Jonathan Williams 03c74aa419 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-12 01:55:52 -07:00
Jonathan Williams 42b932e612 Added inventory move prevention for all inventories
Prevent bone from being turned into bonemeal and being fed to pet wolf.
Fixed Dominate shop in hub.
2013-10-12 01:55:32 -07:00
Chiss a315064a3f snake fix
parkour radius increase
2013-10-12 18:21:19 +11:00
Chiss 8376316994 Added Paintball
Added SSM Kit: Wolf
UPDATES.
2013-10-12 09:34:46 +11:00
Jonathan Williams c9af91fcd6 Tweak on lobby to show number instead of player count in item. 2013-10-05 01:49:55 -07:00
Jonathan Williams 1431961b39 Fixed issues with Pet menu.
Fixed typo in Welcome Tutorial
2013-10-05 00:59:45 -07:00
Jonathan Williams 59d7a78086 Revamped pet purchase and added pet menu to player hotbar.
Fixed ServerStatusManager still firing errors if IgnoreUpdates was in.
2013-10-04 23:55:05 -07:00
Jonathan Williams 57b0d06786 Added DisguiseWolf
Added lobby menu (disabled autogive for testing)
Removed unused commands.
2013-10-02 22:23:01 -07:00
Jonathan Williams 44da981cf4 Fixed dominate bug again.
Fixed quick game menu bug.
2013-09-27 23:06:53 -07:00
Jonathan Williams f9400a0eb4 Fixed multiple finishes for parkours 2013-09-27 12:45:24 -07:00
Jonathan Williams b6d33010ca - Lava parkour fire ticks are no more
- Lava gem rewards on npcs reflect actual value (1000 and 4000)
- Can't carry people into parkour areas now

Removed unused code with Portal
Added portal functionality for server quick join
Disabled SG text
Updated quick game menu text.
2013-09-27 12:40:09 -07:00