Commit Graph

11386 Commits

Author SHA1 Message Date
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
2facabbe2d Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/battle-royale 2017-06-23 14:18:51 +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
dddeb69391 Change beta requirement to ULTRA 2017-06-22 23:35:10 -05: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
cnr
6b24c55fef Merge branch 'feature/moba' into develop 2017-06-22 23:15:16 -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
8fb2c81c7f Shorten SR.MOD title 2017-06-22 21:45:09 +01:00
Sam
b064542c4e Staff and Clans Title 2017-06-22 21:39:37 +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
AlexTheCoder
61c57deaaa Disable these damn guardians lagging my clans servers 2017-06-19 19:01:09 -05:00
cnr
31605b02b0 Use polygon geometry for MOBA Boss AI boundaries 2017-06-19 18:38:31 -05:00
AlexTheCoder
7868287ace Temporarily disable clans maps 2017-06-19 18:32:57 -05:00
Sam
db98aa01c8 Training game base 2017-06-19 17:10:06 +01:00
cnr
185ac9fc05 Allow youtubers into full clans servers 2017-06-18 11:23:16 -05:00
Sam
17bfe9ee0a Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-18 10:55:46 +01:00
cnr
afdf1a1ad6 Fix missed string -> ClaimLocation migration 2017-06-17 15:45:39 -05:00
cnr
739cb83deb Revert "Re-implement the main clans tutorial"
This reverts commit 1574d93d1b.
2017-06-17 14:50:58 -05:00
cnr
1658afefca Don't key Maps by strings; use simple data type instead 2017-06-17 14:36:38 -05: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
599f391001 Fix build (typo) 2017-06-16 22:36:33 -05:00
Sam
b8d160388f Removed dropped exp from entity kills and fishing 2017-06-16 22:27:11 -05:00
cnr
c4d5ed4cbd Merge branch 'feature/clans-season-3' into develop 2017-06-16 22:26:36 -05:00
cnr
04d9e7326d Fix NPE in OP Skywars startup 2017-06-16 19:22:53 -05:00
Alexander Meech
10df654e42 Track enjin/support-given clans boxes in CUST-1 2017-06-16 18:36:38 -04:00
Alexander Meech
4e8838d99e Add Clans Dye Box and Clans Builder Box to CUST-1 2017-06-16 18:23:11 -04:00
Alexander Meech
93a316e5e3 Add clans box sales package 2017-06-16 18:20:21 -04:00
Alexander Meech
7a2864a701 Merge branch 'develop' into feature/clans-season-3 2017-06-16 16:25:57 -04:00
AlexTheCoder
d8bdda2c52 Update clans world border size for new map 2017-06-16 16:21:21 -04:00
Sam
b758254f4c Don't reset the player when an item is purchased 2017-06-16 18:54:23 +01:00
Sam
378fddf0c5 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-16 18:44:50 +01:00
AlexTheCoder
2b4aecd882 Fix bosses 2017-06-16 00:01:43 -04:00
AlexTheCoder
f6c7eaf28b Formatting fix 2017-06-15 23:47:12 -04:00
AlexTheCoder
fcce06fea9 Update item system for new legendary 2017-06-15 23:11:07 -04:00
AlexTheCoder
c64c0866fb Update Spawn locations for new map 2017-06-15 23:10:55 -04:00
AlexTheCoder
add639070a Fix cannons not firing 2017-06-15 23:10:28 -04:00