Commit Graph

9193 Commits

Author SHA1 Message Date
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
Keir Nellyer 63917297ef Show /report and /reportclose command usage when attempting to use the command incorrectly 2016-07-27 15:45:12 +01:00
xGamingDudex 72b5507390 Fixed PC-120 2016-07-27 12:29:07 +02:00
xGamingDudex 161381f393 Fixed PC-698 2016-07-27 12:09:59 +02:00
AlexTheCoder 157c969e8d Completely prevent players in parties from joining Clans servers 2016-07-27 05:51:49 -04:00
AlexTheCoder d162750aec Keep nether loaded if its not empty 2016-07-27 04:47:03 -04:00
AlexTheCoder ea3cb36d3a Clean up miniboss mobs after their chunk unloads 2016-07-27 04:43:00 -04:00
AlexTheCoder 85cf005eba Small clans economy changes 2016-07-26 22:33:19 -04:00
AlexTheCoder 9c700425fd More javadocs 2016-07-26 22:32:46 -04:00
Keir Nellyer 2a167745a6 Update chatsnap url 2016-07-26 16:51:59 +01:00
AlexTheCoder d98ca0ab3c Remove unused miniboss 2016-07-26 09:00:37 -04:00
AlexTheCoder bb5d766ba6 Patch war point evasion by committing suicide in safezones 2016-07-26 07:35:11 -04:00
AlexTheCoder 34d5fb5e24 Fix craters getting glitched in wilderness 2016-07-26 07:15:40 -04:00
AlexTheCoder e396acc69c Fix clans ips being added to the bungee rotator 2016-07-26 07:15:09 -04:00
AlexTheCoder 4df8de58a6 More javadocs 2016-07-26 05:51:42 -04:00
AlexTheCoder bf5e9f1d76 ADD JAVADOCS TO CLANS 2016-07-26 05:50:43 -04:00
AlexTheCoder 61eca3ced0 Removed auto disguising from clans hub and removed clans tnt protection 2016-07-26 00:54:31 -04:00
AlexTheCoder 7b358adba1 Prevent runed pickaxe from destroying the nether 2016-07-25 20:26:23 -04:00
AlexTheCoder b41ad2e087 Fix NPC orientation in clans hub 2016-07-25 12:28:25 -04:00
AlexTheCoder aecaa89443 Update clans hub spawn location 2016-07-25 12:08:37 -04:00
AlexTheCoder 9a73784b7c Make clans in the hub route through clans hubs 2016-07-25 11:18:10 -04:00
AlexTheCoder a1fd021f8d Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-25 10:59:38 -04:00
AlexTheCoder 6f0d21120e Serious tweaks to gameplay and begin documentation 2016-07-25 10:59:03 -04:00
AlexTheCoder 0ecdce4edc Add clans hub to maven 2016-07-25 10:58:32 -04:00
AlexTheCoder 979bb92034 Allow treasure chests to be placed in other locations instead of fixing them in the main hub's configuration 2016-07-25 10:57:15 -04:00
AlexTheCoder 25b0ae5916 Add support for sending players back to any clans hub via portal 2016-07-25 10:56:30 -04:00
AlexTheCoder 275ab52f79 Create a clans-only hub 2016-07-25 10:55:18 -04:00
AlexTheCoder 9fab8366b7 Add support for clans hub connection inside bungees 2016-07-25 10:52:48 -04:00
TadahTech 5180e46be7 Revert party chat symbol to "@". Change team chat symbol to "#". 2016-07-24 22:17:50 -05:00
Sam 80eb7b2fd3 Gives Super Arrow on start. 2016-07-24 22:44:50 +01:00
Sam 576b92a5ce Ultimates added to QuiverPayload 2016-07-24 22:06:14 +01:00
TadahTech a23c2c4e1c Update UI to reflect allowing upgrades to be shown, per kit. 2016-07-24 16:05:19 -05:00
Sam ef797aa599 Velocity fix 2016-07-24 21:41:42 +01:00
Sam 76da92f42e QuiverPayload added
Basic implementation added
2016-07-24 21:27:31 +01:00
LCastr0 f4c40c61bb Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-07-24 13:18:53 -03:00
LCastr0 195a82f78f Github is annoying me about this, but I don't know what it is 2016-07-24 13:18:33 -03:00
LCastr0 ae416c0f9f Merge pull request #162 from Mineplex-LLC/develop
Thanks TadahTech
2016-07-24 13:16:31 -03:00
LCastr0 0dce530438 PowerPlayClub managers and stuff 2016-07-24 13:15:32 -03:00