Commit Graph

1331 Commits

Author SHA1 Message Date
Keir Nellyer 1854b71757 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2016-08-05 17:05:01 +01:00
cnr 3f0938815d Merge branch 'update/clans' into develop 2016-08-03 12:39:52 -04:00
AlexTheCoder fb3cfecc79 Move recharge handler 2016-08-02 20:44:09 -04:00
AlexTheCoder 4fdbb1fc9d Fix assorted bugs 2016-08-01 14:48:44 -04:00
AlexTheCoder cd237b8d3b Make players teleport to shops once they return to the nether 2016-07-30 17:42:57 -04:00
AlexTheCoder 2d39dbfb58 Move clans admin text 2016-07-30 17:34:03 -04:00
AlexTheCoder fe92633802 Add claim limit override for admin claiming 2016-07-30 16:49:39 -04:00
AlexTheCoder d1d366dcf8 Add a cooldown to clans shops to reduce chance of edge-case negative gold balances 2016-07-30 09:46:02 -04:00
Keir Nellyer bb9dbf1da4 PC-877 Vanish report handler when teleporting to offender's server 2016-07-29 15:08:03 +01:00
cnr d853f8467c Merge branch 'update/clans' into develop 2016-07-28 22:56:23 -05:00
AlexTheCoder 62e0a39ee8 Fix some medium graphics issues 2016-07-28 23:28:47 -04:00
AlexTheCoder 841a44b8a6 Make clan create button functional 2016-07-28 21:02:04 -04:00
AlexTheCoder 16804a860c Made duping usage for class shop impossible 2016-07-28 20:22:30 -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 47d79bbad5 Fix bugs arising during clans release 2016-07-28 19:08:47 -04:00
cnr a498bc13db Reinstate async wrappers for clans gold access 2016-07-28 14:59:43 -05:00
AlexTheCoder 4efe1fe76d Make boss portals open where the boss spawned 2016-07-28 05:46:26 -04:00
AlexTheCoder 639e089901 Disable clans tutorial 2016-07-28 04:28:34 -04:00
AlexTheCoder b718a72366 Fix shop chunk size being too small for map 2016-07-28 02:59:03 -04:00
AlexTheCoder d5a1312c48 Update border size to match new map 2016-07-27 20:46:40 -04:00
cnr 646ce96250 Ensure gold balance row is present 2016-07-27 16:15:03 -05: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
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
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 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 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 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 818ed4c9a9 Set up clans monetization features in the shop and fix some hardcoded names in core 2016-07-22 00:18:34 -04:00
AlexTheCoder 869dfc1dfa Finalize Amplifier system 2016-07-21 20:21:11 -04:00
TadahTech 5d0b5f80c0 Fix Party server sending. Tweak playercount and GUI display 2016-07-21 18:01:43 -05:00
AlexTheCoder 891a3231d8 Change banner GUI 2016-07-21 17:37:02 -04:00
AlexTheCoder 1f2b1557d5 Work on amplifiers and deleting banners when the clan is deleted 2016-07-21 13:20:45 -04:00
AlexTheCoder 1dedde41a8 Banners and beginning javadocs 2016-07-21 05:09:31 -04:00
AlexTheCoder 29d52ac075 More work on Nether 2016-07-20 10:42:24 -04:00
AlexTheCoder c58d226680 More work on Nether and Runes 2016-07-18 16:26:05 -04:00
AlexTheCoder 4238a1c385 Implement rune system and main nether minibosses 2016-07-17 07:14:08 -04:00
AlexTheCoder 98e88d1b77 Disable bosses not scheduled for initial releases 2016-07-16 22:00:38 -04:00
AlexTheCoder 08850d909f Further work on brood mother boss and nether 2016-07-16 21:59:03 -04:00