TadahTech
0cda8ab7a3
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-06-24 04:11:59 -05:00
TadahTech
8fbb06ae3d
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
...
# Conflicts:
# Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2016-06-24 04:11:38 -05:00
cnr
14542d7dac
Close open UIs except for Champions kits
2016-06-24 04:10:08 -05:00
cnr
c40e07695c
Only close open UIs when choosing SSM kits
2016-06-24 04:06:28 -05:00
Shaun Bennett
560abc933c
Replace underscores with spaces in booster group
2016-06-24 03:16:42 -05:00
cnr
b58ff8c066
Add YouTube and Twitter buttons to UI
2016-06-24 01:30:10 -05:00
Shaun Bennett
fd843b88cb
Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/inventory/GemBooster.java
# Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
# Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java
2016-06-23 23:02:26 -07:00
Shaun Bennett
a9f291338f
Amplifiers GM Candidate
2016-06-23 22:49:12 -07:00
TadahTech
eeaf9fa49a
Fix chat in arcade
2016-06-23 23:24:50 -05:00
cnr
3433e0e3bc
Merge branch 'project-cosmetics' into develop
2016-06-23 18:42:47 -05:00
xXVevzZXx
e09df7ccfd
fix chests being opened by specs
2016-06-23 16:46:54 -05:00
xXVevzZXx
399ab5c363
fix supply chest protection, absorbtion effect, tnt and level bugs
2016-06-23 16:46:45 -05:00
LCastr0
c1b7be6363
Fix merge problems
2016-06-23 16:33:20 -03:00
LCastr0
7749314e64
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-06-23 16:11:49 -03:00
LCastr0
a441727e09
Freedom update:
...
Freedom chests
Freedom Aura
Shock and Awe
Leap of Freedom
Price of Freedom
Uncle Sam Morph
Freedom Mount
Uncle Sam Hat
Persistence update:
Items will still be enabled after player leaves the server
2016-06-23 16:09:31 -03:00
Shaun Bennett
1ea680cd20
Return to an invisible armor stand name
2016-06-22 21:01:37 -07:00
Shaun Bennett
bcf82ad513
Remove debug messages
2016-06-22 21:00:50 -07:00
Shaun Bennett
761e550d6c
Add shards to announcement message
2016-06-22 20:55:27 -07:00
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
TadahTech
d9c5e6323a
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-06-22 00:36:23 -05:00
TadahTech
4d31867e98
PC Party updates.
2016-06-22 00:35:57 -05:00
samczsun
d739df8623
UHC is faster now
2016-06-21 22:21:27 -05:00
TadahTech
a49e815765
Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-06-20 16:40:33 -05:00
TadahTech
2211cf4dec
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-06-20 16:37:07 -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
TadahTech
22e22ff508
Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/party/Party.java
# Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-06-12 00:42:22 -05:00
