JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,837 Commits 1 Branch 0 Tags 481 MiB
621d72f541
Commit Graph

3261 Commits

Author SHA1 Message Date
Shaun Bennett
621d72f541 Fix merge issues, update lore text 2016-06-22 20:51:58 -07:00
Shaun Bennett
249a5c70aa Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final 
# Conflicts:
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2016-06-22 20:35:40 -07:00
Shaun Bennett
e855a866c7 Fix more thanks and booster occurrences 2016-06-22 08:58:27 -07:00
samczsun
d739df8623 UHC is faster now 2016-06-21 22:21:27 -05:00
Shaun Bennett
73183af9bf Fixing podium npc bug 2016-06-20 00:45:57 -05:00
Shaun Bennett
afc636b7c5 Fix amplifier reward message 2016-06-19 20:16:33 -05:00
Shaun Bennett
bb8d94f38a Fix a lot more Booster cases 2016-06-19 19:48:17 -05:00
Shaun Bennett
63b7648608 Amplifier rename, move podium backwards 2016-06-19 19:05:04 -05:00
TadahTech
d572635e99 Fix spelling mistake 2016-06-19 02:19:33 -05:00
TadahTech
5316dfe0c6 Remove Spammy "Loaded default kit message". 
Fixed SSM kits not closing the GUI when the central item is clicked.
Fixed Smash Crystals being carried over into the next game.
 2016-06-19 02:09:17 -05:00
xXVevzZXx
95649a5f14 adjust amount of gems as win reward 2016-06-18 20:48:55 -05:00
Shaun Bennett
a8e67eda88 Rename tip message PC-566 2016-06-18 14:45:39 -05:00
Shaun Bennett
2f0a559441 Add reload command, change podium to lime dye, change tip message 2016-06-18 14:41:32 -05:00
Shaun Bennett
690c6160b9 Green Armor 2016-06-18 14:27:53 -05:00
Shaun Bennett
4e3062f413 Swap Cosmetic and Booster interface slot 2016-06-17 15:23:53 -05:00
TadahTech
d16f83af00 Attempt to fix duplicate messages bug. I cannot reproduce in testing. 2016-06-16 21:12:17 -05:00
cnr
16f6d75dea Revert kit name changes 
We can change this back whenever we've migrated to the new name in mssql
 2016-06-16 20:36:33 -05:00
TadahTech
3dc93e5c8f Fix rare GUI reported bug. 2016-06-16 19:46:31 -05:00
TadahTech
2e0965a064 Fix Infestor kit 
Fix rare occurrence of players getting a GUI they shouldn't (reported)
 2016-06-16 19:45:36 -05:00
TadahTech
e28d411ee4 Fix evolution not progression. 
Fixed incorrect description in Gladiators
Reformatted kits in Bridges
 2016-06-16 18:39:37 -05:00
TadahTech
5ac6249684 Fix Bridges Kits not getting their items. 
Fix Kits breaking at Level 5
 2016-06-16 15:34:23 -05:00
Shaun Bennett
ea551182b6 Make booster gui smaller 2016-06-16 15:29:05 -05:00
TadahTech
e7d76e2ef4 Hot fixes. 2016-06-16 03:56:32 -05:00
samczsun
d6d8d288ca
Prevent TNT duping in Bridges. Fixes PC-132 2016-06-15 22:10:43 -04: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
Shaun Bennett
aa785ed3d5 Code clean-up and documentation 2016-06-12 21:18:11 -05:00
Shaun Bennett
2421fd1cfe Update booster page, proper booster rewards 2016-06-10 19:40:27 -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
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
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
xXVevzZXx
f6b60ad956 fix idle manager to persist teleports and make xp rewards depending on playtime 2016-06-09 15:51:27 -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
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
xXVevzZXx
ce8c8543f6 fix game class not beeing added to modable classes 2016-06-09 01:11:19 +02:00
xXVevzZXx
b66b459e05 implement xp multiplier 2016-06-08 23:40:48 +02:00
cnr
d54bed150e Merge branch 'mopple' into develop 2016-06-08 12:59:06 -05:00
xXVevzZXx
1aba217c55 slowly increase spider energy 2016-06-08 12:51:07 -05:00
xXVevzZXx
aa1c599b5e Disable particles in DMT, disable Monster Damage in OITQ, fix teleport out minion despawning, horsman description, ice melting in master builders and energy draining for spider leap in SSM 2016-06-08 12:51:07 -05:00
Shaun Bennett
37a412f1bf Starting to merge boosters into arcade code 2016-06-07 17:24:24 -05:00
Sam
8066eb939a PC-500 
Fixes an issue where players were able to open beacon inventories can
give themselves the buffs from it.
 2016-06-06 18:14:06 +01:00
Sam
4b576dbf3c PC-164 
Fixes an issue where players would be able to duplicate items in Bridges
 2016-06-05 23:03:04 +01:00