Commit Graph

4852 Commits

Author SHA1 Message Date
Sam 4a9689bd17 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/hub-makeover 2017-10-01 14:41:38 +01:00
cnr b6d6fbf358 Enable 2x XP for the weekend 2017-09-29 17:02:09 -05:00
AlexTheCoder 0a5dae5857 Fixed merge conflicts 2017-09-23 03:58:40 -04:00
AlexTheCoder 567b501dfb Fixed merge conflicts 2017-09-23 03:41:43 -04:00
AlexTheCoder eecf960613 Fixed Merge Conflicts 2017-09-23 03:40:21 -04:00
Sam 76ae23b56f Start on profiles 2017-09-20 22:21:42 +01:00
Sam 5ec2307cc9 Cleanup CustomDataManager 2017-09-19 14:51:37 +01:00
Sam efc1ffe9db Finish off Old Chests 2017-09-18 12:19:02 +01:00
Sam fd75b53bcc Merge remote-tracking branch 'refs/remotes/origin/develop' into update/hub-makeover 2017-09-16 23:33:43 +01:00
Sam 2b4e9e62e1 The mess that is now this 2017-09-16 23:33:42 +01:00
Sam 52adaf45a2 Only disable costumes 2017-09-13 22:59:19 -05:00
Sam 134039bf79 Revert "Revert "Disable gadgets if the game is in progress""
This reverts commit d3ae579317cc8db79e65468c0a5f85979d82ba37.
2017-09-13 22:59:19 -05:00
Sam fba7997549 Revert "Disable gadgets if the game is in progress"
This reverts commit c03a0c859bbeaedb2640c2d6d927d40e42374f85.
2017-09-13 22:59:19 -05:00
Sam f72c2d4ec0 Disable gadgets if the game is in progress 2017-09-13 22:59:19 -05:00
Sam e51487a949 Actually never mind 2017-09-13 22:59:19 -05:00
Sam 88f842d8b7 Remove the fakeLeashDamage check, causes too many problems 2017-09-13 22:59:19 -05:00
Sam 3362793324 Removed the Bomb Lobbers Jumper cooldown 2017-09-13 22:59:19 -05:00
Sam b8210f5eac Merge remote-tracking branch 'refs/remotes/origin/develop' into update/hub-makeover 2017-09-12 21:33:20 +01:00
Sam fc258d95b9 Fix infinite slowness 2017-09-11 21:45:00 -05:00
Sam 5ed7be68d9 Fix invincibility 2017-09-11 21:44:53 -05:00
Sam bf82b7c0f4 Disable gadgets when the timer gets below 5 2017-09-10 23:54:10 +01:00
Sam c729857a00 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/hub-makeover 2017-09-09 09:19:46 +01:00
cnr aac173c105 Merge branch 'update/moba-cosmetics' into develop 2017-09-08 20:31:39 -05:00
Sam c0cda476e4 Complete chest 2017-09-09 02:29:19 +01:00
Sam 9214c809dc Add support for bardolf's werewolf skin 2017-09-08 17:43:39 +01:00
Sam 554aeb6af5 Bug fixes 2017-09-08 16:51:13 +01:00
Sam 7b1245077f Finish everything 2017-09-08 11:10:24 +01:00
cnr 4c3de65734 Enable Anticheat strict mode 2017-09-07 21:21:28 -05:00
Sam 330ed28992 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics 2017-09-06 11:31:53 +01:00
Sam 8724a35269 Tron Hub Game 2017-09-06 11:22:49 +01:00
AlexTheCoder 64c2c65bd0 Fix debug permissions 2017-09-02 20:03:28 -04:00
cnr b860a69d46 Allow event hosts to use /game 2017-09-01 23:14:26 -05:00
Sam f41e94a3f4 Fix compilation errors 2017-09-01 16:57:15 +01:00
Sam cd99700eda Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics 2017-09-01 16:12:51 +01:00
cnr cad44497bd Fix missed compile errors 2017-09-01 00:25:39 -05:00
cnr 919141f2a7 Merge branch 'develop' into feature/rank-rewrite 2017-08-30 17:42:16 -05:00
cnr 994f957bc3 Eliminate GroupPermission 2017-08-28 13:06:59 -05:00
Sam 8e327e86b4 Huge improvement on the Cosmetic System 2017-08-26 16:14:22 +01:00
Sam 19c65560c5 Remove rotaton on emblems 2017-08-24 11:52:04 +01:00
Sam e412c2cc05 Gem Hunter Mount Skins 2017-08-21 21:11:13 +01:00
Sam fd090a5644 Fix a lot of bugs 2017-08-20 23:04:28 +01:00
Sam 1c86cff6d7 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics 2017-08-18 16:51:51 +01:00
Sam c0ed39d9f9 Get emblems to spawn 2017-08-18 16:51:50 +01:00
Sam 01fb5a312f More balance changes 2017-08-18 15:33:31 +01:00
Sam d9a2306f9b Always setMaxHealth from a base of 20 2017-08-17 23:59:38 -04:00
Sarah 7f6796cff9 Fix Dragon Escape mission 2017-08-17 23:59:04 -04:00
cnr 4a08c3f1d7 Implement requested Anticheat changes
- Reduce speed + glide ban VL to 7500
- Re-enable bans for Killaura type D and Killaura type F
- Re-enable auto-sneak detection and bans
- Disable Killaura type D in MOBA and CS
2017-08-17 00:58:39 -04:00
Sam 849fa93c7c Mount base 2017-08-16 15:00:08 +01:00
Sam 7667bf47c4 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics 2017-08-14 16:58:16 +01:00
Sam 9300af8370 Added the Hero Ivy 2017-08-14 16:57:44 +01:00