Commit Graph

4841 Commits

Author SHA1 Message Date
Sam e8eb364d99 Fix incorrect descriptions 2017-07-24 15:40:15 +01:00
Sam 23373834a2 Achievement Kits 2017-07-24 15:36:45 +01:00
Sam 115b4487ea Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege 2017-07-22 21:27:24 +01:00
Sam 66fdd9be9f Skeleton mode 2017-07-22 14:24:29 +01:00
cnr e5e0fd8eda Halve exp requirements for leveling in MOBA 2017-07-20 01:03:03 -04:00
cnr d5d21a3fab Disable anticheat checks in event servers 2017-07-20 01:00:37 -04:00
Sam 8516a98087 Lots of bug fixes 2017-07-20 00:32:42 -04:00
Sam 0fa8a80f2e Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege 2017-07-17 12:56:41 +01:00
cnr f202085eeb Remove Heroes of GWEN from MPS 2017-07-15 13:21:29 -07:00
Sam 4a5913bb3a Don't have the second towers be Elder Guardians 2017-07-14 17:40:22 +01:00
Sam d9e1d211ac Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege 2017-07-14 13:33:06 +01:00
cnr 2fd3c9cc2f Send players into the training arena only if the game has started 2017-07-14 03:39:41 -07:00
cnr 1c75ec3f89 Merge branch 'feature/moba' into develop 2017-07-13 21:18:25 -07:00
Sam aa69b75be0 Final push 2017-07-14 02:04:29 +01:00
cnr da08868206 Fix ClassCastException in HitQuestTracker 2017-07-13 18:02:39 -07:00
Sam 17ba7ffe8a Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-07-13 15:50:05 +01:00
Sam e777293866 Add achievements 2017-07-13 15:38:56 +01:00
cnr f77cc39f0c Merge branch 'feature/quests' into develop 2017-07-12 22:49:15 -07:00
Sam 59af31c6f8 Fix spectators being able to interact with hero selection 2017-07-13 00:18:45 +01:00
Sam c4508b653a Remove rank requirement for HOG 2017-07-13 00:16:40 +01:00
Sam 25d3c09329 Complete implementation of game stats 2017-07-12 23:33:45 +01:00
Sam c7c8a848b1 More fixes 2017-07-12 19:18:14 +01:00
Sam 0d7079eae7 Fix silver fish just not doing anything 2017-07-12 18:05:47 +01:00
Sam 06a8c191ac Complete the implementation for map boards 2017-07-12 00:38:54 +01:00
Sam b7c629c4c8 Make item map billboards not really work 2017-07-11 02:10:43 +01:00
Sam c18c6cfc6a More changes 2017-07-10 21:59:34 +01:00
Sam 7544ff98ae Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege 2017-07-09 00:22:30 +01:00
Sam 84752f0b17 Item maps 2017-07-08 01:34:19 +01:00
Sam 994517b3a4 Finish up training mode 2017-07-07 02:22:05 +01:00
Sarah 8e0bb18076 Fixes of current and new missions 2017-07-06 22:55:34 +02:00
Sam 590c3d804b Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-07-06 17:15:51 +01:00
AlexTheCoder d61e067b86 Allow customer support to track freedom chests and improve error information to prevent forging/confusion 2017-07-05 21:38:53 -07:00
Sam fd660f95a0 Fix players getting stuck in pregame lobbies 2017-07-05 21:38:53 -07:00
Sam c5818b1bb5 Update time! 2017-07-06 00:35:05 +01:00
Sarah 1d046ff119 Add "all" to the GetMineplexMission Command, dont let specs get chest quest progress 2017-07-05 23:38:24 +02:00
Sam 558eeb528f Kit progression complete 2017-07-03 00:17:09 +01:00
Sam e2ff415e4d Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege 2017-07-01 15:36:10 +01:00
cnr 0ac3e227fd Merge branch 'feature/battle-royale' into develop 2017-06-30 22:15:53 -07:00
cnr 5ba1630fae Merge branch 'update/july-cosmetics' into develop 2017-06-30 22:15:31 -07:00
AlexTheCoder 43b1a118d3 Final tweaks and bugfixes for Sigils 2017-07-01 01:11:17 -04:00
Sam 81ae3e0049 Give players rewards and remove debug messages 2017-06-30 19:32:08 +01:00
Sam 29488a4ab8 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege 2017-06-30 14:23:10 +01:00
Sam f719e0db8d Clean up player data 2017-06-30 14:22:43 +01:00
Sam 811463e586 Attempt to somewhat fix the lag whenever the game starts 2017-06-30 13:56:20 +01:00
Sam 67d792e9d7 More progress 2017-06-30 12:57:20 +01:00
Sam a8e1799617 Fix Deathbomber achievement tracker 2017-06-30 00:27:12 +01:00
Sam 5a7c7b8fa3 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/battle-royale 2017-06-29 11:27:45 +01:00
cnr dfe2a61b8f Revert freedom chest cosmetics 2017-06-28 23:43:30 -07:00
cnr ed67a44fef Merge branch 'feature/moba' into develop 2017-06-28 20:39:27 -07:00
Graphica 7d17fa0f29 Update hubs with new CosmeticManager constructor 2017-06-28 20:38:58 -07:00
Sam 7bd5d65823 Reduce the amount of gems given for gold earned 2017-06-29 00:37:42 +01:00
Sam b8bb25b04d Only reset player health upon actual respawn 2017-06-29 00:35:18 +01:00
Sam 67d8e0863d Fix overtime being at 1 minute 2017-06-29 00:13:06 +01:00
Sam 85007820d2 Add a go-back button to kit selection 2017-06-28 23:38:50 +01:00
Sam 968fec5d77 Fix the cages not being removed correctly 2017-06-28 16:41:46 +01:00
Sam 82182c5d50 Balance changes 2017-06-28 15:34:56 +01:00
Graphica 9d1c3930b3 Update hubs with new CosmeticManager constructor 2017-06-28 01:37:33 -04:00
Sam b9a72312a8 Add a go back button on kit selection 2017-06-28 00:21:47 +01: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
Sam 61dd8e088e More CS Progress 2017-06-27 17:52:20 +01:00
Sam a79c79bc99 Add wither overtime 2017-06-27 12:38:43 +01:00
cnr ed541b7a4f Disable automatic timings reports 2017-06-26 20:17:50 -07:00
Sam 9cdc698999 Make it compile 2017-06-26 22:17:36 +01:00
Sam 76e13df32b More castle siege 2017-06-26 20:42:10 +01:00
Sam 9f182d123f Castle Siege partial re-code 2017-06-25 18:29:34 +01:00
Sam 31533f29b7 Add Guns into Battle Royale 2017-06-24 18:19:56 +01:00
Sam 3c031c70a1 Fix training lobby bugs 2017-06-24 10:09:52 +01:00
Sam c6a3001bae Basic battle royale game 2017-06-23 22:31:08 +01:00
Sam 4c6dfe6657 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-23 14:16:32 +01:00
Sam 98f9a58849 Fix light arrows being able to damage yourself 2017-06-23 14:12:36 +01: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
Sam c34bf77dc9 More testing feedback 2017-06-01 00:55:33 +01:00
Sarah d7731d330c Do some visual adjustments, add back button to quest stats menu, remove quest from buy bar after completion 2017-06-01 00:34:21 +02:00
Sarah 5c8e6d84b0 Add increment command, Questtrackers, change some visuals, allow Quests to have multiple required items 2017-05-31 21:51:04 +02:00
Sam 8a9e113389 Improvements to the targetting system 2017-05-31 17:09:08 +01:00
Sam edfadde239 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-31 13:05:13 +01:00
Sam 0edd2c8947 Feedback from testing 2017-05-31 13:05:06 +01:00
cnr f1bad41e89 Revert "Enable double XP + gems + shards for the weekend"
This reverts commit aa271a1bd3.
2017-05-29 22:44:54 -05:00
Sam c3a80ed0cb Fix pumpkin king's death not being logged properly 2017-05-29 12:40:18 +01:00
Sam 9e9bfe79de Pumpkin king boss 2017-05-28 16:27:54 +01:00
Sam 911fd030f3 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-28 13:20:24 +01:00
cnr e51818c15d Reduce alien shard reward to 5 per hit and make lobbies nighttime 2017-05-28 02:08:17 -05:00
Sam 18197de7be Correct operator... 2017-05-27 18:24:51 +01:00
Sam 5bdcd3474f Only give the chest once 2017-05-27 18:23:53 +01:00
Sam b9ad85dd1e Pumpkin King boss 2017-05-27 18:19:14 +01:00
Sam ffa2a736ec Give players an omega chest for completing the event 2017-05-27 17:03:52 +01:00
Sam 8f2c84b842 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-27 16:46:20 +01:00
Sam 8e87b1d3e9 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-27 13:55:36 +01:00
Sam 7705bd34a3 Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/aliens 2017-05-27 01:05:04 +01:00
Sam 4d4988577e Use a more sensible method of awarding shards 2017-05-27 01:01:16 +01:00
Sam e3f678d71d Bugs 2017-05-27 00:56:38 +01:00
cnr aa271a1bd3 Enable double XP + gems + shards for the weekend 2017-05-26 18:20:27 -05:00
cnr 4a7ca75b24 Open UFO event for the weekend 2017-05-26 18:08:24 -05:00
Sam 36733e9918 Fix gametype imports 2017-05-26 18:37:35 +01:00
Sam d70cd38049 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-26 18:34:23 +01:00
Sam 5c8a36b024 Sigils bug fixes 2017-05-26 18:33:06 +01:00
Sam 5ae32de83c Reduce the cooldown from 6 to 3 seconds 2017-05-24 21:05:58 -05:00
cnr fd1cd148cb Implement Alien Event service calls on Hub/Arcade 2017-05-24 20:52:24 -05:00
Sarah b7ba532568 Add quest stats page, make rewards be able to be items as well, fix some quest trackers, fix spelling mistakes 2017-05-25 00:40:41 +02:00
Sam a134c1da5c Sign off changes 2017-05-24 19:19:52 +01:00
Sam a6c1e6c892 Make minions target each other 2017-05-24 18:27:10 +01:00
Sam 6f48d0ee43 Improve the path finding ai 2017-05-23 22:57:13 +01:00
Sam 78b10e3cb8 Fix the majority of bugs for the 1 lane game 2017-05-23 20:37:31 +01:00