Commit Graph

3105 Commits

Author SHA1 Message Date
Shaun Bennett d8acb0aae6 Merge remote-tracking branch 'origin/clans_custom_gear' into clans/world-events
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2015-06-02 20:45:53 -05:00
Shaun Bennett 5d431a586a King of the hill work 2015-06-02 20:44:14 -05:00
Ty Sayers 1fa919e954 Finish GoldToken integration for cashing in. Re-implement fixed hidden JSON lore encoding. Fix damage reduction attributes where entity types weren't being properly initialized. Prevent players from breaking blocks in temporary Spawn regions. 2015-06-02 20:01:42 -04:00
Ty Sayers 155b078c49 Update spigot version to Shaun's changed. Add separate spawn locations at (200,0) and (-200,0) on the map as well as safe-zone regions surrounding spawns. Temporary halt energy deduction until energy shop is enabled. Fixed issues related to field zones being claimable/breakable, as well as borderlands. Define claimable areas. Add GoldToken item for storing currency into physical items. Add gold management for checking economic status for players. 2015-06-01 15:51:22 -04:00
Ty Sayers 2e19aabfa1 Convert damage system to custom Mineplex damage events to enable legendary abilities. Fix NPE and hanging issue on ServerData's serialization adapter. Finalize item generation logic for instantiating CustomItem's based on specified random distribution of types, attribute counts, etc. Fix several Legendary bugs discovered during testing. Clean left-over template documentation and further clarify ambiguous methods. Add proper updating logic for custom items to track internal stats in hidden json lore. Add safe-logout system to prevent combat logging and enable players to safely log after a designated amount of time. Tweak WindBlade's flight speed to a more natural value. 2015-06-01 12:25:20 -04:00
Shaun Bennett 68b708e32e Schematic Utilities for Clans 2015-05-29 18:23:46 -05:00
Shaun Bennett dc994956e1 [Clans] Slime absorb work 2015-05-28 18:56:03 -05:00
Shaun Bennett 6b10d9f3c9 [Clans] More work on world events 2015-05-28 15:20:43 -05:00
Ty Sayers 167549c9e8 Add implementation for variety of attribute and base attribute hierarchies, add in JSON encoding for itemstack-item pairing to hold stats and information about items without unintuitive print & parse methods. Temporarily disable donation related commands in DonationManager for testing, as it was presenting compilation issues. Introduce further implementation of LegendaryItems. Add various utility methods for JSON encoding (utilizes GSON). Fix various bugs seen in internal testing. 2015-05-25 14:22:06 -04:00
Shaun Bennett 20fadcd187 [Clans] Work on world events/slime boss 2015-05-24 01:37:16 -05:00
Shaun Bennett ff377a3e5c [Clans] World event state system 2015-05-21 15:33:02 -05:00
Ty Sayers a8a8d4961a Add remaining bow and armor based attributes, include base implementation of Legendary weapons. Fix smelting bug. 2015-05-16 12:58:58 -04:00
Ty Sayers 6b3028605e Merge branch 'master' into clans_custom_gear 2015-05-05 15:58:03 -04:00
Ty Sayers cf4caf8fc0 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-05-05 15:44:07 -04:00
Ty Sayers 66c9fefc6e Add leftover Clans commit to introduce GearManager. 2015-05-05 15:34:32 -04:00
Ty Sayers 7567648312 Add CustomItem hierarchy for Clans project, introducing rare gear that can be decorated with various ItemAttributes for unique effects. 2015-05-05 15:33:42 -04:00
Jonathan Williams a7407d8b8c Added all minigames standalones into mixed arcade player count. 2015-05-04 22:51:21 -05:00
Jonathan Williams f9f1d9b1ad Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-05-04 22:31:14 -05:00
Mini-Chiss 4cb0c01f59 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-04 15:35:10 -05:00
Mini-Chiss 7505bbc1a2 gravity fix 2015-05-04 15:34:57 -05:00
Peter Miller 4f54b9aa04 Bamboo... 2015-05-04 05:10:37 -04:00
Peter Miller ad82e9733a Moarerer Bamboo changes. 2015-05-04 04:33:28 -04:00
Peter Miller 93656f7659 Moarer Bamboo changes. 2015-05-04 04:28:34 -04:00
Peter Miller c93cd0d36c Moar Bamboo changes. 2015-05-04 04:25:44 -04:00
Peter Miller 3b518aec3f More build changes for Bamboo. 2015-05-04 04:14:19 -04:00
Jonathan Williams 4252bf70df Fix Master Builder game button in quick menu. 2015-05-04 01:40:57 -05:00
Mini-Chiss 0d1de153ec Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-04 00:56:19 -05:00
Mini-Chiss b959bcaa90 fixed 1.8 req 2015-05-04 00:56:12 -05:00
Jonathan Williams 677c8d1198 Updated default MOTD. 2015-05-04 00:42:59 -05:00
Jonathan Williams c8b5c84aa6 Added Master Builder quick game menu option.
Added player counts to quick game menu
2015-05-04 00:42:49 -05:00
Mini-Chiss 50cd692c62 fixed wither morph damaging blocks in grav lobby 2015-05-04 00:34:03 -05:00
Mini-Chiss 4f4aeac12c fixed typo 2015-05-03 23:34:09 -05:00
Mini-Chiss fa1ac52f78 grav balance 2015-05-03 20:21:00 -05:00
Mini-Chiss 838c369b7c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-03 20:12:13 -05:00
Mini-Chiss 95c9be47b6 missing kit 2015-05-03 20:12:06 -05:00
Shaun Bennett cb2666c4a5 Merge remote-tracking branch 'origin/master' 2015-05-03 20:06:19 -05:00
Shaun Bennett af1f735a43 Add lightning packets, various gui improvements 2015-05-03 20:06:10 -05:00
Mini-Chiss e013f8af8a sky text for hub change 2015-05-03 19:49:16 -05:00
Mini-Chiss 58671fa229 more words 2015-05-03 19:36:50 -05:00
Mini-Chiss 6978a176b1 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-03 19:10:55 -05:00
Mini-Chiss 7f0e175ba1 build update 2015-05-03 19:10:49 -05:00
Shaun Bennett 044d1098f4 Merge remote-tracking branch 'origin/master' 2015-05-03 19:10:22 -05:00
Shaun Bennett a435ed5bae More build changes 2015-05-03 19:10:13 -05:00
Mini-Chiss 1576085d87 more words 2015-05-03 18:33:31 -05:00
Mini-Chiss 73132d96b9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-03 18:33:03 -05:00
Mini-Chiss f36d7774cc Gravity update 2015-05-03 18:32:57 -05:00
Shaun Bennett de1f432be4 Build bug fixes 2015-05-03 18:31:56 -05:00
Shaun Bennett 74474c6227 Use itemstackfactory for formatted name 2015-05-03 18:26:20 -05:00
Shaun Bennett f98ac0874c Merge remote-tracking branch 'origin/master' 2015-05-03 18:22:14 -05:00
Shaun Bennett 83ff3c96aa Close inventory when game starts 2015-05-03 18:21:59 -05:00