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 |
|
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 |
|
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 |
|
Sam
|
0fce5a9490
|
Emergency infinite shard fix
|
2017-05-09 19:49:25 -07:00 |
|
LCastr0
|
92eaf4f8d8
|
Merge branch 'develop' into update/mayitems
|
2017-05-09 23:31:43 -03:00 |
|
LCastr0
|
8bb638c969
|
Removed unused code
|
2017-05-09 23:30:52 -03:00 |
|
LCastr0
|
9018a3cc50
|
Fixed kit selectors
|
2017-05-09 23:30:24 -03:00 |
|
LCastr0
|
bcd60d325b
|
Fixed win rooms
|
2017-05-09 23:06:49 -03:00 |
|
AlexTheCoder
|
f2ff546d47
|
Clean up game classes a bit
|
2017-05-09 20:35:48 -04:00 |
|
Sam
|
10b0f1e1ed
|
Add an armour decay for offline players
|
2017-05-09 16:27:56 +01:00 |
|
Sam
|
26df99a4cf
|
Don't spawn combat NPCs in the lobby
|
2017-05-09 16:27:43 +01:00 |
|
Sam
|
1fbeaa6ecd
|
Add a random teleport npc in the safezones
|
2017-05-09 16:27:21 +01:00 |
|
Sam
|
9d3957cd54
|
Increase time after switching servers to kick player
|
2017-05-09 16:27:06 +01:00 |
|
AlexTheCoder
|
834c537bc8
|
Block spectators obtaining TNT
|
2017-05-08 23:22:48 -04:00 |