Commit Graph

4673 Commits

Author SHA1 Message Date
Sarah 1d046ff119 Add "all" to the GetMineplexMission Command, dont let specs get chest quest progress 2017-07-05 23:38:24 +02:00
Sarah 333f1eda76 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests 2017-06-27 23:15:43 +02:00
Sarah 8541b984c6 Implement new Quests and fix older Quests 2017-06-27 23:15:25 +02:00
cnr b43203f831 Revert "Disable beta whitelist for MOBA"
This reverts commit 0374506879.
2017-06-22 23:32:55 -05:00
md_5 a6493ed18a Update MapParser to 1.12, refactor out some common base utilities. 2017-06-22 23:25:20 -05:00
cnr 0374506879 Disable beta whitelist for MOBA 2017-06-22 23:20:07 -05:00
Sam b1c3b2c937 Balance changes and QOL changes 2017-06-23 02:11:17 +01:00
Sam 2912968295 Fix movable NPCs 2017-06-23 01:51:16 +01:00
Sam 21c7b082b0 Add a method to clear purchases 2017-06-23 01:43:38 +01:00
Sam 65ebf41d4f Finish the training game for now 2017-06-23 01:43:11 +01:00
Sam f22a091fa0 More training game stuff 2017-06-22 20:21:19 +01:00
Sam e99be53bb5 Add a middle class to deal with multiple modes 2017-06-22 12:07:11 +01:00
Sam 0fe2c52500 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-21 13:57:12 +01:00
cnr 31605b02b0 Use polygon geometry for MOBA Boss AI boundaries 2017-06-19 18:38:31 -05:00
Sam db98aa01c8 Training game base 2017-06-19 17:10:06 +01:00
Sam 51460475de Change the Shop Item description 2017-06-17 12:47:28 +01:00
Sam dda27cb7fe Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-17 12:45:16 +01:00
Sam 9c5565ac3b Remove recalling as it is unused 2017-06-17 12:45:15 +01:00
Sam 04fafea3ed Fixed a number of error causes 2017-06-17 12:40:08 +01:00
cnr 04d9e7326d Fix NPE in OP Skywars startup 2017-06-16 19:22:53 -05:00
Sam b758254f4c Don't reset the player when an item is purchased 2017-06-16 18:54:23 +01:00
Sam 5b985c33ac Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-15 23:26:57 +01:00
Sam 07779cdf55 Reduce the damage from TNT Infusion 2017-06-15 23:26:56 +01:00
Sam a12564c8a9 Fix consumables 2017-06-15 23:26:29 +01:00
Sam c2cbcfc62f Fix spamming bombardment 2017-06-15 21:22:26 +01:00
cnr ba506f9c7b Fix beta whitelist duplicate-enable 2017-06-14 22:26:29 -05:00
Sam cfe8840d7a Fix some really silly things 2017-06-15 01:59:00 +01:00
cnr 2a0796472b Add beta whitelist to MOBA 2017-06-14 19:54:23 -05:00
Sam 29d5a80a67 Final changes 2017-06-15 01:33:20 +01:00
Sam 4978f924a7 Lots of bug fixes 2017-06-13 21:49:34 +01:00
Sam 3efeb38a01 Working through JIRA 2017-06-13 00:29:05 +01:00
Sam c8340730ad Improve Bardolfs wolves 2017-06-11 00:00:28 +01:00
Sam ac52903b7d QOL changes 2017-06-09 13:10:11 +01:00
Sam 79b983536d While Withered, prevent regeneration 2017-06-08 22:55:17 +01:00
Sam e94ab9598a New Heroes 2017-06-08 22:43:50 +01:00
Sam 206dd56d14 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-08 16:10:49 +01:00
Sam 9844ca338a Complete Biff 2017-06-08 16:09:32 +01:00
Sam 044927252c More changes! 2017-06-08 01:55:07 +01:00
Sam a800fee08c Testing session changes 2017-06-06 22:59:40 +01:00
Sam a63399943d Leaderboards and UFO world event 2017-06-06 19:28:41 +01:00
Sam a3fd81f763 Fix Biff's skills not cleaning up 2017-06-04 10:52:43 +01:00
Sam e094446be4 Add biff to the hero list 2017-06-03 15:33:26 +01:00
Sam dbde734e76 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-03 14:54:43 +01:00
Sam c3f3d71610 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters 2017-06-03 14:53:34 +01:00
Sam 092c5db6b2 Merge remote-tracking branch 'refs/remotes/origin/update/gem-hunters-11-5' into update/gem-hunters 2017-06-02 20:10:51 +01:00
Sam 7e05cbfa87 Biff 2017-06-02 18:43:07 +01:00
Alexander Meech 62d15eeee1 Make podium generation setting based on map rather than hardcoded server group 2017-06-02 02:42:21 -05:00
Sarah 73897e407b Add fix for new game lobbies 2017-06-02 03:41:06 +02:00
Sarah 9b64f5da66 change quest name to "Mineplex Mission" 2017-06-01 20:59:35 +02:00
Alexander Meech 01e7dc85dd Merge branch 'develop' into feature/quests 2017-05-31 22:21:24 -04:00