James R
a09592b5da
Merge remote-tracking branch 'origin/master' into next
2020-08-20 19:55:03 -07: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
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
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
Latapostrophe
e0dc13e70b
Merge remote-tracking branch 'stjr/io' into kart-io
2020-08-17 20:22:02 +02:00
Sally Coolatta
0c412459bf
Merge branch 'master' into next
2020-08-17 02:05:31 -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
Sally Coolatta
d31c33e035
No previous prototype for K_DropKitchenSink
2020-08-16 21:18:33 -04: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
954a21123a
Merge branch 'indirectitemcooldown' into 'next'
...
Fix Shrink, SPB and Hyudoro cooldowns never resetting?
See merge request KartKrew/Kart-Public!191
2020-08-06 12:19:27 -04:00
Sally Coolatta
ddfd7a4772
Merge branch 'master' into next
2020-08-06 12:15:55 -04:00
AJ Martinez
e5463afb58
Fix Hyudoro cooldown never resetting
2020-08-06 10:51:53 -05:00
AJ Martinez
2422d1c5b7
Fix indirect item cooldown never resetting
2020-08-06 10:34:16 -05: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
46094d3027
Merge branch 'mine-punt-sync-fix' into 'next'
...
Fix desyncs caused by K_PuntMine
See merge request KartKrew/Kart-Public!189
2020-07-25 03:55:28 -04:00
Sal
b7aaef7021
Merge branch 'rocket-sneaker-hnext-fix' into 'next'
...
Rocket sneaker and sink hnext fix
See merge request KartKrew/Kart-Public!188
2020-07-25 03:55:22 -04:00
Ashnal
96e098b451
Appease C91
2020-07-23 21:05:00 -04:00
Ashnal
8c5e725a8d
Also lets do this for kitchen sinks
...
They also ignored in K_DropHnextList
2020-07-23 20:12:35 -04:00
Ashnal
f4d648526d
Moved K_DropRocketSneaker call into K_StripItems
...
This should catch when DropHnextList misses it
Should probably fix sinks too ...
2020-07-15 09:17:35 -04:00
Ashnal
f60b6c881d
Properly handle rocket sneakers when shrinking
2020-07-14 19:50:37 -04:00
Ashnal
fef23cf779
Some safeguards for K_DropRocketSneaker usage
2020-07-14 19:45:15 -04:00
Ashnal
bb6a5662c2
Fixing RocketSneakers
...
New function specifically for dropping rocketsneakers K_DropRocketSneaker
Used by Eggbox touchspecial to properly dispose of shoes and clean up hnext
Now also used by the shoe thinker to drop themselves
Fixes angle of spent shoe launch
2020-07-14 18:45:45 -04:00
Ashnal
fb51f60e20
Add clean up to K_PuntMine
...
This cleans up hnext when a mine shield is P_RemoveMobj'ed while being punted
Otherwise, hnext could point to a removed mobj and cause undefined behavior
This also fixes the bug where if you have multiple mines in your slot, drag one
and have it punted, all your unused mines would disappear.
This should/may fix the crashes/desyncs I've observed in gameplay when a held mine is punted.
2020-07-14 00:21:46 -04: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