wolfy852
|
e2a6b9fad4
|
Merge remote-tracking branch 'remotes/pub/next' into v1
|
2019-04-26 05:53:26 -05:00 |
|
wolfs
|
ce5b99cfe4
|
Merge branch 'forceskin-by-name' into 'next'
Allow names to be used with forceskin
See merge request KartKrew/Kart-Public!102
|
2019-04-26 06:42:09 -04:00 |
|
wolfs
|
cc954e3ffa
|
Merge branch 'add-value-command' into 'next'
Add a command to increment cvars
See merge request KartKrew/Kart-Public!128
|
2019-04-26 06:41:52 -04:00 |
|
wolfy852
|
2bdfbcdd23
|
Merge remote-tracking branch 'remotes/pub/master' into next
|
2019-04-26 05:42:27 -05:00 |
|
wolfs
|
674810478d
|
Merge branch 'room-list-first' into 'master'
Show room list instead of server list if you haven't selected a room yet
See merge request KartKrew/Kart-Public!127
|
2019-04-26 06:39:31 -04:00 |
|
wolfs
|
8df9861b3f
|
Merge branch 'no-audio-option' into 'master'
`-noaudio` option to cover `-nomusic` and `-nosound`
See merge request KartKrew/Kart-Public!129
|
2019-04-26 06:37:02 -04:00 |
|
wolfs
|
f624d2acda
|
Merge branch 'save-showjoinaddress' into 'master'
Save showjoinaddress to config
See merge request KartKrew/Kart-Public!132
|
2019-04-25 23:17:07 -04:00 |
|
Steel Titanium
|
cae59aad9a
|
Save showjoinaddress to config
|
2019-04-25 23:13:09 -04:00 |
|
Sal
|
5839fa4cee
|
Merge branch 'spb-stuff' into 'v1'
Fix SPB being way too fast in current sections where the player has no control
See merge request KartKrew/Kart!141
|
2019-04-22 22:00:06 -04:00 |
|
Latapostrophe
|
313b971e17
|
Fix SPB being way too fast in current sections where the player has no control
|
2019-04-22 20:40:17 -05:00 |
|
wolfy852
|
9cac5f5277
|
Don't cut off flashing tics when using sneakers, don't allow stealing bumpers while intangible
|
2019-04-22 20:18:15 -05:00 |
|
Sal
|
41fc8f2621
|
Merge branch 'under_the_weather' into 'master'
Under the weather
See merge request KartKrew/Kart-Public!125
|
2019-04-19 16:40:25 -04:00 |
|
James R
|
6a5bb9f23f
|
Add a "-noaudio" parm to cover "-nomusic" and "-nosound"
|
2019-04-18 23:50:29 -07:00 |
|
James R
|
c2a14da4b5
|
Add a command to increment cvars
|
2019-04-18 23:42:28 -07:00 |
|
James R
|
7dae0ad875
|
Show rooms list in server browser initially
If you haven't selected a room yet, you're
shown the room list instead of server list.
|
2019-04-18 22:41:50 -07:00 |
|
James R
|
7fd1f6c528
|
Support splitscreen PLAYERINFO and don't expose clients' IP addresses
|
2019-04-14 21:14:01 -07:00 |
|
toaster
|
5a6722a5e9
|
Precipitation being drawn at infinite distance when set to zero is incorrect behaviour. This is likely the consequence of a bad merge, but I don't care enough to check for certain.
|
2019-04-14 14:41:39 +01:00 |
|
Steel Titanium
|
8e09ba7dbf
|
Merge branch 'next' into forceskin-by-name
|
2019-04-11 21:01:14 -04:00 |
|
Sal
|
b110591a63
|
Merge branch 'clear-all-controls' into 'master'
Clear P3 and P4 controls too when clearing all controls
See merge request KartKrew/Kart-Public!117
|
2019-04-11 12:20:48 -04:00 |
|
Sal
|
ac2bce0a3e
|
Merge branch 'fix-function-typo' into 'next'
Lua: fix K_PlayPowerGloatSound mistype
See merge request KartKrew/Kart-Public!122
|
2019-04-11 12:06:33 -04:00 |
|
Sal
|
a1e4748a68
|
Merge branch 'patch-1' into 'next'
Add missing entry for SKINCOLOR_BUBBLEGUM in ColorOpposite()
See merge request KartKrew/Kart-Public!119
|
2019-04-11 12:05:59 -04:00 |
|
Lachlan Wright
|
bc2f78020b
|
Update k_kart.c
|
2019-04-10 03:16:46 -04:00 |
|
Steel Titanium
|
13bfbac72b
|
Lua: fix K_PlayPowerGloatSound mistype
|
2019-04-06 21:59:58 -04:00 |
|
James R
|
e9869a55e3
|
Let dedicated servers end vote time too!
|
2019-04-04 16:13:31 -07:00 |
|
Steel Titanium
|
e47854880a
|
Merge branch 'next' of git.magicalgirl.moe:KartKrew/Kart-Public into forceskin-by-name
|
2019-03-27 19:18:51 -04:00 |
|
Lachlan Wright
|
40f351debb
|
Add missing entry for SKINCOLOR_BUBBLEGUM in ColorOpposite()
|
2019-03-27 03:23:32 -04:00 |
|
Alam Arias
|
ef10d08db3
|
Merge commit 'upstream/master~1'
|
2019-03-26 09:48:13 -04:00 |
|
Monster Iestyn
|
a1c30e3b6a
|
Merge branch 'dedicated-server-credits-fix' into 'master'
Dedicated server credits fix
See merge request STJr/SRB2!476
|
2019-03-26 09:44:21 -04:00 |
|
Monster Iestyn
|
9da1033467
|
Fix credits gamestate in dedicated mode, by properly separating the timer variable code from the drawing code in a semi-hacky way
|
2019-03-25 21:35:04 +00:00 |
|
Monster Iestyn
|
fa3349a117
|
R_RenderThickSideRange: clamp lights that fail overflow test, rather than skipping them.
|
2019-03-25 18:54:47 +00:00 |
|
fickleheart
|
d22601e979
|
Clear P3 and P4 controls too when clearing all controls
|
2019-03-24 17:31:04 -05:00 |
|
Alam Arias
|
212a2ecf5b
|
Merge remote-tracking branch 'upstream/master'
|
2019-03-23 15:08:45 -04:00 |
|
Alam Arias
|
d6da0b1b7f
|
Merge commit 'upstream/master~1'
|
2019-03-22 10:18:10 -04:00 |
|
James R
|
6939dca52a
|
Actually allow connecting to "localhost"
Because IPv6 doesn't seem to work anyway.
|
2019-03-20 20:37:00 -07:00 |
|
James R
|
25bd4a0876
|
Let localhost connections
|
2019-03-20 20:37:00 -07:00 |
|
Monster Iestyn
|
ce37e4c9c8
|
Merge branch 'sdl-noxinput-nohidapi' into 'master'
-noxinput and -nohidapi command line parameters.
See merge request STJr/SRB2!468
|
2019-03-20 17:33:04 -04:00 |
|
fickleheart
|
5c6f142da1
|
LAT
|
2019-03-17 21:44:11 -05:00 |
|
fickleheart
|
bd5c8f0ce5
|
Merge remote-tracking branch 'remotes/james/move-changeviewpoint' into version-prep
|
2019-03-17 16:37:01 -05:00 |
|
fickleheart
|
6555802dc0
|
Merge remote-tracking branch 'remotes/james/unpause-resume-sounds' into version-prep
|
2019-03-17 16:36:52 -05:00 |
|
James R
|
81669c9372
|
Resume sounds on unpausing after a window re-focus
|
2019-03-16 15:50:16 -07:00 |
|
James R
|
52deb3ea74
|
Move change viewpoint control checking so it doesn't take precedence
Notably over chat.
|
2019-03-16 15:42:18 -07:00 |
|
fickleheart
|
344b43d151
|
Merge branch 'netarchive-fix' into version-prep
|
2019-03-16 15:00:02 -05:00 |
|
fickleheart
|
8670de1398
|
Merge branch 'colormap-caching-workaround' into version-prep
|
2019-03-16 14:59:55 -05:00 |
|
fickleheart
|
93bd5b61c9
|
Fix bad merge in map data archiving code
|
2019-03-16 14:56:56 -05:00 |
|
fickleheart
|
e590659603
|
Don't free this cached colormap!
|
2019-03-16 12:22:11 -05:00 |
|
fickleheart
|
0f658555c4
|
Merge branch 'lua-ticcmd-latency' into version-prep
|
2019-03-16 02:41:19 -05:00 |
|
fickleheart
|
2f2f136da4
|
Merge branch 'colormap-caching-workaround' into version-prep
|
2019-03-16 02:41:14 -05:00 |
|
fickleheart
|
272640f49a
|
Allow reading ticcmd latency
|
2019-03-16 02:19:43 -05:00 |
|
fickleheart
|
1b02ac10e2
|
Remove dumb special case
|
2019-03-16 01:29:13 -05:00 |
|
fickleheart
|
932f73a171
|
Cache colormaps everywhere to avoid memory leaks
|
2019-03-16 00:39:52 -05:00 |
|