Commit Graph

7999 Commits

Author SHA1 Message Date
samczsun 1e5d91e392
Make porting from old legendaries work, fix null commandcenter 2016-06-15 21:52:25 -04:00
samczsun d49ce27a1b
Make GearShop work again 2016-06-15 21:52:25 -04:00
samczsun 808e506911
Revert "Revert "Clans optimizations""
This reverts commit 25a315ac05.
2016-06-15 21:52:25 -04:00
samczsun 45e6cb902f
Save changes 2016-06-15 21:52:25 -04:00
samczsun a753a3ab07
Clean up legendary code 2016-06-15 21:52:25 -04:00
Shaun Bennett 2f1954e41c Rename to booster group 2016-06-15 18:18:09 -05:00
Shaun Bennett cbfbd6fe1c Booster GUI update 2016-06-15 17:40:20 -05:00
TadahTech 27afd3d96c Kit progression update 2016-06-15 15:54:53 -05:00
LCastr0 0160efb5ab Merge pull request #95 from Mineplex-LLC/develop
Merge develop into project-cosmetics
2016-06-15 11:22:03 -03:00
Shaun Bennett aa785ed3d5 Code clean-up and documentation 2016-06-12 21:18:11 -05:00
xXVevzZXx bf4de4471a fix permanent item removal and battle items in inventory 2016-06-11 17:33:12 +02:00
xXVevzZXx bc77605dcd make crafted weapons in SG unbreakable 2016-06-11 16:43:56 +02:00
xXVevzZXx a461e9cf1c fix inventory being editable while voting phase 2016-06-11 16:27:31 +02:00
xXVevzZXx 75e36d0e08 fix pickup of dropped tnt 2016-06-11 16:13:07 +02:00
xXVevzZXx 5e551a2ba6 fix waller only being able to make two walls 2016-06-11 15:49:31 +02:00
Shaun Bennett cf87469400 Fix a possible NPE, use proper IP and port for api 2016-06-10 20:24:22 -05:00
Shaun Bennett 2421fd1cfe Update booster page, proper booster rewards 2016-06-10 19:40:27 -05:00
Shaun Bennett 42c35063b3 Display all the boosters you have activated 2016-06-10 17:40:59 -05:00
xXVevzZXx 73d8aec494 fix breakable Armor in Wizards 2016-06-11 00:21:04 +02:00
xXVevzZXx b13b354ce7 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into bugfix/general-bugfixes
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java
2016-06-11 00:20:38 +02:00
Shaun Bennett 6964b1f266 Booster gui command 2016-06-10 17:20:23 -05:00
Shaun Bennett e6920b4549 Work on booster gui, display wait time 2016-06-10 17:17:43 -05:00
Shaun Bennett ceb4de8b35 Load booster groups for arcade 2016-06-10 16:33:53 -05:00
cnr 06cee364fc Merge branch 'mopple' into develop 2016-06-10 14:12:07 -05:00
Shaun Bennett 0a204a3b90 Use redis pub/sub to send booster updates 2016-06-10 12:44:27 -05:00
LCastr0 f8def923bb Merge pull request #91 from Mineplex-LLC/develop
Merge develop into project-cosmetics
2016-06-10 13:52:59 -03:00
Sam 739fcdc649 Fixes the problem where players could not fire a bow in OITQ
Users with high latency were not able to fire bows.
2016-06-10 16:29:27 +01:00
Shaun Bennett e30cd6747b Increase goal 10 million, probably need to change later 2016-06-09 23:40:58 -05:00
Shaun Bennett 1d365d726c brawl fountain now displays proper info on the weekend 2016-06-09 23:40:58 -05:00
Shaun Bennett 08e47b4b1b Enable tips in bonus gui 2016-06-09 22:41:41 -05:00
Shaun Bennett 8bf26dbc11 Use a better podium for NPC, reenable boosters 2016-06-09 18:57:48 -05:00
Shaun Bennett 35e1c2af65 Use rewardCoinsLater for giving shards 2016-06-09 18:19:22 -05:00
Alex-The-Coder 77e9de0f8f Update required rank in
fountain add help message
2016-06-09 17:02:00 -05:00
Alex-The-Coder 0306f1d703 Update required rank in
booster command help message
2016-06-09 17:02:00 -05:00
Alex-The-Coder dbe8f39eeb Update required rank in
add booster help message
2016-06-09 17:02:00 -05:00
xXVevzZXx f6b60ad956 fix idle manager to persist teleports and make xp rewards depending on playtime 2016-06-09 15:51:27 -05:00
cnr ba319599ba Fix fountain schematic file paths 2016-06-09 01:18:09 -05:00
Shaun Bennett 91f6ddce55 Add some minor documentation 2016-06-09 00:48:44 -05:00
Shaun Bennett 611cb28d1a Fix a typo 2016-06-09 00:47:03 -05:00
Shaun Bennett cade7b4081 Remove got boosters message 2016-06-09 00:43:59 -05:00
Shaun Bennett d6bce63967 Use schematics from update folder 2016-06-09 00:43:03 -05:00
Shaun Bennett ece08c23a9 Fix merge issues 2016-06-09 00:40:05 -05:00
Shaun Bennett 699b35995f Merge remote-tracking branch 'remotes/origin/develop' into feature/gems
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java
2016-06-09 00:39:39 -05:00
Shaun Bennett d4ac309daa Merge remote-tracking branch 'remotes/origin/master' into feature/gems 2016-06-09 00:29:27 -05:00
Shaun Bennett 83be0d7efe Disable game boosters in arcade 2016-06-09 00:28:48 -05:00
Shaun Bennett 85829d355d Fix command permissions 2016-06-09 00:25:54 -05:00
Shaun Bennett 22bb56dfda Remove game booster button 2016-06-09 00:22:54 -05:00
Shaun Bennett 09d2c00f66 Proper display of extra gem fountain rewards 2016-06-09 00:14:01 -05:00
cnr cf6e3cf05d Merge branch 'feature/game-variants' into develop 2016-06-08 22:47:16 -05:00
Shaun Bennett c9d5b91c52 Proper booster activation events 2016-06-08 19:22:25 -05:00