James R
bca656e4ac
Merge branch 'master' into next
2020-08-29 18:22:19 -07:00
James R
daf6e66268
Fix stupid NONET
...
(cherry picked from commit 679bfa21edec6b652def93082da5586e6c755678)
2020-08-29 18:19:39 -07:00
James R
95a026c98d
C90?
...
(cherry picked from commit 1f38db46298181d117432e12e88b326a92b4b785)
2020-08-29 18:19:15 -07:00
James R
3f842937a8
Merge remote-tracking branch 'origin/master' into next
2020-08-29 11:26:52 -07:00
Sal
734ce8dee5
Merge branch 'expose-demoplayback' into 'next'
...
Expose demo.playback to Lua
See merge request KartKrew/Kart-Public!217
2020-08-27 18:18:39 -04:00
Steel Titanium
35122d3a22
Expose demo.playback to Lua
2020-08-27 14:58:46 -04:00
Sal
5e7926d87f
Merge branch 'check-defaultdir' into 'master'
...
Check ~/.srb2kart for srb2.srb
See merge request KartKrew/Kart-Public!215
2020-08-27 14:08:17 -04:00
James R
4c816f4059
Say DEFAULTDIR not .srb2kart
2020-08-26 23:37:52 -07:00
James R
6e3facf8f4
Check DEFAULTDIR for srb2.srb after cwd
2020-08-26 20:20:40 -07:00
Sally Coolatta
ee1ea21336
Merge branch 'master' into next
2020-08-26 12:56:38 -04:00
Sal
f87b883ba5
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
7c69e49a05
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
27b72ccbf5
Replace 'ignoring skin' debug print with a proper console warning
2020-08-25 23:13:58 -06:00
Sal
34b6998b2e
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
04d774c765
Fix NOHW compiling
2020-08-24 18:06:00 -07:00
James R
3437b0690a
Kill NOHS
2020-08-24 17:58:39 -07:00
James R
16fc87edcf
Fix NOMIXER compiling
2020-08-24 17:55:42 -07:00
James R
fbde926497
Fix NOPNG compiling
2020-08-24 17:52:55 -07:00
James R
0d57ba1d02
Fix NOGME compiling
2020-08-24 17:51:01 -07:00
Sal
bea6b6a9d2
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
c6164a1947
Initialize this variable
2020-08-24 01:25:34 -04:00
Steel Titanium
41c742a699
Hopefully the last time...
2020-08-24 01:18:38 -04:00
Steel Titanium
87d2ad0c23
Remind me why NONET exists?
2020-08-24 01:13:59 -04:00
Steel Titanium
04b7051141
This is just stupid
2020-08-24 01:06:10 -04:00
Steel Titanium
84bab3fc9f
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
d4006d00c3
Screw you C90
2020-08-24 00:58:14 -04:00
Steel Titanium
509c57a8d6
Haha NONET...
2020-08-24 00:56:53 -04:00
Sal
88e7b6198d
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
7d380c326b
Merge branch 'master' into next
2020-08-23 04:44:27 -04:00
Sally Coolatta
3ce6b8a54f
Fix version string
2020-08-23 04:44:05 -04:00
Sal
d0629a9c13
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
3f16ef2eaa
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
035fab5f6c
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
5daaef7e87
Avoid underflow hacks completely with asktime
2020-08-22 18:38:20 -07:00
Hannu Hanhi
4210352be9
Fix timedemo in OpenGL mode
2020-08-23 00:10:50 +03:00
Hannu Hanhi
5c13727aac
Fix replay recording memory leak
2020-08-22 22:04:45 +03:00
Sal
cc3eb94b26
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
32f2ed4a53
Correct misplaced MT_ARIDTOAD listing
2020-08-22 17:35:31 +08:00
Sal
0ca9f8f07d
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
9e1d7146ad
Fixed retry timeout to no ttrigger when starting a local server
2020-08-20 23:38:04 -04:00
Ashnal
247239c2bc
Add return false to the connect timeout
2020-08-20 23:09:12 -04:00
James R
5b0cb1afcb
Merge remote-tracking branch 'origin/master' into next
2020-08-20 19:55:03 -07:00
FlykeSpice
c09cb6d762
Remove POLYOBJECTS POLYOBJECTS_PLANES #ifdefs(backport from srb2 2.2)
2020-08-20 13:02:13 -04:00
FlykeSpice
00137ef4ea
Remove ESLOPE #ifdef(backport from srb2 2.2)
2020-08-20 13:02:13 -04:00
Sal
79c299bf31
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
67b37e54b6
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
4c363db516
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
d0d6128053
Instantaneous lookback camera (v2 backport)
2020-08-20 13:41:03 +08:00
Ashnal
aa2b25e667
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
e3f07b33bb
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
