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
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
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
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
James R
e9869a55e3
Let dedicated servers end vote time too!
2019-04-04 16:13:31 -07: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
fickleheart
95179ed1f3
Update patch.kart hash again
2019-03-16 00:35:13 -05:00
fickleheart
22b02ed7b3
Merge branch 'kartstuff-fix' into version-prep
2019-03-16 00:02:40 -05:00
Steel Titanium
4757031929
Remove the define.
2019-03-15 18:46:25 -04:00
Steel Titanium
4837c1742b
Merge branch 'master' into errorifpng
2019-03-15 16:40:47 -04:00
fickleheart
6456754c1b
Oh, this was already here...
2019-03-12 08:39:25 -05:00
fickleheart
b76201a0df
Add missing deh entry for k_starpostflip
2019-03-12 07:34:47 -05:00
fickleheart
0a22f07751
Update version and patch hash
2019-03-11 22:40:15 -05:00
fickleheart
e536252a8a
Merge remote-tracking branch 'remotes/internal/upsidedown-brain' into HEAD
...
# Conflicts:
# src/k_kart.c
# src/p_mobj.c
2019-03-11 21:59:45 -05:00
fickleheart
5c4c0a5ff6
Merge remote-tracking branch 'remotes/upstream/next' into HEAD
2019-03-11 21:53:53 -05:00
fickleheart
e316963e1a
Merge remote-tracking branch 'remotes/upstream/master' into HEAD
2019-03-11 21:53:47 -05:00
fickleheart
b028f33455
Prevent music changes from playing when unfocused
2019-03-11 21:48:29 -05:00
wolfs
2195709d31
Merge branch 'color-flip' into 'next'
...
Fix color enums more
See merge request KartKrew/Kart-Public!112
2019-03-11 19:28:24 -04:00
wolfs
f4947820e4
Merge branch 'maxskins-bump' into 'next'
...
Bump MAXSKINS to 128 + Clean up skin struct
See merge request KartKrew/Kart-Public!82
2019-03-11 19:28:16 -04:00
wolfy852
d0fe0abc9c
Remove disableSpeedAdjust
2019-03-11 17:23:41 -05:00
James R
b91701c948
Miscellaneous window de-focus options
...
Music pausing is now optional.
Sounds may be paused--on by default.
The game itself being paused in off-line mode is now optional.
(showfocuslost now loads from config.)
2019-03-11 14:57:11 -07:00
James R
ffa3a3f3c6
Make "Focus lost" HUD overlay optional
2019-03-11 12:50:01 -07:00
Latapostrophe
395df49ff0
Fix what was discussed, minus the rocksneaker math which is still shady, but let's not break what currently works
2019-03-11 18:53:23 +01:00
Alam Arias
06cd65cc72
Merge branch 'master' into next
2019-03-11 10:01:57 -04:00
Alam Arias
ed0df9966d
Fix compiling with VS
2019-03-11 09:58:37 -04:00
