Commit Graph

10909 Commits

Author SHA1 Message Date
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
9cf5fda540 Update leaderboards system to use more malleable seasons system 2017-05-13 01:05:18 -04: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
b18aa7e840 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion 2017-05-12 22:59:03 +01:00
Sam
42ef7d0590 Lobby class 2017-05-12 22:58:58 +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
Dan Mulloy
35ed1099f9 Avoid instantiating HologramManager twice 2017-05-12 12:32:19 -07: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
Sam
5c968890d3 Just implement logging 2017-05-11 19:58:57 -07:00
samczsun
7658046d62 Change messages 2017-05-11 19:29:32 -07:00
samczsun
1390ea1579 Implement triggers 2017-05-11 19:29:32 -07:00
samczsun
ecef2fe9db New messages/durations 2017-05-11 19:29:31 -07:00
samczsun
c8a1035591 Comped accounts 2017-05-11 19:29:31 -07:00
AlexTheCoder
7ad86c435c More nitpicks 2017-05-11 21:40:06 -04:00
AlexTheCoder
3023c64c35 Jon is actually OCD 2017-05-11 21:34:41 -04:00
AlexTheCoder
1e93ad0b1e Proper resource management for leaderboard statements 2017-05-11 21:18:05 -04:00
AlexTheCoder
a76572f6d7 Change table names and add date indexes based on Jon's request 2017-05-11 20:49:38 -04: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
Sam
b446a7640e Hours not seconds 2017-05-11 22:56:48 +01:00
Sam
d7e3c25027 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters-11-5 2017-05-11 22:55:31 +01:00
Sam
7df87a7d7e Lots of fixes 2017-05-11 22:55:30 +01: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
AlexTheCoder
aa898d74da Fix incorrectly named tables in fetch query 2017-05-11 15:25:22 -04:00
AlexTheCoder
5d1199634d Rewrite leaderboard backend (again) 2017-05-11 14:48:35 -04:00
cnr
85c06c11cd Merge branch 'update/mayitems' into develop 2017-05-10 19:55:11 -07:00
cnr
0f98637024 Disallow players from switching between Gem Hunters via party 2017-05-10 19:54:28 -07:00
LCastr0
ac0339fc59 Fixed sync with dragon and fixed guardian not showing 2017-05-10 21:20:23 -03:00
LCastr0
5fe5c613e5 Fixed win rooms again 2017-05-10 19:25:14 -03:00
LCastr0
3dbed769c9 Fix for win rooms 2017-05-10 17:27:17 -03:00
Sam
1d4d56e792 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters-11-5 2017-05-10 19:27:14 +01:00
Sam
f7b80cc194 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-10 19:25:58 +01: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
f34a2946c4 Final leaderboard repository changes for Jon 2017-05-10 03:28:55 -04:00
AlexTheCoder
fa1cd00c22 Tidy up leaderboard repository class a bit 2017-05-10 02:56:00 -04:00