stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-29 05:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity
7061 commits 60 branches 11 tags 94 MiB
Commit graph

6027 commits

Author SHA1 Message Date
Sally Coolatta
83192827dc Fix ZONE being all caps, standardize the function comments 2020-08-17 06:13:32 -04:00
Latapostrophe
d56fdbb933 Kill line riding for offroad 2020-08-17 12:01:16 +02:00
Sally Coolatta
da5bda72ee Add distinct images for map hell & normal custom maps 2020-08-17 04:42:22 -04:00
Sally Coolatta
a04361a151 Check supported skins by name instead of number, so we can have bonuschars images 2020-08-17 04:42:05 -04:00
Ashnal
eb81bea943 Move code down so declarations are above to appease C90 2020-08-17 04:03:02 -04:00
Ashnal
03150e5fe6 Move declaration to appease C90 
also remove some extra tab characters
 2020-08-17 03:56:13 -04:00
Ashnal
afc6bdbc7e Fixes for file accounting 
mainwads+1 to not use the first mainwad
 2020-08-17 03:51:19 -04:00
Ashnal
9a9d81bbe0 New message boxes for downloads and full server waiting 
Downloads must be confirmed before proceeding
Allows downloading mods for full servers
Client will wait for a slot to open on a full server to join
This has a 5 minute timeout
 2020-08-17 03:47:23 -04:00
Sally Coolatta
9f4ad1303e Put the cvar in the menu 2020-08-17 02:31:30 -04:00
Sally Coolatta
886db8cde1 Guard discord.h, add cvar to disable rich presence 2020-08-17 02:25:05 -04:00
Sally Coolatta
41a401f703 Merge branch 'master' into next 2020-08-17 02:05:31 -04:00
Sally Coolatta
8d386fba66 Display time elasped/time limit 2020-08-17 02:05:16 -04:00
James R
7a05a8acf7 Do not do master server things when NOCURL 2020-08-16 21:42:58 -07:00
Sally Coolatta
d709e9782d Use curl to retrieve your own IP address properly 2020-08-17 00:29:52 -04:00
James R
5dc3ca3934 Remove HAVE_CURL guards on sending httpsource 2020-08-16 20:39:46 -07:00
Sally Coolatta
47f95e22d5 Allow lowercase level name / zone title 
Might have some other side-effects, we'll need to see
 2020-08-16 22:13:21 -04:00
