Commit graph

6722 commits

Author SHA1 Message Date
James R
e4622cfeb3 Makefile: add WINDOWSHELL=1 for the Windows detect
(cherry picked from commit 6f51c68c7248d616ad16f66b72cfcc36b7c952f5)
2020-09-13 14:25:08 -07:00
James R
538c27f2fa Makefile: automatically detect system to compile for, if no system was specified
This should work for mingw and linux so far.

(cherry picked from commit f92026f98b168f4556d50d3dde403ab6bfd97ff3)
2020-09-13 14:25:08 -07:00
James R
e415b4b475 Makefile: Make WARNINGMODE the default, optionally disable with RELAXWARNINGS
(cherry picked from commit 9495e6354fed1028c6fc502cc9d946cfdd0b7896)
2020-09-13 14:25:07 -07:00
James R
ce894b7837 Is it GCC is it gcc, is it????
(cherry picked from commit 246e71a463)
2020-09-13 14:24:49 -07:00
James R
ec8cab9a3a Update LATEST_GCC_VERSION too
(cherry picked from commit 4931d82393)
2020-09-13 14:22:46 -07:00
James R
6e102db9c5 Add missing GCC version flags to the Makefile
(cherry picked from commit f939cf973b)
2020-09-13 14:22:45 -07:00
James R
ccefaa77e9 It's not always GCC, but it probably is gcc (I hope)
(cherry picked from commit 38ce80317d)
2020-09-13 14:12:36 -07:00
James R
599add9ad4 Forgot a comma
(cherry picked from commit 6cddbf7afb)
2020-09-13 14:12:36 -07:00
James R
c9463d90b6 Makefile: Move the PREFIX stuff up so version detection can take advantage of
(cherry picked from commit 2a059632a1)
2020-09-13 14:12:36 -07:00
James R
8f3e2dd2dd Detect the compiler version and set the correct GCC flag
If the version is not supported by the Makefile, the flag for the latest
version supported is set instead.

(cherry picked from commit 9963d38ce2)
2020-09-13 14:12:36 -07:00
Sal
d55e5e8d8d Merge branch 'easy-colors' into 'master'
Caret color codes in server name

See merge request KartKrew/Kart-Public!218
2020-08-30 21:49:03 -04:00
James R
754347987d Fix stupid NONET
(cherry picked from commit 679bfa21edec6b652def93082da5586e6c755678)
2020-08-29 18:19:39 -07:00
James R
df78298a11 C90?
(cherry picked from commit 1f38db46298181d117432e12e88b326a92b4b785)
2020-08-29 18:19:15 -07:00
James R
7a19d9a9df Convert caret color codes to SRB2 color codes 2020-08-27 15:44:06 -07:00
James R
dcad2cd1fa Convert from caret colors when sending SERVERINFO 2020-08-27 15:43:20 -07:00
Sal
9df376e537 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
e4a522353f Say DEFAULTDIR not .srb2kart 2020-08-26 23:37:52 -07:00
James R
45af41ef0c Check DEFAULTDIR for srb2.srb after cwd 2020-08-26 20:20:40 -07: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
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
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
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
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
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
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
37ca880353 Merge branch 'kimmy-osx-fixes' into 'master'
[OSX] Fix "SIGILL: illegal instruction" on macOS Catalina

See merge request KartKrew/Kart-Public!194
2020-08-18 03:52:47 -04:00
James R
b681b6e9e6 Do not do master server things when NOCURL 2020-08-16 21:42:58 -07:00
James R
5d739bec6d Remove HAVE_CURL guards on sending httpsource 2020-08-16 20:39:46 -07:00
Kimberly Wilber
4548662536 [OSX] Fix "SIGILL: illegal instruction" on macOS Catalina
on OSX, strncpy may copy to overlapping (protected) memory. this
sometimes happens when loading WAD files.

This patch eliminates these problems for me
2020-08-15 12:16:05 -04:00
James R
b426ed81dd dumbass doesn't test changes before pushing directly to next
(cherry picked from commit be14b8a564a89a5afb84ac19f1586f3db7f68367)
2020-08-14 08:27:25 -07:00
Sal
80d37b1939 Merge branch 'http-mserv' into 'master'
Make the HTTP Master Server official

See merge request KartKrew/Kart-Public!193
2020-08-10 16:49:47 -04:00