Sally Coolatta
29b4bf872f
Merge branch 'master' into next
2020-08-26 12:56:38 -04:00
Sal
55821da246
Merge branch 'various-compiling-fixes-2' into 'master'
...
Fix some compile flags
See merge request KartKrew/Kart-Public!213
2020-08-26 09:58:35 -04:00
Sal
3064c87212
Merge branch 'too-many-characters' into 'master'
...
Warn players when going over the skin limit
See merge request KartKrew/Kart-Public!214
2020-08-26 09:58:22 -04:00
ThatAwesomeGuy173
11f98adad4
Replace 'ignoring skin' debug print with a proper console warning
2020-08-25 23:13:58 -06:00
Sal
f93c5f435d
Merge branch 'various-compiling-fixes' into 'next'
...
Various compiling fixes
See merge request KartKrew/Kart-Public!212
2020-08-25 18:36:51 -04:00
James R
3f8edd38a5
Fix NOHW compiling
2020-08-24 18:06:00 -07:00
James R
a79316b375
Kill NOHS
2020-08-24 17:58:39 -07:00
James R
6a14d9c1d4
Fix NOMIXER compiling
2020-08-24 17:55:42 -07:00
James R
594600e5ae
Fix NOPNG compiling
2020-08-24 17:52:55 -07:00
James R
d52a35e5b6
Fix NOGME compiling
2020-08-24 17:51:01 -07:00
Sal
60dc56dfe3
Merge branch 'fix-asktime-really' into 'next'
...
Avoid underflows on connection screen timer (fixes hosting servers)
See merge request KartKrew/Kart-Public!211
2020-08-24 16:09:33 -04:00
Steel Titanium
23b1f8fc5e
Initialize this variable
2020-08-24 01:25:34 -04:00
Steel Titanium
94ca85b229
Hopefully the last time...
2020-08-24 01:18:38 -04:00
Steel Titanium
6c0c0d710f
Remind me why NONET exists?
2020-08-24 01:13:59 -04:00
Steel Titanium
0021128446
This is just stupid
2020-08-24 01:06:10 -04:00
Steel Titanium
7005d8303c
Turns out compiling with the internal version of curl was broken on CMake the entire time 🙃
2020-08-24 01:00:28 -04:00
Steel Titanium
d1d1b3aadf
Screw you C90
2020-08-24 00:58:14 -04:00
Steel Titanium
858f345802
Haha NONET...
2020-08-24 00:56:53 -04:00
Sal
a85bc82ece
Merge branch 'lineriding-b-gone' into 'next'
...
Kill offroad line riding
See merge request KartKrew/Kart-Public!199
2020-08-23 05:09:55 -04:00
Sally Coolatta
8e62efb79c
Merge branch 'master' into next
2020-08-23 04:44:27 -04:00
Sally Coolatta
36c5abf611
Fix version string
2020-08-23 04:44:05 -04:00
Sal
e5c675c679
Merge branch 'fix-ogl-timedemo' into 'master'
...
Fix timedemo in OpenGL mode
See merge request KartKrew/Kart-Public!209
2020-08-23 04:38:57 -04:00
Sal
33c7e91b41
Merge branch 'misc-optimizations' into 'master'
...
Remove ESLOPE POLYOBJECTS POLYOBJECTS_PLANES #ifdefs (backport srb2 2.2)
See merge request KartKrew/Kart-Public!204
2020-08-23 04:38:05 -04:00
James R
e02829186f
Merge branch 'demoleak-fix' into 'master'
...
Fix replay recording memory leak
See merge request KartKrew/Kart-Public!208
2020-08-22 21:42:34 -04:00
James R
481f8c2caa
Avoid underflow hacks completely with asktime
2020-08-22 18:38:20 -07:00
Hannu Hanhi
37c5c1ca8a
Fix timedemo in OpenGL mode
2020-08-23 00:10:50 +03:00
Hannu Hanhi
28882fec24
Fix replay recording memory leak
2020-08-22 22:04:45 +03:00
Sal
64b38df5b9
Merge branch 'dehacked-slipup' into 'next'
...
Correct misplaced MT_ARIDTOAD listing
See merge request KartKrew/Kart-Public!206
2020-08-22 08:16:41 -04:00
lachwright
9feee5348d
Correct misplaced MT_ARIDTOAD listing
2020-08-22 17:35:31 +08:00
Sal
6dace9aeff
Merge branch 'conenction-screen-improvements' into 'next'
...
Connection screen improvements
See merge request KartKrew/Kart-Public!187
2020-08-21 00:11:37 -04:00
Ashnal
7c5a969473
Fixed retry timeout to no ttrigger when starting a local server
2020-08-20 23:38:04 -04:00
Ashnal
60cfc091e5
Add return false to the connect timeout
2020-08-20 23:09:12 -04:00
James R
a09592b5da
Merge remote-tracking branch 'origin/master' into next
2020-08-20 19:55:03 -07:00
FlykeSpice
2d9ec1687c
Remove POLYOBJECTS POLYOBJECTS_PLANES #ifdefs(backport from srb2 2.2)
2020-08-20 13:02:13 -04:00
FlykeSpice
2424418390
Remove ESLOPE #ifdef(backport from srb2 2.2)
2020-08-20 13:02:13 -04:00
Sal
d698705f5e
Merge branch 'port-port-port' into 'master'
...
2.2's random client port
See merge request KartKrew/Kart-Public!201
2020-08-20 12:19:52 -04:00
Sal
4bf5e5a020
Merge branch 'snapback' into 'master'
...
Instantaneous lookback camera (v2 backport)
See merge request KartKrew/Kart-Public!203
2020-08-20 12:19:41 -04:00
Sal
d9cc5f1627
Merge branch 'gme-fixes-cleanup' into 'master'
...
GME cleanup and fixes
See merge request KartKrew/Kart-Public!202
2020-08-20 02:07:19 -04:00
lachwright
49fa372b8d
Instantaneous lookback camera (v2 backport)
2020-08-20 13:41:03 +08:00
Ashnal
538ec7e61d
Well actually, lets fix all comparisons of askset to use the same comparison
...
If we initialize to I_GetTime() - NEWTICRATE*3 it never underflows and everything is good
2020-08-20 00:54:18 -04:00
Steel Titanium
8ad5eaad2e
GME cleanup and fixes
...
Just some stuff backported from SRB2 2.2, well mostly
get_zlib_error function to reduce code duplication
Return false if it fails to load the VGZ lump
Reduce redundant calls to gme_set_equalizer
Fix sometimes loading a VGZ crashing the game
2020-08-19 22:39:12 -04:00
James R
2c3b30de90
-clientport (it's back!) and -serverport, which is an alias to -port
...
If you ever need to, you can change the client port number.
(cherry picked from commit 17749b9e3e
2020-08-19 18:16:54 -07:00
James R
e3a383aafc
Use a pointer for port_name
...
Using strcpy is stupid because we don't know how long the argument would be.
There's no need for a buffer anyway.
(cherry picked from commit 5921e1a567
2020-08-19 18:16:53 -07:00
James R
d365ea7981
Use a random port when connecting
...
(cherry picked from commit 8368449e6c
2020-08-19 18:16:53 -07:00
James R
328dd607d8
Fix tiny mistake with the last commit
2020-08-19 17:55:01 -07:00
James R
240cc0b1d1
Rearrange time comparsion on asksent to make it underflow friendly
...
This fixes '-connect'. NEWTICRATE*5 is subtracted from asksent after
CL_LOADFILES. If this happens too early, an underflow will occur.
2020-08-19 17:49:47 -07:00
Sal
6cda24cd2b
Merge branch 'fix-nocurl' into 'master'
...
Fix NOCURL compiling
See merge request KartKrew/Kart-Public!197
2020-08-19 20:36:14 -04:00
Sal
ed82eda30b
Merge branch 'httpsource-without-curl' into 'master'
...
Let servers send httpsource without curl
See merge request KartKrew/Kart-Public!196
2020-08-19 20:36:06 -04:00
Sal
810c93f15a
Merge branch 'kart-io' into 'next'
...
Lua Input/Output library
See merge request KartKrew/Kart-Public!200
2020-08-19 20:35:56 -04:00
Ashnal
37da22c5eb
Added m_menu_mutex to M_Drawer in connection screen
2020-08-19 19:52:24 -04:00
