Commit Graph

4852 Commits

Author SHA1 Message Date
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
Sam 40543a5034 Fix gametype import 2017-05-22 23:00:22 +01:00
Sam 9df9fb80da Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion 2017-05-22 22:59:46 +01:00
Sam 4ed3135cdf Implement improved targetting system 2017-05-22 20:53:22 +01:00
Sam 176253faec Remove minion command 2017-05-21 17:33:33 +01:00
Sam 1db7454e81 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-20 17:45:19 +01:00
Sam f1ac67f049 Fix skeletons dropping items 2017-05-19 21:55:51 +01:00
Sam 3794686f58 Velocity and armour fix 2017-05-17 20:15:14 -06:00
Sam 500367b473 Premtive hotfix 2017-05-17 20:15:11 -06:00
cnr 06a6d1914d Add new words to DMT and MB 2017-05-17 20:03:54 -06:00
AlexTheCoder f69203884c Only allow kills to damage king/crystals if tnt has spawned at least once 2017-05-17 19:25:37 -06:00
AlexTheCoder eb0e9c0504 Make speed potions level 1 and drinkable 2017-05-17 19:25:37 -06:00
AlexTheCoder c3bd123ea1 Live op numero uno 2017-05-17 19:25:37 -06:00
cnr eec20cc620 Merge branch 'update/ssm' into develop 2017-05-17 19:22:59 -06:00
Sam fb50acc4cc Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters-11-5 2017-05-17 17:31:06 +01:00
Sam 5d63a19506 Minion AI Base 2017-05-16 22:33:08 +01:00
Sam 604804ff96 Fix tower explosions not working as intended 2017-05-16 18:02:50 +01:00
Sam 833ebd310e Reorganise of code 2017-05-16 18:02:34 +01:00
Sam 4148af9214 Teleport players "correctly" to their lanes 2017-05-16 12:16:50 +01:00
Sam 73ac34ec3d Enable teleporting to lanes 2017-05-16 11:58:11 +01:00
Sam 0874458754 Make the wither display its health 2017-05-16 11:58:00 +01:00
Sam 119b041ec1 Fix second towers being invincible 2017-05-16 11:57:04 +01:00
Sam 977907de61 Fix NPCs not spawning for some players 2017-05-16 11:56:50 +01:00
cnr cc98f4fdd5 Disable banner service calls 2017-05-15 17:59:56 -07:00
Sam f9cdddf1ad Towers 2017-05-15 23:16:30 +01:00
Sam 4b6b04d4eb Fix incorrect custom location 2017-05-15 19:55:58 +01:00
Sam 989c9a028c End the game when a wither is killed 2017-05-15 19:55:39 +01:00
Sam a450b23d22 Wither and AI base 2017-05-15 19:32:25 +01:00
Sam d510dd9f58 Increase Fountain damage range 2017-05-14 11:46:24 +01:00
Sam f2130515f3 Add suffixes to the scoreboard 2017-05-14 11:41:26 +01:00
Sam c3b5b9a8bd Implement shops for all roles 2017-05-14 11:41:09 +01:00
Sam f23e778d92 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-13 17:31:00 +01:00
Sam 5edbddb3d2 Make MobaItemEffect abstract 2017-05-13 17:30:59 +01:00
Sam 9a96ce5018 Reward title ingame 2017-05-13 17:13:34 +01:00
Sam bc5a9a1d5e Healing particle standard 2017-05-13 15:34:49 +01:00
Sam 85a384bad7 Unneeded if statement 2017-05-13 15:34:39 +01:00
Sam 321acce3c3 Make Bob Ross an invisible kit 2017-05-13 15:34:13 +01:00
Sam b52bc80985 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-05-13 15:18:10 +01:00
Sam c8f20f3df5 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion 2017-05-13 15:15:52 +01:00
Sam 5454c00163 Hub integration 2017-05-13 15:15:51 +01:00
AlexTheCoder 37d3b47995 Rebalance tank kit and set final values for kill streak crown rewards 2017-05-13 01:05:18 -04:00
AlexTheCoder a42e6ed9e4 Change crown calculations again 2017-05-13 01:05:18 -04:00
AlexTheCoder ea4f9aee62 Tweak crown kill streak multipliers 2017-05-13 01:05:18 -04:00
AlexTheCoder 130d1dc05e Fix TNT being stuck on head 2017-05-13 01:05:18 -04:00
Sam a6ec243a02 Sneak cancels CreeperExplode 2017-05-12 23:19:12 +01:00
Sam dc2d317652 Fix merging with develop 2017-05-12 23:07:20 +01:00
Sam ff07d38d00 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-05-12 23:04:47 +01:00
Sam 6ecbf85dc8 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion 2017-05-12 22:22:01 +01:00
Sam ab35e96ca1 Add more polish 2017-05-12 22:21:59 +01:00
Sam abb983ac04 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion 2017-05-12 17:34:55 +01:00
AlexTheCoder 7b7b91ed3f Fix small gameplay issues and update kit selection data points for TDM 2017-05-11 21:48:21 -07:00
cnr b18d36b361 Merge branch 'feature/castlesiege2.0' into develop 2017-05-11 20:29:46 -07:00
samczsun 1390ea1579 Implement triggers 2017-05-11 19:29:32 -07:00
AlexTheCoder 4a05149743 Use correct data loc pool for kit locations 2017-05-11 18:29:42 -04:00
AlexTheCoder 0091cbe2a8 Change kit data loc formatting 2017-05-11 18:15:33 -04:00
AlexTheCoder 86c66d3a44 Add specific kit spawn data locs 2017-05-11 16:05:19 -04:00
AlexTheCoder 7f240bb5a4 Fix some leaderboards not cleaning up after themselves 2017-05-11 15:53:58 -04:00
Sarah a07aa7abdc Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests 2017-05-11 20:57:04 +02:00
AlexTheCoder 5d1199634d Rewrite leaderboard backend (again) 2017-05-11 14:48:35 -04:00
Sarah 16e0f38dcf Menu Improvements and more Quest Trackers 2017-05-11 18:08:55 +02:00
Sam dcb676c57b Item upgrade effects 2017-05-10 19:25:56 +01:00
AlexTheCoder b4c27307ba Further leaderboard repository tweaks 2017-05-10 04:40:14 -04:00
AlexTheCoder adf6e35a1f Update leaderboard backend based on discussion with Jon 2017-05-10 02:49:21 -04:00
AlexTheCoder 3b3436d1af Remove TNT from TDM chest loot 2017-05-10 02:06:25 -04:00
LCastr0 92eaf4f8d8 Merge branch 'develop' into update/mayitems 2017-05-09 23:31:43 -03:00
AlexTheCoder f2ff546d47 Clean up game classes a bit 2017-05-09 20:35:48 -04:00
Sam eec8e5143d Per player scoreboards 2017-05-09 23:16:34 +01:00
AlexTheCoder 834c537bc8 Block spectators obtaining TNT 2017-05-08 23:22:48 -04:00
Sam 5f7574a0af Increase particles displayed when selecting a kit 2017-05-08 22:07:14 +01:00
AlexTheCoder d13610251f Rename Castle Siege 2.0 to Castle Assault and re-implement the old game 2017-05-08 17:05:30 -04:00
Sam 50da713947 Remove the previous upgrade when switching upgrades 2017-05-08 22:01:27 +01:00
Sam d107c8d6f4 Bob Ross 2017-05-08 21:09:09 +01:00
AlexTheCoder 452eaeeba9 Fix incorrect GameType association with TDM 2017-05-08 02:08:45 -04:00
AlexTheCoder 49aaaa5301 Leaderboard changes 2017-05-08 02:08:03 -04:00
AlexTheCoder b9fd597370 Replace old castle siege with new castle siege 2017-05-08 01:14:17 -04:00
AlexTheCoder 49575e794f Clean up castle siege leaderboards upon game end 2017-05-08 00:11:19 -04:00
AlexTheCoder d7341de2f5 Final tweaks to Castle Siege and implementation of leaderboards in arcade 2017-05-08 00:09:04 -04:00
Sam 5398bf5e81 More progress 2017-05-07 22:35:15 +01:00
AlexTheCoder 0b7789328a Add game tips and remove medals from initial release 2017-05-06 17:01:31 -04:00
Sam 23d924f137 Kit system 2017-05-06 20:51:49 +01:00
AlexTheCoder a47c4291c5 Update tiered achievement UI 2017-05-05 22:06:18 -04:00
AlexTheCoder 4d6824c27c Update Castle Siege mechanics 2017-05-05 22:05:58 -04:00
Sam a32ae91996 Gotta go fast! 2017-05-05 22:30:37 +01:00
Sarah f2c5268df1 Merge branch 'feature/quests' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests 2017-05-05 23:02:30 +02:00
Sarah 20281648c2 Add Quest triggers, add a Repository, add Spreadsheet parsing, and add menus. 2017-05-05 23:02:15 +02:00
AlexTheCoder a635793ede Add new Castle Siege modes 2017-05-04 23:20:50 -04:00
AlexTheCoder 455e09a9da More implementation of xp toggles for kit progression, and display achievement rewards properly for tiered leveling 2017-05-04 23:20:50 -04:00
AlexTheCoder 97a4b8e94d Add implementation for crown and xp toggles in ProgressingKit 2017-05-04 23:20:50 -04:00
AlexTheCoder ac98213d28 Update several perks to support vanilla damage system and kit progression 2017-05-04 23:20:50 -04:00
AlexTheCoder 7b70695e12 Update arcade games with new crown/gem toggle and flint and steel permission flag 2017-05-04 23:20:50 -04:00