thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
24046 commits 1 branch 12 tags 205 MiB
Commit graph

1241 commits

Author SHA1 Message Date
Sryder
23ec089d51 Fix splitscreen joining destroying textcmd buffer 2020-08-23 19:18:02 +01:00
Hannu Hanhi
baaf19249b Add tic and ui times to render stats 2020-08-23 20:09:55 +03:00
James R
481f8c2caa Avoid underflow hacks completely with asktime 2020-08-22 18:38:20 -07:00
Sally Coolatta
8c79d62b22 Merge remote-tracking branch 'public/next' into discord-rpc-support 2020-08-22 07:28:21 -04:00
Sally Coolatta
1899b31fa7 Add envelope icon, add sounds 2020-08-22 04:54:08 -04:00
Sally Coolatta
5cab1b7b23 Menu is pretty now 2020-08-22 03:52:07 -04:00
Sally Coolatta
b761349076 Add some options, maxplayer/allownewplayer dont need to be netvars anymore 2020-08-22 01:53:27 -04:00
Sal
6dace9aeff 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
7c5a969473 Fixed retry timeout to no ttrigger when starting a local server 2020-08-20 23:38:04 -04:00
Ashnal
60cfc091e5 Add return false to the connect timeout 2020-08-20 23:09:12 -04:00
Ashnal
538ec7e61d 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
James R
328dd607d8 Fix tiny mistake with the last commit 2020-08-19 17:55:01 -07:00
James R
240cc0b1d1 Rearrange time comparsion on asksent to make it underflow friendly 
This fixes '-connect'. NEWTICRATE*5 is subtracted from asksent after
CL_LOADFILES. If this happens too early, an underflow will occur.
 2020-08-19 17:49:47 -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
Ashnal
37da22c5eb Added m_menu_mutex to M_Drawer in connection screen 2020-08-19 19:52:24 -04:00
Ashnal
28c07d2224 Merge remote-tracking branch 'public/next' into conenction-screen-improvements 2020-08-19 19:08:33 -04:00
Ashnal
b53181a62a COnfirm box now respects rebindable accelerate and brake on keyboards 2020-08-19 18:01:56 -04:00
Sally Coolatta
3e446a167c Restructure how damage works in kart COMPLETELY 
Instead of doing its best to avoid P_DamageMobj, it embraces it, using the damagetype system to decide how the player takes damage. Overall less stupid.
 2020-08-19 00:55:36 -04:00
Sryder
ac68aeae2b Fix building of debug binary 2020-08-18 15:32:09 +01:00
Sally Coolatta
75d05702fb Fix Got_AddPlayer 2020-08-18 04:14:17 -04:00
Sally Coolatta
f5bf0371de Revert "TEMPORARY: Revert Got_AddPlayer and disable D_SendPlayerConfig" 
This reverts commit 49e2f98beb.
 2020-08-18 03:54:31 -04:00
Sally Coolatta
0576729ff4 Update presence when maxplayers is changed 2020-08-17 06:52:46 -04:00
Sally Coolatta
1d5251e1f1 Fix ZONE being all caps, standardize the function comments 2020-08-17 06:13:32 -04:00
Ashnal
98ad0248f9 Move code down so declarations are above to appease C90 2020-08-17 04:03:02 -04:00
Ashnal
42f677447d Move declaration to appease C90 
also remove some extra tab characters
 2020-08-17 03:56:13 -04:00
Ashnal
196514ff21 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
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
b5a378f850 Merge remote-tracking branch 'public/master' into discord-rpc-support 2020-08-16 22:12:36 -04:00
Sally Coolatta
632df264a3 Merge remote-tracking branch 'public/next' into discord-rpc-support 2020-08-16 20:57:31 -04:00
Sally Coolatta
a251c3909b Lots of little fixes 
Gameplay seems to work (besides the addplayer & client config stuff), but visuals (mostly sprites, but a little bit of HUD) are really messed up
 2020-08-16 00:29:04 -04:00
Sally Coolatta
49e2f98beb TEMPORARY: Revert Got_AddPlayer and disable D_SendPlayerConfig 
Bare minimum for levels to load again, need to figure out why the 2.2 merged version isn't working
 2020-08-16 00:15:05 -04:00
Sally Coolatta
0dc21106e5 Lua stuff is done 2020-08-15 07:47:18 -04:00
Ashnal
c91d004409 Improve total downloads bar 
Now has total file size AND number of files
 2020-08-15 01:03:45 -04:00
James R
065471392c Disable showjoinaddress by default 2020-08-14 21:05:23 -07:00
Louis-Antoine
8471f9e71f Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into resend-gamestate 
# Conflicts:
#	src/d_clisrv.c
#	src/d_clisrv.h
#	src/d_net.c
#	src/p_saveg.c
#	src/p_saveg.h
 2020-08-13 13:53:10 +02:00
Sally Coolatta
f9ca40e673 Merge branch 'master' into the-scary-22-merge 2020-08-12 20:59:09 -04:00
Sally Coolatta
7b4d84c3f3 Merge remote-tracking branch 'public/master' 2020-08-12 18:55:43 -04:00
Sally Coolatta
f8d1e75025 Merge remote-tracking branch 'public/next' 2020-08-12 18:50:41 -04:00
Sally Coolatta
8731c6b7a4 Another round of fixing up 
- gametyperules are now fitting for kart, not applied to the whole codebase though
- a few more files compile
 2020-08-11 16:13:17 -04:00
Sally Coolatta
62c8dde759 Last few warnings in d_clisrv 2020-08-11 10:57:53 -04:00
Sally Coolatta
a50a9a1843 Lots of splitscreen fixes 
LOTS of stuff I changed to use arrays instead of constantly duplicated code
 2020-08-10 23:38:32 -04:00
Sally Coolatta
b1112b489c i guess this function was renamed?? 2020-08-10 22:16:01 -04:00
Sally Coolatta
39550596f9 A few more fixes to d_clisrv.c 2020-08-10 21:50:08 -04:00
Sally Coolatta
c96bd5f64a Many removals 
Lots of NiGHTS code, lots of ringslinger code, revert actnum behavior back to vanilla
 2020-08-10 21:45:51 -04: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
Sally Coolatta
be85cc7b8a Merge d_clisrv.c/h 2020-08-10 11:58:11 -04:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
Ashnal
6ff69726a6 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
James R
2e3b0ae4c8 Merge remote-tracking branch 'origin/next' into http-mserv 2020-08-08 15:05:03 -07:00