Commit Graph

9380 Commits

Author SHA1 Message Date
AlexTheCoder
16804a860c Made duping usage for class shop impossible 2016-07-28 20:22:30 -04:00
AlexTheCoder
97d5d21a55 Fix lightning orb duping 2016-07-28 19:43:43 -04:00
AlexTheCoder
853fe31fbe Merge branch 'update/clans' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-28 19:11:39 -04:00
AlexTheCoder
3aad06cc8a Make Clans displayed as FULL instead of BETA in server compass 2016-07-28 19:11:14 -04:00
AlexTheCoder
47d79bbad5 Fix bugs arising during clans release 2016-07-28 19:08:47 -04:00
AlexTheCoder
f3944527f8 Display clans purchases properly in support server 2016-07-28 19:08:24 -04:00
LCastr0
ab8d6daa2c GitHub being annoying again 2016-07-28 19:59:49 -03:00
LCastr0
8e58e12d43 Merge pull request #171 from Mineplex-LLC/develop
Merging... Again :/
2016-07-28 19:51:22 -03:00
Sam
9b71f8c30b Typo in KitBarrage 2016-07-28 22:49:58 +01:00
Sam
6c11037460 First QA testing session feedback 2016-07-28 22:39:05 +01:00
LCastr0
ab52965e44 Power Play button inside Carl, and the power play manager 2016-07-28 18:07:10 -03:00
Sam
771f643b42 Jumping disabled during Pyromancer ULT 2016-07-28 21:01:29 +01:00
cnr
a498bc13db Reinstate async wrappers for clans gold access 2016-07-28 14:59:43 -05:00
Sam
446aec5187 Add "for Team X" when picking up the Arrow powerup 2016-07-28 20:19:50 +01:00
Sam
ba03051689 Add 1 second respawn delay 2016-07-28 19:33:16 +01:00
Sam
d30703c570 Completed game logic & Kit fixes 2016-07-28 19:31:15 +01:00
Shaun Bennett
9c42f4c147 Use the proper boostergroup for amplifier thanks 2016-07-28 13:27:48 -05:00
Keir Nellyer
5dd35d45c4 PC-873 Alert user regardless of usage if banned from using /report 2016-07-28 17:41:20 +01:00
Keir Nellyer
8ee6ab6a1b Display message to reporters of a report when it is closed 2016-07-28 17:17:12 +01:00
AlexTheCoder
f0be7794f5 Lower skeleton king passive rate 2016-07-28 06:16:20 -04:00
AlexTheCoder
4efe1fe76d Make boss portals open where the boss spawned 2016-07-28 05:46:26 -04:00
AlexTheCoder
c30d30b2e7 Fixes event mobs getting stuck outside 2016-07-28 05:33:37 -04:00
TadahTech
ab9bf2f405 Fixes possible bug with party leaders not seeing chat.
Adds pling when you received an invite.
2016-07-28 03:40:24 -05:00
AlexTheCoder
639e089901 Disable clans tutorial 2016-07-28 04:28:34 -04:00
AlexTheCoder
aef94e13a8 Fix message not being sent 2016-07-28 04:18:29 -04:00
AlexTheCoder
b718a72366 Fix shop chunk size being too small for map 2016-07-28 02:59:03 -04:00
cnr
dd38a1dd76 Merge branch 'update/clans' into develop 2016-07-27 20:40:35 -05:00
AlexTheCoder
d5a1312c48 Update border size to match new map 2016-07-27 20:46:40 -04:00
cnr
05e59ae9cc Revert "Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing""
This reverts commit 917b83250d.
2016-07-27 19:03:04 -05:00
Sam
00c0e38b82 Kit upgrades now display 2016-07-27 23:02:40 +01:00
xXVevzZXx
749fa36a5a remove debug and check for Integer class 2016-07-27 16:47:08 -05:00
cnr
646ce96250 Ensure gold balance row is present 2016-07-27 16:15:03 -05:00
AlexTheCoder
62871686b0 Update clans store items to currency changes 2016-07-27 16:57:07 -04:00
cnr
dfbebe11f4 Use separate gold balances for each clans server 2016-07-27 15:52:07 -05:00
AlexTheCoder
031a9575ae Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-27 15:13:18 -04:00
AlexTheCoder
6180bea5cc Update clans drop aesthetics and spawn/shop locations 2016-07-27 15:07:11 -04:00
xXVevzZXx
43c45f4094 add timer to dragon escape 2016-07-27 13:59:35 -05:00
Sam
8648581140 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-07-27 19:57:25 +01:00
Sam
ee38cb4c39 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-07-27 19:56:36 +01:00
Sam
888d3fb1aa Payload logic progress 2016-07-27 19:56:31 +01:00
cnr
167c0f2b5e Reimplement EnergyShopButton with new machinery 2016-07-27 13:52:03 -05:00
cnr
3cddf35d12 Refactor out legacy ConfirmationPage 2016-07-27 13:52:03 -05:00
cnr
3d0cc2a5fd Refactor Clans gold dependency out of core 2016-07-27 13:52:03 -05:00
cnr
dc96258055 Merge branch 'feature/party-v2' into develop 2016-07-27 13:19:25 -05:00
Shaun Bennett
0d46bc4609 Add Amplifier thank button 2016-07-27 13:17:36 -05:00
Keir Nellyer
4dbbe6c32a Allow Collector instance to be configured in parameters 2016-07-27 16:49:50 +01:00
Keir Nellyer
97d72e97e4 Variable refactorings for consistency 2016-07-27 16:09:38 +01:00
Keir Nellyer
f2435c3b43 Packet class refactorings 2016-07-27 16:08:23 +01:00
Keir Nellyer
20fc867578 Display rank 'ALL' as 'Player' 2016-07-27 15:52:22 +01:00
Keir Nellyer
d474139220 Don't show Punish GUI unless report result is ACCEPTED 2016-07-27 15:46:54 +01:00