Sally Coolatta
f5bd9d097f Merge remote-tracking branch 'public/master' into discord-rpc-support 2020-08-16 22:12:36 -04:00
Sally Coolatta
07c916f6d2 Little fixes 2020-08-16 21:31:03 -04:00
Sally Coolatta
df0cc6a727 No previous prototype for K_DropKitchenSink 2020-08-16 21:18:33 -04:00
Sally Coolatta
c8fa1dcfb5 Merge remote-tracking branch 'public/next' into discord-rpc-support 2020-08-16 20:57:31 -04:00
Kimberly Wilber
1bfcec9242 [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
Ashnal
f800159bb8 Improve total downloads bar 
Now has total file size AND number of files
 2020-08-15 01:03:45 -04:00
James R
a772096757 dumbass doesn't test changes before pushing directly to next 
(cherry picked from commit be14b8a564a89a5afb84ac19f1586f3db7f68367)
 2020-08-14 08:27:25 -07:00
Sal
06f36224ee 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
1a1c215a91 Add http-mserv to fuck 2020-08-09 23:32:43 -07:00
James R
9d9f8fd8a3 Bump MAXNETNODES to 127 2020-08-09 18:26:34 -07:00
Ashnal
cc78ef2c78 Now that the server doesn't erroneously send the last mainwad 
As the first part of fileneeded, we must load file 0
 2020-08-09 00:48:53 -04:00
Ashnal
4c5eb0d6bc Redo logic for lots of files vs not 
Now new CL state for checking files so it can spread over tics
whether we ask for the extended list or not
 2020-08-09 00:47:55 -04:00
Sal
97c4e7dfff 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
c63022350d Merge branch 'master' into next 2020-08-06 12:15:55 -04:00
AJ Martinez
3dada09aa5 Fix Hyudoro cooldown never resetting 2020-08-06 10:51:53 -05:00
AJ Martinez
2add55eb04 Fix indirect item cooldown never resetting 2020-08-06 10:34:16 -05:00
AJ Martinez
8284caf1bc Clarify addon-related messages 2020-08-05 00:40:56 -05:00
Sal
8791fd8835 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
341ce8f4a3 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
6d0b1e93c6 Appease C91 2020-07-23 21:05:00 -04:00
Ashnal
733aefa64a Also lets do this for kitchen sinks 
They also ignored in K_DropHnextList
 2020-07-23 20:12:35 -04:00
Ashnal
6562c9b755 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
3bccf01d4f Properly handle rocket sneakers when shrinking 2020-07-14 19:50:37 -04:00
Ashnal
943a898352 Some safeguards for K_DropRocketSneaker usage 2020-07-14 19:45:15 -04:00
Ashnal
0637ed89aa 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
ddc0bc16ab 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
Ashnal
159316b155 Remove now unused ret var 2020-07-04 22:25:02 -04:00
Ashnal
2c0671d8fd Let's just ALWAYS go into ask file list mode 
Easier to maintain and understand a single code path
Rather than switching behavior based on amount of addons
 2020-07-04 01:12:38 -04:00
Ashnal
7da3d70f6c Remove Checking Files spam 2020-07-02 21:48:45 -04:00
Ashnal
b8fdd6b89c Fix file number accounting 
Should ensure appropriate accounting and prevent loading of
server files if it would put us over MAX_WADFILES
 2020-07-02 20:57:33 -04:00
Ashnal
774b917c0e Correct total files to load off by one 2020-07-02 17:47:10 -04:00
Ashnal
6fe8a6c96a Changed "this server has a lot of addons!" to 
"Checking server addon list ..." to be more informative
 2020-07-01 23:52:43 -04:00
Ashnal
03d479fdb6 Connection screen no longer freezes up while 
searching for addons on disk
Game will run one tic after every file status is updated
 2020-07-01 23:48:14 -04:00
Ashnal
8eb9a6946f Fix X/0 files display bug for legacy downloader 
Also made "Waiting to Download" consistent with other states
 2020-07-01 21:40:21 -04:00
Sal
c3c466575c 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
9f4b4d84a6 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
d2098c23fc 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
b6272fa299 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
ad94b29558 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
Ashnal
f2593219a6 Adjust text position 2020-06-27 23:40:13 -04:00
Ashnal
d96c938dbf Add progress bar for file loading 2020-06-27 23:26:38 -04:00
Ashnal
9d9105929b Adjustment to new progress text 2020-06-27 21:17:21 -04:00
Ashnal
fc9f40a177 New "Overall Download Progress" bar 
Shows progress of all file downloads pre-join
 2020-06-27 21:17:04 -04:00
Ashnal
12d40a07cc Load one file per tic 
Prevents game from locking up when loading large file lists
 2020-06-27 20:58:33 -04:00
Steel Titanium
3af4aaff9c Fix user agent for HTTP downloads being set as SRB2Kart/v1.1.2 2020-06-23 18:39:02 -04:00
James R
bae37aea2c ADD to the buffer size 2020-06-14 19:13:22 -07:00
Hannu Hanhi
44159de7f3 Colormap alpha handling was still wrong, hopefully it's correct now 2020-06-14 15:03:40 +03:00
Hannu Hanhi
c382794109 Fix uninitialized alpha when reading colormaps 2020-06-13 23:34:13 +03:00
Hannu Hanhi
38c3d78d8a Cleaner version of the W_ReadLumpHeaderPwad memory leak fix 2020-06-13 21:37:33 +03:00
Hannu Hanhi
2f65955496 Add missing inflateEnd to fix memory leak in W_ReadLumpHeaderPwad 2020-06-13 17:07:05 +03:00
Sryder
b96d315f25 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git into next 2020-06-13 14:15:58 +01:00
James R
e7d949aeb2 masterserver_token is back 2020-06-12 23:47:08 -07:00
James R
9b3456a860 Merge remote-tracking branch 'origin/master' into http-mserv 2020-06-12 23:36:39 -07:00
Hannu Hanhi
d9e2336277 Guil's encore color bugfix with some additional cleanup 2020-06-01 21:14:17 +03:00
Steel Titanium
3f3cb2c976 Fix opengl crashing on startup due to lack of checks 
Also fixes the log file not being written to the home directory.
 2020-05-23 16:21:26 -04:00
Sryder
b03f950c5a Merge branch 'master' into next 2020-05-20 16:50:56 +01:00
Sryder
e229aabf22 Merge branch 'fix-clang-compile' into 'master' 
Fix clang compiling

See merge request KartKrew/Kart-Public!176
 2020-05-20 11:49:47 -04:00
Sryder
6b8ea22bdb Merge branch 'opengl-maybe-uninitialised' into 'master' 
Some uninitialised variables that GCC 4.4 complains about

See merge request KartKrew/Kart-Public!177
 2020-05-20 11:49:34 -04:00
Sryder
831ed3dedc Merge branch 'itemodds-fallthrough-fix' into 'next' 
Mistaken fallthrough in item roulette.

See merge request KartKrew/Kart-Public!178
 2020-05-20 11:49:22 -04:00
Sal
73b65b4725 Merge branch 'no-spb-forcing-in-2p' into 'next' 
Don't force SPB in 1v1

See merge request KartKrew/Kart-Public!175
 2020-05-20 10:11:19 -04:00
Sal
5f70d3e170 Merge branch 'visplane-fix' into 'master' 
Fix visplane getting allocated twice

See merge request KartKrew/Kart-Public!172
 2020-05-20 10:11:06 -04:00
Sryder
9e6980c8ae Fix a fallthrough issue that could cause thundershield to be rolled less often than intended. 2020-05-20 11:53:14 +01:00
Sryder
66930a0277 Initialise these to 0 just to stop GCC 4.4 from complaining. 
This should be okay since 0 generally means "nothing" for these, and they should always be set before being used later on.
 2020-05-20 11:47:22 +01:00
Sryder
290abe4fce D_ModifierKeyResponder is unused now so remove it. 2020-05-20 11:37:38 +01:00
Sally Coolatta
a7c88d40db Merge branch 'master' into next 2020-05-19 20:40:12 -04:00
TehRealSalt
21e6190932 Don't force SPB in 1v1 
(cherry picked from commit 22af2040a021cff243773a0f23371f20e69dfca5)
 2020-05-19 20:12:53 -04:00
Sal
e42ae1ed79 Merge branch 'freeplay-be-nice' into 'master' 
Also apply HUD translucency to FREE PLAY

See merge request KartKrew/Kart-Public!161
 2020-05-19 17:29:05 -04:00
Sal
1d5774fe2f Merge branch 'ghostly-luavars' into 'next' 
Fix Luavars being saved into Record Attack ghosts/replays and potentially crashing

See merge request KartKrew/Kart-Public!168
 2020-05-19 17:28:48 -04:00
Sal
71d2d357c1 Merge branch 'displayplayer-gonna-getcha' into 'next' 
displayplayers.iterate crashes in replays, is that based?

See merge request KartKrew/Kart-Public!171
 2020-05-19 17:28:14 -04:00
Sal
bb7481a13e Merge branch 'mr-ogl-boostpad-fix' into 'master' 
Fix wrong orientation in some boost pads in ogl

See merge request KartKrew/Kart-Public!173
 2020-05-19 17:27:24 -04:00
James R
2d4202ac09 Whoops I used the url to the file instead of the http_source 2020-05-16 21:03:37 -07:00
James R
05b65b6bc8 Merge remote-tracking branch 'origin/master' into http-downloads-auth 2020-05-16 20:48:13 -07:00
Sal
cb9e6473a0 Merge branch 'use-extern-you-idiot' into 'master' 
Fix GCC 10 linking errors

See merge request KartKrew/Kart-Public!170
 2020-05-16 09:01:46 -04:00
Hannu Hanhi
c3e1e1df26 Fix wrong orientation some boost pads in ogl 2020-05-16 13:47:21 +03:00
James R
64e27f3698 I forgot extern, now I am the clown 2020-05-15 19:04:03 -07:00
James R
7c072503be Some experimental commands to use auth when downloading from HTTP sources 2020-05-15 18:11:05 -07:00
filpAM
5acafa5a87 Fix visplane getting allocated twice 2020-05-16 00:20:52 +00:00
Sal
f60d05764d Merge branch 'clearbans-please' into 'master' 
Write empty file on clearbans

See merge request KartKrew/Kart-Public!156
 2020-05-15 19:29:11 -04:00
Sal
f0f4b7bc1e Merge branch 'nomixer-fix' into 'master' 
Fix "NOMIXER" flag compiling

See merge request KartKrew/Kart-Public!159
 2020-05-15 19:28:54 -04:00
Sal
43874c3a4d Merge branch 'now-we-spin-in-spinout-only' into 'master' 
No more first person hyper spin

See merge request KartKrew/Kart-Public!160
 2020-05-15 19:28:38 -04:00
Sal
e4766bbaf1 Merge branch 'ferror-errno-yareyare' into 'master' 
Fix false file error reporting

See merge request KartKrew/Kart-Public!162
 2020-05-15 19:27:08 -04:00
Sal
11331b7bc5 Merge branch 'hud-is-fucked' into 'next' 
HUD inconsistency in Record Attack

See merge request KartKrew/Kart-Public!164
 2020-05-15 19:26:26 -04:00
Sal
ffdb12ccb0 Merge branch 'fastline-identification' into 'next' 
Add targets to MT_FASTLINEs that are spawned

See merge request KartKrew/Kart-Public!169
 2020-05-15 19:24:35 -04:00
James R
7e0b605f34 Properly bound lua displayplayers and displayplayers.iterate to splitscreen 
This is fixes crashes in replays because splitscreen displayplayers are
initialized to INT32_MAX there.
 2020-05-15 14:21:25 -07:00
James R
fcbe4e668f Set timeout on HMS connections 2020-05-15 13:20:40 -07:00
James R
bd3ea52cba ok 
(cherry picked from commit 0b9c20cc7086000548e02b39c1abf94ffb56feae)
 2020-05-15 11:21:40 -07:00
James R
6bd6b3f38e Add missing extern to colortranslations 2020-05-15 10:00:05 -07:00
Monster Iestyn
697c7f859e added missing extern keyword for ms_RoomId in mserv.h (the definition is already in the .c file in this case) 
(cherry picked from commit 064f4bcf349e9600552a0b99bd0fbfb3cbcf0958)
 2020-05-15 09:58:49 -07:00
Monster Iestyn
f89400c728 turn all non-extern variables in s_sound.h into externs (and put their real definitions in the .c file) 
(cherry picked from commit dab212dc56936dd92a935d0c81003ff1d35ee2ee)
 2020-05-15 09:58:28 -07:00
Monster Iestyn
05c8865528 make savegamename in doomdef.h an extern, put the actual definition in d_main.c 
(cherry picked from commit 89cd756cd83e4a03a34d1f16da18142d8167d889)
 2020-05-15 09:52:16 -07:00
James R
e8a2397dea Rename hms123311.c to http-mserv.c 
HMS lives on in our hearts!
 2020-05-14 17:26:10 -07:00
James R
a6ce21b450 Use Unlock_state here too 2020-05-14 17:23:06 -07:00
James R
85fef2655c Resize response body buffer as needed 2020-05-14 17:19:25 -07:00
Snu
6b5eebe54a Use P_SetTarget instead of fast->target 2020-05-14 04:17:24 +01:00
Snu
3997c05988 god damnit 2020-05-14 03:23:28 +01:00
Snu
f24340f46a add targets to MT_FASTLINEs spawned to tell what they're spawned from 2020-05-14 03:13:00 +01:00
Latapostrophe
d949a47a70 Don't save Luavars in record attack, especially not for ghosts 2020-05-14 01:41:06 +02:00
James R
615823f024 player.ping for the ping in milliseconds of the player 2020-05-13 16:17:40 -07:00
Monster Iestyn
db5cb986ee Detect infinite alias self-recursion mixed with other commands, such as in the case of alias a "echo test; a"; a. 
(Unfortunately, this does not work if "wait" is used instead of "echo", but oh well)

(cherry picked from commit 797ca99f42)
 2020-05-13 16:03:26 -07:00
James R
430fb27ec8 Bind HMS connection with -bindaddr 2020-05-13 15:29:17 -07:00
James R
9dc72f46a2 Identify this branch with VERSIONSTRING 
This is temporary.
 2020-05-12 19:27:54 -07:00
James R
2f63f97692 Reset the masterserver address if the old one was set by the config 2020-05-12 19:22:30 -07:00
James R
72852ab341 Clarify where debug prints go when using masterserver_debug 2020-05-12 19:22:15 -07:00
James R
be3da445c3 Use IPv4 for master server connections 
Your server's address is gathered from the request, so it needs to be IPv4!
 2020-05-12 18:52:55 -07:00
James R
bdcae79cd2 Use new two digit version number for HMS 2020-05-12 17:51:27 -07:00
James R
233e6627de Merge remote-tracking branch 'origin/master' into http-mserv 2020-05-12 17:50:32 -07:00
Wolfy
f856f18233 Update patch.kart hash 2020-05-11 22:31:38 -05:00
James R
0b887e92ba Fucking shadowed declarations in hw_md2.c 2020-05-11 18:57:38 -07:00
Alam Ed Arias
ef022ef72c Makefile: GCC80 does not exist 
(cherry picked from commit eacf89e309)
 2020-05-11 18:43:25 -07:00
Alam Ed Arias
42f71c0278 Tested to be compile with Mingw64 9.1.0 
(cherry picked from commit 5a79a446df)
 2020-05-11 18:43:24 -07:00
Alam Ed Arias
ca12cc2518 Makefile: support GCC 9.1 
(cherry picked from commit d5cc3ce48d)
 2020-05-11 18:43:01 -07:00
Alam Ed Arias
dbb176c61e Makefile: stop building with DWARF v2 debugging info 
(cherry picked from commit 07f89fd6b5)
 2020-05-11 18:43:01 -07:00
Wolfy
ec60fb0aff HWR_CreateBlendedTexture optimizations 
By Hannu_Hanhi
 2020-05-11 17:47:24 -05:00
wolfs
869234d9f1 Merge branch 'default-manifest' into 'awful-mix' 
Add a default manifest file.

See merge request SinnamonLat/Kart-Public!16
 2020-05-10 02:08:19 -04:00
wolfs
b9a3524cc7 Merge branch 'fallback-refusal' into 'awful-mix' 
Display refusal message if there is no HTTP source and internal downloads are disabled

See merge request SinnamonLat/Kart-Public!17
 2020-05-10 02:07:59 -04:00
Wolfy
d24c4bab44 Update hash again 2020-05-09 10:52:23 -05:00
Wolfy
a4502f6ffb Forgot to update date modified 2020-05-09 09:15:17 -05:00
ThatAwesomeGuy173
6519da0d9f Display refusal message if there is no HTTP source and internal downloads are disabled 2020-05-09 06:06:21 -06:00
Wolfy
09efbb3e8e Update patch.kart hash 2020-05-09 03:16:46 -05:00
Wolfy
d80981ab22 Minor credits updates 2020-05-09 01:17:10 -05:00
Steel Titanium
c54a311a30 Add a default manifest file. 
The tldr is that it fixes opengl not working on systems with broken drivers, which is usually older intel GPUs
 2020-05-08 22:59:19 -04:00
wolfs
29bc6489db Merge branch 'large-server-list' into 'awful-mix' 
Increase MAXNETNODES so the server list can be larger

See merge request SinnamonLat/Kart-Public!15
 2020-05-06 02:57:28 -04:00
Wolfy
dad80d8db1 Fix the RA only linedef 
I forgot some stuff.
 2020-05-05 10:25:40 -05:00
Wolfy
1e81924f9a Don't use models for signposts 
based james
 2020-05-03 23:51:30 -05:00
Latapostrophe
a3e74a1305 Add back viewpoint names & fix console inputs in replays 2020-04-30 15:50:30 +02:00
Wolfy
af0a93ea53 Merge remote-tracking branch 'remotes/james/awful-mix-fucked' into awful-mix 2020-04-30 04:40:11 -05:00
Wolfy
885d949cf9 Shader batching additions 2020-04-29 00:03:02 -05:00
James R
0cdfaaa56c Merge remote-tracking branch 'lat/awful-mix' into awful-mix-fucked 2020-04-28 21:56:35 -07:00
James R
e2733600cd Oops a debug condition snuck in there 2020-04-28 14:35:03 -07:00
Latapostrophe
aad2401ba5 Cam lockon, allow viewpoint change during freecam 2020-04-28 23:24:48 +02:00
James R
a1aa2a5e12 Fix switching the master server 2020-04-28 14:21:57 -07:00
James R
e950efa5fc Put some mutex on CONS_Printf etc. hahaha 2020-04-28 13:08:43 -07:00
James R
e20dccafd4 Fucking multithreading in the server registration 
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 2020-04-28 12:33:50 -07:00
Latapostrophe
cf64a468f5 Add lua toggle for check hud 2020-04-28 17:24:33 +02:00
James R
8f3820db66 Wait for threads before SDL_Quit (lol) 2020-04-27 18:03:10 -07:00
James R
bdddeb9ecf Create cond if it doesn't exist when signaling 2020-04-27 18:01:27 -07:00
James R
88bcac0168 Use malloc for hms 2020-04-26 21:56:59 -07:00
James R
1484f0484f Match MAXSERVERLIST to MAXNETNODES, increase MAXNETNODES 
Each server in the server list requires a node. It's also MAXNETNODES-1 because
the first node is yourself.
 2020-04-26 20:46:33 -07:00
Steel Titanium
ba989dce10 Support for http downloads 
(cherry picked from commit 6fcc06bf72)

(cherry picked just the libcurl stuff)
 2020-04-26 20:01:15 -07:00
James R
c96506dd3b Make mod update, room list and server list multithreaded 
This took fucking ages and it still fails sometimes in edge cases, but I
don't give a FUCK right now.
 2020-04-26 19:46:35 -07:00
James R
273b20d81d Download mismatched md5sum with http 
This is from b25acfa7
 2020-04-26 01:29:40 -07:00
James R
974f9e667b Fallback you doofus! 2020-04-26 01:28:01 -07:00
Wolfy
fcea81e018 Revert basically every attempted join passwords fix 2020-04-26 01:20:46 -07:00
James R
b3247b48a1 Merge remote-tracking branch 'lat/remove-passwords' into awful-mix-fucked 2020-04-26 01:16:27 -07:00
James R
bb3dcf7d5f Revert "Reorder join process so password is authenticated before attempting to download" 
This reverts commit b25acfa782.
 2020-04-26 01:12:40 -07:00
James R
10582beb2a Revert "Don't send httpsource in SERVERINFO if join password is set" 
This reverts commit abd15288b4.
 2020-04-26 01:12:39 -07:00
James R
ccb6da9ab7 Revert "Request a download after completing the join challenge" 
This reverts commit d5ca4d3f42.
 2020-04-26 01:11:25 -07:00
Sally Cochenour
792d1a5f35 Forgotten / TICRATE 2020-04-25 21:33:34 -04:00
Sally Cochenour
b2aebb81ec 'sal-lighting' code ports from v2 2020-04-25 20:56:50 -04:00
Wolfy
82b5ce5495 Remove cv_grskydome 
This is how GL should've been handling skies all along, no point having an option
 2020-04-24 23:48:03 -05:00
Wolfy
0e78159ea1 Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix 
# Conflicts:
#	src/hardware/hw_main.c
#	src/hardware/r_opengl/r_opengl.c
 2020-04-24 18:10:25 -05:00
Hannu Hanhi
957768efd1 Fix mistake in previous commit 2020-04-22 23:50:50 +03:00
Hannu Hanhi
4e8349fccc Fix lighting breaking if trying to use unavailable shaders 2020-04-22 23:50:14 +03:00
ThatAwesomeGuy173
c762472559 Use "addons" instead of "add-ons" for consistency 2020-04-22 01:24:59 -06:00
ThatAwesomeGuy173
3f587d3391 Merge branch 'awful-mix' of https://git.magicalgirl.moe/SinnamonLat/Kart-Public into text-fixes-that-bother-me 2020-04-22 01:01:08 -06:00
Wolfy
eebd73d812 FUCKING- 2020-04-22 02:00:44 -05:00
ThatAwesomeGuy173
bdf67a369a Merge branch 'awful-mix' of https://git.magicalgirl.moe/SinnamonLat/Kart-Public into text-fixes-that-bother-me 2020-04-22 00:48:09 -06:00
Wolfy
e08fcc14bd ASHNAL 2020-04-22 01:31:55 -05:00
ThatAwesomeGuy173
296dfe8ffc Do the same for other messages too 2020-04-22 00:03:45 -06:00
ThatAwesomeGuy173
4ddebca778 Capitalize "record attack" as "Record Attack" and spell "addons" as "add-ons" in the replay hut 2020-04-22 00:01:03 -06:00
Wolfy
c52ce92016 Shut the compiler up 2020-04-21 19:25:18 -05:00
Ashnal
e33e15d87f Fix dedicated servers not waiting for client wipes. 
Now they run wipe logic to wait the same amount of
time that clients do, without actually rendering anything.
Previously, the server would start the new map immediately,
and clients would frameskip up to the server when they were done wiping.
 2020-04-21 19:16:31 -05:00
Hannu Hanhi
ce1d017a73 Sky dome from SRB2 2020-04-22 00:18:58 +03:00
Hannu Hanhi
e45295f1ea Don't crash if shaders are unavailable 2020-04-21 23:45:48 +03:00
Hannu Hanhi
812cceb53f Remove sometimes harmful NetUpdate call from HWR_RenderFrame 2020-04-21 23:32:31 +03:00
Hannu Hanhi
2fdb7627b7 Fix wrong behaviour and lack of animation in ogl sky background 2020-04-21 23:24:32 +03:00
Hannu Hanhi
4309908999 Fix race results screen showing wrong image on maps with skyboxes 2020-04-21 23:23:03 +03:00
Hannu Hanhi
43be277ac7 Newer color tinting shaders ported from SRB2 shader branch 2020-04-21 23:15:44 +03:00
Hannu Hanhi
6cc1c5dd36 Make OpenGL texture filter config save 2020-04-21 22:38:46 +03:00
Hannu Hanhi
b5fb88922a Faster sprite sorting algorithm 2020-04-21 22:08:52 +03:00
James R
820d4a5f8b SRB2APPLICATION: this is jart! 2020-04-20 20:22:17 -07:00
James R
bb6bdac111 Make the PACKETVERSION rule easier 
(cherry picked from commit 4214397679c70a7910c82126783b434f0d10343e)
 2020-04-20 20:22:04 -07:00
James R
f13f0e3e11 Remove adminplayer from SERVERINFO (PACKETVERSION 2) 
(cherry picked from commit 339ceafdf03a54cb562d70079f15587acd639619)
 2020-04-20 20:22:01 -07:00
James R
4ed99c60bb More fine tuned versioning 
You get a PACKETVERSION, for when some packets change format.

You get SRB2APPLICATION, for when you have big fucking mod.

(cherry picked from commit 6bd383621eee92b215f86c9c4b483934d7e60daa)
 2020-04-20 19:59:42 -07:00
wolfs
f9dad05242 Merge branch 'fixsignalhandler-resurrection' into 'awful-mix' 
2.2 signal handler

See merge request SinnamonLat/Kart-Public!11
 2020-04-20 22:42:59 -04:00
Hannu Hanhi
628bd27b88 Fixed and faster transparency sorting for OGL. For easy comparison, check Ethereal Crystal in Abstraction Pack 2020-04-19 18:42:03 +03:00
Hannu Hanhi
ff98d3b28a Fix skywalls in ogl. Similar to c3f6f263 in master. 2020-04-19 18:19:16 +03:00
wolfs
0150200949 Merge branch 'more-descriptive-error' into 'awful-mix' 
Show more descriptive error on failed downloads

See merge request SinnamonLat/Kart-Public!10
 2020-04-19 00:27:56 -04:00
colette
38cd01b1d3 FOV fixes 
# Conflicts:
#	src/r_main.c
 2020-04-18 23:13:54 -05:00
Steel Titanium
437863717a Show more descriptive error on failed downloads 2020-04-19 00:13:30 -04:00
wolfs
bf1060f7ac Merge branch 'remove-download-file' into 'awful-mix' 
Remove the correct file when http download fails

See merge request SinnamonLat/Kart-Public!9
 2020-04-18 23:35:21 -04:00
wolfs
783a1c78bd Merge branch 'awful-mix-httpfixes' into 'awful-mix' 
Fix super lol compile errors

See merge request SinnamonLat/Kart-Public!7
 2020-04-18 23:34:41 -04:00
James R
b341b87a92 Fuck acks!!!! 2020-04-18 18:47:57 -07:00
James R
b30426bccd Don't strip directory before removing failed http download 2020-04-18 18:47:20 -07:00
James R
d5ca4d3f42 Request a download after completing the join challenge 2020-04-18 18:45:50 -07:00
James R
c472a9f50d Multithreading in my SRB2??? 2020-04-17 20:05:29 -07:00
James R
7b714a225b WHY THE FUCK DID I DO THIS 2020-04-15 22:04:55 -07:00
James R
60bc61ef70 Oops 2020-04-14 19:41:32 -07:00
James R
30b5ec14fd Handle NULL hms buffer 2020-04-14 16:55:14 -07:00
James R
7488991ecd Compiler errors: won't stop, can't stop 2020-04-13 23:31:26 -07:00
James R
a0de059235 masterserver_update_rate cvar determines wait between updates in minutes 
The new default is 15 minutes as well. And if you think that's too long, I have
confirmed that the Master Server delists inactive servers after a whopping 40
minutes, at least.
 2020-04-13 23:10:06 -07:00
James R
ee6de3800e Don't try to update right after registering 2020-04-13 22:54:58 -07:00
James R
2c5566b013 Add a hack so the 'All' room isn't display for hosting 2020-04-13 22:31:11 -07:00
James R
1201e89132 Kill the old mserv, long live HMS! 2020-04-13 22:23:01 -07:00
James R
7255d360e1 Clean up header text 2020-04-13 21:20:29 -07:00
Steel Titanium
be94fa3200 Fix compile errors 2020-04-13 23:07:38 -04:00
James R
8c9e5fc644 Whoops I fucked that up 2020-04-13 17:45:02 -07:00
James R
abd15288b4 Don't send httpsource in SERVERINFO if join password is set 2020-04-13 17:40:48 -07:00
James R
b25acfa782 Reorder join process so password is authenticated before attempting to download 2020-04-13 17:30:42 -07:00
Sally Cochenour
1fac0505a4 No more modulo bullshit in VERSION 
VERSION is the first number, SUBVERSION is the second number, and the third number burns in hell; we really don't need that precision

# Conflicts:
#	src/doomdef.h
 2020-04-12 23:32:15 -05:00
Wolfy
0a50317e49 oops 2020-04-12 22:47:22 -05:00
James R
032adadd86 HTTP update alert 2020-04-12 20:37:46 -07:00
Wolfy
c68e1c53f3 Fix off by one error in http downloader 2020-04-12 21:14:33 -05:00
Wolfy
bceeaf78bc Prep stuff 
pending asset hash changes
 2020-04-12 20:48:11 -05:00
wolfs
dcfaba2cc6 Merge branch 'http-downloads' into 'awful-mix' 
Support for http downloads

See merge request SinnamonLat/Kart-Public!1
 2020-04-12 21:38:33 -04:00
James R
48b2112af7 Fix some goofs 2020-04-12 18:33:53 -07:00
James R
03caf27d92 Bruh 2020-04-12 18:27:01 -07:00
James R
269746fe01 Clean up a bunch of stuff and follow the Master Server API more closely 2020-04-12 18:25:59 -07:00
James R
3f4224ed37 Windows certs do work, thanks Steel! 2020-04-12 17:51:30 -07:00
James R
969fe0b28e Handle more errors 2020-04-12 17:51:05 -07:00
James R
ef71bef6f3 Kill masterserver_token 2020-04-12 17:15:39 -07:00
Steel Titanium
9293c6cb32 Fix cmake using wrong libs if internal libs is turned on 
Use '\0' instead, just in case
 2020-04-12 17:56:12 -04:00
Steel Titanium
2dd7854a9b Remove some of these superfluous ifdef checks. 
Allows compatibility with non-curl enabled builds.
 2020-04-12 15:07:39 -04:00
Wolfy
9c727992a4 Fix self-comparison in hw_main.c 2020-04-12 06:47:12 -05:00
Hannu Hanhi
f3bdcb4ec3 Backport from SRB2: Replace NextTexAvail with glGenTextures 2020-04-12 06:39:00 -05:00
James R
60a38cbec3 Even the warning can die, give the programmer some credit 
(cherry picked from commit 6d67b7c3269d2530cfcd7a93cfde401e09d04138)
 2020-04-11 22:10:05 -07:00
James R
6d3f5ef163 Also allocate mipmap for MD2 
(cherry picked from commit 99cd5161becec131099c64dddd2be6beafb538cc)
 2020-04-11 22:10:05 -07:00
James R
4ad360155f Fix nonpacked to packed cast for OpenGL 
(cherry picked from commit d2a7a87c7f39bd423fde7f8b4228082d12839583)
 2020-04-11 22:10:05 -07:00
James R
437f7aa16d Fix misaligned pointers 
(cherry picked from commit ceb8d298c2ae9a6000fa4d22e381085c6bf77cd6)
 2020-04-11 22:03:29 -07:00
Wolfy
da2a640c6c Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix 
# Conflicts:
#	src/hardware/hw_cache.c
#	src/hardware/hw_draw.c
#	src/hardware/hw_glob.h
#	src/hardware/hw_main.c
#	src/r_bsp.h
#	src/r_data.c
 2020-04-11 23:47:25 -05:00
Hannu Hanhi
8001bb4154 Batching! 2020-04-12 03:09:07 +03:00
Hannu Hanhi
1efa95bb33 Don't destroy my config file 2020-04-12 02:18:12 +03:00
Hannu Hanhi
3a654bb7d9 Fix comment 2020-04-11 13:27:18 -05:00
Hannu Hanhi
7bac42f9b2 Don't repeatedly look for texture files that don't exist. This fixes performance issues with models. 2020-04-11 13:27:17 -05:00
wolfs
516a4994f5 Merge branch 'fix-chat-draw-leak' into 'awful-mix' 
Chat drawing memory leak fix from SRB2 repo

See merge request SinnamonLat/Kart-Public!4
 2020-04-10 09:28:08 -04:00
Hannu Hanhi
b9e008c8bf Chat drawing memory leak fix from SRB2 repo 2020-04-08 17:33:23 -04:00
James R
4b68b41a31 Fix lol xd compiler errors 2020-04-07 17:06:20 -07:00
Steel Titanium
061e483df1 Fix error with travis 2020-04-07 19:48:39 -04:00
Steel Titanium
f28c53ea82 Fix this mistake 2020-04-07 19:27:20 -04:00
Steel Titanium
f4002f076e Fix even more build errors 2020-04-07 19:14:27 -04:00
Steel Titanium
cb9004e4cf Fix some build errors 2020-04-07 19:07:39 -04:00
Steel Titanium
6fcc06bf72 Support for http downloads 2020-04-07 18:22:29 -04:00
Wolfy
8a1f40b90f Add PT_CLIENTCMD back to allowed packet types 
Fixes unexpected CLIENTCMD prints
 2020-04-07 07:09:51 -05:00
Wolfy
bbce134afa Merge branch 'awful-mix' of https://git.magicalgirl.moe/SinnamonLat/Kart-Public into awful-mix 2020-04-07 06:41:54 -05:00
Wolfy
95e7e59179 Remove stupid dumbfuck #ifdefs 
WHY THE FUCK DID THESE BREAK IT AAAAAAAAAAAAAAAAAAA
 2020-04-07 05:24:38 -05:00
Wolfy
d4c69f137a Fix unterminated #ifdef 2020-04-07 04:25:11 -05:00
Wolfy
bcfffefe43 Merge remote-tracking branch 'remotes/digiku/public-musicplus-lua' into awful-mix 
Reimplements removed MusicPlus functions.

# Conflicts:
#	src/lua_baselib.c
#	src/lua_hook.h
#	src/lua_hooklib.c
#	src/lua_script.h
 2020-04-07 03:41:26 -05:00
Wolfy
59df0c1187 Revert the removal of S_MusicExists 2020-04-07 02:56:45 -05:00
Wolfy
2406302911 Potentially fix join passwords 2020-04-05 18:57:47 -05:00
Wolfy
49a1037f6b Revert "PT_CLIENTCMD test" 
This reverts commit 78bc80fd49.
 2020-04-05 17:18:22 -05:00
Wolfy
78bc80fd49 PT_CLIENTCMD test 2020-04-05 17:01:40 -05:00
Wolfy
40f7d1b721 Merge branch 'awful-mix' of https://git.magicalgirl.moe/SinnamonLat/Kart-Public into awful-mix 2020-04-05 16:12:04 -05:00
Wolfy
cedc79fd4b Fix packet type desync 2020-04-05 16:11:30 -05:00
Wolfy
4d477d1aed Reimplement the MusicChange hook 
why the fuck was this removed
 2020-04-05 12:09:44 -05:00
Wolfy
49842c37cd Record attack only linedef exec 2020-04-05 14:12:12 +02:00
Latapostrophe
12bca93591 Merge branch 'v1-backwards-thrown-spikeballs' into awful-mix 2020-04-05 14:10:00 +02:00
Sally Cochenour
88a6b6b2f4 Slow down backwards spikeballs (again) 2020-04-05 14:09:04 +02:00
Wolfy
9395a0f5fc Record attack only linedef exec 2020-04-05 07:03:49 -05:00
Latapostrophe
b483e42d94 Merge branch 'v1-ignore-posthumous-ackret' into awful-mix 2020-04-05 11:23:49 +02:00
Latapostrophe
86986adf6e Merge branch 'ignore-posthumous-ackret' of git.magicalgirl.moe:KartKrew/Kart-Public into v1-ignore-posthumous-ackret 2020-04-05 11:23:29 +02:00
Latapostrophe
732eb4cafa Merge branch 'fix-double-bombs' into awful-mix 2020-03-22 13:09:06 +01:00
Latapostrophe
549eabe9e4 I'm dumb, don't check for flashtics here... 2020-03-22 13:08:46 +01:00
James R
f0cc851b29 This will be the Master Server in 2020 2020-03-20 20:37:26 -07:00
Latapostrophe
4f24f1ae5b Merge branch 'spb-blockmap-fix' of git.magicalgirl.moe:KartKrew/Kart-Public into awful-mix 2020-03-13 22:38:20 +01:00
Latapostrophe
67eeb819cb Merge branch 'fix-double-bombs' into awful-mix 2020-03-13 13:52:37 +01:00
Latapostrophe
245ac55654 This flag shouldn't have been applied there 2020-03-13 13:50:22 +01:00
Latapostrophe
44f45d6d28 Fix Lua crashes when loading without addons 2020-03-12 16:03:12 +01:00
Latapostrophe
cbc7fe7b67 Fix Demo lua archive crash for real this time 2020-03-12 15:31:58 +01:00
Latapostrophe
b905f20cd4 Fix tiny conflict because I forgot to merge 2020-03-11 19:55:56 +01:00
Latapostrophe
0ee6426830 Remove debug prints 2020-03-11 19:53:52 +01:00
Latapostrophe
dabed0cd50 Attempt to fix replay loading crash 2020-03-11 19:33:22 +01:00
Latapostrophe
a3389b43a0 Merge branch 'too-many-files' into awful-mix 2020-03-11 12:34:54 +01:00
Latapostrophe
513c3d1c3f don't set MAX_WADFILES to 256, worst mistake of my life 2020-03-11 12:34:35 +01:00
Latapostrophe
43e5718851 Merge branch 'push-more-lua' into awful-mix 2020-03-11 07:37:47 +01:00
Latapostrophe
37c733b8c2 More explicit var names for countdown and countdown2 2020-03-11 07:37:33 +01:00
Latapostrophe
ee2fdeaf21 Merge branch 'too-many-files' into awful-mix 2020-03-11 07:21:41 +01:00
Latapostrophe
168b8ac052 Bump MAX_WADFILES to 256 2020-03-11 07:20:11 +01:00
Latapostrophe
6da057167d Merge branch 'antifreeze' of https://gitlab.com/fickleheart/srb2kart-mods into awful-mix 2020-03-10 21:46:12 +01:00
Latapostrophe
99905a443e Merge branch 'damned-springpads' into v1.2-frankeinstein 2020-03-10 20:39:35 +01:00
Latapostrophe
b85a588e01 Merge branch 'push-more-lua' into v1.2-frankeinstein 2020-03-10 20:35:29 +01:00
Latapostrophe
7cd3221be8 Merge branch 'fix-orbit-shield' into v1.2-frankeinstein 2020-03-10 20:35:19 +01:00
Latapostrophe
d993bce8b6 Merge branch 'fix-double-bombs' into v1.2-frankeinstein 2020-03-10 20:34:47 +01:00
Latapostrophe
1a0d148a7c Merge branch 'no-cheese' into v1.2-frankeinstein 2020-03-10 20:34:38 +01:00
Latapostrophe
d43ed7f74c Merge branch 'gl-qol' into v1.2-frankeinstein 2020-03-10 20:34:20 +01:00
Latapostrophe
3b2907865f Merge branch 'stack-draw-flags' into v1.2-frankeinstein 2020-03-10 20:27:52 +01:00
Latapostrophe
81ad772a8b Merge branch 'record-attack-changes' into v1.2-frankeinstein 2020-03-10 20:27:00 +01:00
Latapostrophe
5202a4f0fd VoteThinker Hook for Lua 2020-03-10 18:58:44 +01:00
Latapostrophe
63eadaf83c Expose CV_FindVar to Lua 2020-03-10 18:12:20 +01:00
Latapostrophe
2e5608d33b Push race countdowns and functions to set them 2020-03-10 12:57:30 +01:00
Latapostrophe
8c00331c2b Push consoleplayer and displayplayers to Lua 2020-03-10 11:53:28 +01:00
Latapostrophe
428dc42e2d Remove debug print 2020-03-10 10:21:47 +01:00
fickleheart
11cba9bd6a I'M GONNA PISS MYSELF OF LAUGHER anyway fixed syncbombs 2020-03-07 12:40:45 -06:00
fickleheart
b8e4af3f8d SUPER EXPERIMENTAL FREEZE-B-GONE 2020-03-05 22:19:39 -06:00
Latapostrophe
bb1c320236 Merge branch 'fickle-replay-v1' into replay-freecam-rewind 2020-03-05 21:08:20 +01:00