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
James R
8e493bddc3
Add http-mserv to fuck
2020-08-09 23:32:43 -07:00
Sal
15ff58280a
Merge branch 'maxnetnodes-2-electric-boogaloo' into 'master'
...
Bump MAXNETNODES to 127
See merge request KartKrew/Kart-Public!192
2020-08-09 22:28:50 -04:00
James R
3cb1a53b3f
Bump MAXNETNODES to 127
2020-08-09 18:26:34 -07:00
Sal
8c6b8cd268
Merge branch 'master' into 'master'
...
Clarify addon-related messages
See merge request KartKrew/Kart-Public!190
2020-08-05 06:48:44 -04:00
AJ Martinez
4f1642bbce
Clarify addon-related messages
2020-08-05 00:40:56 -05:00
Sal
3468d7808f
Merge branch 'fix-pk3-leak' into 'master'
...
Fix memory leak in W_ReadLumpHeaderPwad
See merge request KartKrew/Kart-Public!182
2020-07-01 18:36:48 -04:00
Sal
b7ba97601b
Merge branch 'http-useragent-fix' into 'master'
...
Fix user agent for HTTP downloads being set as SRB2Kart/v1.1.2
See merge request KartKrew/Kart-Public!185
2020-07-01 18:36:33 -04:00
Sal
0043ccd314
Merge branch 'ogl-color-fix3' into 'master'
...
Ogl colormap fix third attempt
See merge request KartKrew/Kart-Public!184
2020-07-01 18:36:19 -04:00
Sal
48409ce627
Merge branch 'chatbug-fix' into 'master'
...
clientside ack fix
See merge request KartKrew/Kart-Public!186
2020-07-01 18:35:57 -04:00
Ashnal
f0fac04dfd
Experiemntal clientside ack fix
...
Stops the client from using reliable packets before joining a server
Clients can time out during addon loading
sending reliable packets before then can cause out of order acks
This causes joinbug, chatbug, and chatspam, as well as
general server instability due to unnecesary packetspam
2020-06-27 23:43:15 -04:00
Steel Titanium
6714d9b614
Fix user agent for HTTP downloads being set as SRB2Kart/v1.1.2
2020-06-23 18:39:02 -04:00
James R
3cdc6d07d0
ADD to the buffer size
2020-06-14 19:13:22 -07:00
Hannu Hanhi
169c3cae43
Colormap alpha handling was still wrong, hopefully it's correct now
2020-06-14 15:03:40 +03:00
Sal
89064f49a3
Merge branch 'ogl-color-fix-fix' into 'master'
...
Fix bug in the OpenGL colormap bugfix
See merge request KartKrew/Kart-Public!183
2020-06-13 22:45:47 -04:00
Hannu Hanhi
137788b0c9
Fix uninitialized alpha when reading colormaps
2020-06-13 23:34:13 +03:00
Hannu Hanhi
fb1dae197f
Cleaner version of the W_ReadLumpHeaderPwad memory leak fix
2020-06-13 21:37:33 +03:00
Hannu Hanhi
6e7f38475f
Add missing inflateEnd to fix memory leak in W_ReadLumpHeaderPwad
2020-06-13 17:07:05 +03:00
James R
44af4705bb
masterserver_token is back
2020-06-12 23:47:08 -07:00
James R
0349cc4127
Merge remote-tracking branch 'origin/master' into http-mserv
2020-06-12 23:36:39 -07:00
Sal
254f443ced
Merge branch 'ogl-encore-color-fix' into 'master'
...
Fix bug in OpenGL encore colormaps
See merge request KartKrew/Kart-Public!180
2020-06-12 22:39:18 -04:00
Hannu Hanhi
ef855cfc54
Guil's encore color bugfix with some additional cleanup
2020-06-01 21:14:17 +03:00
Sal
8c5e1a71aa
Merge branch 'fix-ogl-log-crash' into 'master'
...
Fix opengl crashing on startup due to lack of checks
See merge request KartKrew/Kart-Public!179
2020-05-28 09:47:16 -04:00