Commit Graph

4699 Commits

Author SHA1 Message Date
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
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 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
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 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