Commit Graph

640 Commits

Author SHA1 Message Date
Chiss 29db90837d Spleef Update
Map parser block stuff
2014-08-15 15:28:50 +10:00
Chiss 85522cddca Debug (will clean once fixed)
Game stats
2014-08-15 09:49:00 +10:00
Chiss 74435bac12 fixed bug where players kept inventory open, to be able to enable morphs ingame. 2014-08-14 17:31:14 +10:00
Chiss 5f80d9c57a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
2014-08-14 11:24:51 +10:00
Chiss b6ba142c5a Mineplex in scoreboard is fancier. 2014-08-14 11:23:48 +10:00
Shaun Bennett b9534bd245 Merge remote-tracking branch 'origin/master' 2014-08-13 20:07:01 -05:00
Shaun Bennett cfe45139b6 Adjust lobby text for the removal of premium kits 2014-08-13 19:56:47 -05:00
Shaun Bennett 83f04273fa Sort kits properly when a game uses NullKit 2014-08-13 19:45:38 -05:00
Chiss b21ae8ef72 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-14 10:32:52 +10:00
Chiss 7a3bba45a7 Mergey! 2014-08-14 10:32:41 +10:00
Jonathan Williams 6039168601 Updated code base to build #1604 spigot 2014-08-13 18:57:37 -05:00
Chiss 95394c51cc Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-12 11:24:12 +10:00
Chiss 2d67d4ce36 Achievement fix + active 2014-08-12 11:23:53 +10:00
Shaun Bennett d63137ead2 Merge remote-tracking branch 'origin/master' 2014-08-11 12:44:28 -05:00
Shaun Bennett 7e93ed657f Display boss bar properly while a dragon mount is spawned in arcade 2014-08-11 12:26:56 -05:00
Chiss 02270a9d25 TNT effect only triggers off self tnt. 2014-08-11 15:33:45 +10:00
Chiss 7191d48bd0 fixed paintball pre-game bug 2014-08-11 14:25:11 +10:00
Chiss e4871c4988 Disabling cosmetics 5s before game starts, was having some carryover due to lag. 2014-08-11 11:55:00 +10:00
Chiss d81b32bd3a Sneaky Assassins balance+polish 2014-08-10 21:05:41 +10:00
Chiss 06bcf5079b Disabled Gem hunter (bugged?)
Disabled chicken morph letting people fly
2014-08-10 18:36:18 +10:00
Chiss 25b525837f Fixed TNT blowing up lobby when it changed to prepare. 2014-08-10 11:07:05 +10:00
Chiss 9057246ab8 Arcade Inventory fixes 2014-08-10 10:50:31 +10:00
Chiss 3533ce1b7e Particles dont play in stealth games. 2014-08-10 01:04:53 +10:00
Chiss 616a0ecf11 Staff get all kits unlocked. 2014-08-10 00:32:50 +10:00
Chiss 38fd85335f Fixes disguises being disabled. 2014-08-10 00:21:45 +10:00
Chiss 62cc422f42 FINAL FIX 2014-08-10 00:13:04 +10:00
Chiss c95cf79aa6 fxied more 2014-08-10 00:10:08 +10:00
Chiss a43a5b2c0e bacon brawl fix
signel game ultra shows in hub scoreboard
2014-08-10 00:09:39 +10:00
Chiss 3d1ddecffb Smash Kit fix
Gem Booster (dragons) fix
2014-08-09 23:25:13 +10:00
Chiss cac7f85410 Single game ultra kit unlock 2014-08-09 23:10:40 +10:00
Chiss 23f93e55cf fixed dragons destroying pregame lobby 2014-08-09 22:59:54 +10:00
Chiss ff6ea3c798 Added Cosmetics to Arcade
Set prices on cosmetics
2014-08-09 19:55:05 +10:00
Jonathan Williams 8fe4e39207 Split up Cosmetic shop and Inventory
Added Ammo purchase for item gadgets.
2014-08-09 03:57:56 -05:00
Chiss 91a79f0345 Pig Morph
Morphs have tags/
2014-08-09 14:57:01 +10:00
Chiss fb19e93992 Gem text 2014-08-09 13:46:41 +10:00
Chiss c93a49add2 More gem boosty! 2014-08-09 13:42:29 +10:00
Chiss 2e95548b6e Gem Boosters! 2014-08-09 13:39:57 +10:00
Chiss 3a220b6f1c Micro Update
SGTeams inv click fix.
2014-08-09 13:11:32 +10:00
Jonathan Williams 6bd9273edf Refactored getting item count for ClientInventory
Fixed up Arcade gem boosters so they are hooked into inventory.
Cleaned up unused code.
2014-08-08 22:10:02 -05:00
Chiss 313f675ae4 Hub Parkour update
Smash kit prices
2014-08-09 12:16:37 +10:00
Chiss b36b1cb007 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-08 17:05:23 +10:00
Chiss fa3695be4e Gem Booster In Lobby
Achievement Stuff
2014-08-08 17:05:11 +10:00
Shaun Bennett 9395711dcb Merge remote-tracking branch 'origin/master' 2014-08-08 01:51:50 -05:00
Shaun Bennett b7ecf5eb04 GET MINEPLEX ULTRA FOR AMAZING FUN TIMES 2014-08-08 01:51:11 -05:00
Chiss 1a33dbb5ee Achievement Module
Gem Booster/Achivement
2014-08-08 13:46:35 +10:00
Shaun Bennett 2fd7621a81 Display proper team in Arcade Lobby (Fixes bug where a player connecting will break scoreboards) 2014-08-07 18:44:27 -05:00
Jonathan Williams c01fbd279d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/GadgetManager.java
2014-08-07 00:48:32 -07:00
Jonathan Williams 6d86f403ac Added coins Currency to web api
Added coins purchase for all cosmetic items
Added Stats manager
Added Inventory Manager

Redesigned gadgets/morph/particle/pets/mounts page and inventory.
2014-08-07 00:33:24 -07:00
CoderTim 8a74b08b0d Fixed silly mistake I made 2014-08-06 23:59:52 -04:00
CoderTim f7f9d3e703 Sneaky assassin power-up maximum is 5 and hanging entities cannot be damaged 2014-08-06 21:35:11 -04:00