vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
6821 commits 50 branches 7 tags 75 MiB
Commit graph

6821 commits

This branch
This branch
All branches
Author SHA1 Message Date
James R 805fb01df9 Skip XD_DISCORD payload in non Discord builds 2020-08-22 16:26:15 -07:00
Sally Coolatta 084756ec72 Fix XOR not working 2020-08-22 09:46:25 -04:00
Sally Coolatta 5de27be169 Merge remote-tracking branch 'public/next' into discord-rpc-support 2020-08-22 07:28:21 -04:00
Sally Coolatta e5238d095f Remove timer variable 
Doesn't feel necessary to me anymore, especially with how the menu works
 2020-08-22 07:25:47 -04:00
Sally Coolatta f61e3a77bd Ask to join is a menu option, rather than trying to replace your menu temporarily. 2020-08-22 07:16:52 -04:00
Sally Coolatta 6f9025a14d Merge branch 'discord-rpc-support' of https://git.magicalgirl.moe/KartKrew/Kart into discord-rpc-support 2020-08-22 05:03:43 -04:00
Sally Coolatta 3d5d5ad8b5 Always have XD_DISCORD defined, so that people compiling without Discord support can connect to servers that do. 2020-08-22 05:03:08 -04:00
lachwright e01c7aef32 Compile m_menu.c without HAVE_DISCORDRPC 2020-08-22 16:58:59 +08:00
Sally Coolatta 3c128660b4 Add envelope icon, add sounds 2020-08-22 04:54:08 -04:00
Sally Coolatta 98f586a2f9 Menu is pretty now 2020-08-22 03:52:07 -04:00
Sally Coolatta 571c670670 Add some options, maxplayer/allownewplayer dont need to be netvars anymore 2020-08-22 01:53:27 -04:00
Sally Coolatta 8ff62cdc7f Base xor off of inital seed 2020-08-22 00:11:33 -04:00
Sally Coolatta e0d0a3a74e Ignore any duplicate requests 
You will still get a message for them, so if they're being annoying you will want to block them anyway, but at least it won't clog up the game.
 2020-08-22 00:01:56 -04:00
Sally Coolatta 4d8c65bb73 Don't reset menu in drawing function 2020-08-21 04:17:36 -04:00
Sally Coolatta 983a978c12 Merge branch 'discord-rpc-support' of https://git.magicalgirl.moe/KartKrew/Kart into discord-rpc-support 2020-08-21 04:14:36 -04:00
Sally Coolatta 339be6f90e Invite menu started 
Functions! Is not pretty yet!
 2020-08-21 04:14:33 -04:00
James R 0b07d0ed6f curl_global_cleanup 2020-08-20 22:36:41 -07:00
Sally Coolatta 7b1e14d017 Don't show map image for title screen demos 2020-08-21 01:18:40 -04:00
Sally Coolatta 6a86d86828 XOR IP addresses before sending them to Discord 
Not complex because we aren't sending anything that isn't easily accessible via the Master Server anyway, just means we aren't sending plain-text IPs to Discord. Might be improved by basing the XOR key on other values (base RNG, maybe version) so that it's not like *right* there
 2020-08-21 01:16:11 -04:00
Sal 0ca9f8f07d 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 9e1d7146ad Fixed retry timeout to no ttrigger when starting a local server 2020-08-20 23:38:04 -04:00
Ashnal 247239c2bc Add return false to the connect timeout 2020-08-20 23:09:12 -04:00
James R 5b0cb1afcb Merge remote-tracking branch 'origin/master' into next 2020-08-20 19:55:03 -07:00
Sal 79c299bf31 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 67b37e54b6 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 4c363db516 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 d0d6128053 Instantaneous lookback camera (v2 backport) 2020-08-20 13:41:03 +08:00
Ashnal aa2b25e667 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
Steel Titanium e3f07b33bb 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 94512c49e4 -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 843d9b9f0a345330d97c579e94f208eb2b65c156)
 2020-08-19 18:16:54 -07:00
James R b77541b51d 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 4e321012894b2aa87e312597f19be26b30545a8b)
 2020-08-19 18:16:53 -07:00
James R b1f5e66a23 Use a random port when connecting 
(cherry picked from commit f584b61c93a97e1a9852f306acba673ced21e03a)
 2020-08-19 18:16:53 -07:00
James R 65968f00d3 Fix tiny mistake with the last commit 2020-08-19 17:55:01 -07:00
James R 1cd7c3b747 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 a335d6b583 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 c6f85cde59 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 ed41d5df9e 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
Ashnal cadb4719cf Added m_menu_mutex to M_Drawer in connection screen 2020-08-19 19:52:24 -04:00
Ashnal 648a950ac8 Merge remote-tracking branch 'public/next' into conenction-screen-improvements 2020-08-19 19:08:33 -04:00
Ashnal 7c5740d98f COnfirm box now respects rebindable accelerate and brake on keyboards 2020-08-19 18:01:56 -04:00
Sal 8ee7443705 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 1bf0794d6a Copy the saved wad directory to srb2path 2020-08-17 21:27:59 -07:00
James R c0cac645f8 hate hate hate hate 2020-08-17 21:22:25 -07:00
Sally Coolatta 234983909a Don't show gametype when watching replays 2020-08-17 23:33:55 -04:00
James R 2a2d43a20b Save srb2path to %LOCALAPPDATA%\SRB2Kart\lastwaddir, and chdir here if srb2.srb cannot be found 
Windows code goes brrr
 2020-08-17 20:11:32 -07:00
Latapostrophe 392b24b769 Merge remote-tracking branch 'stjr/io' into kart-io 2020-08-17 20:22:02 +02:00
Sally Coolatta c76c1b8420 Show game speed and encore 2020-08-17 09:08:05 -04:00
Sally Coolatta 27654ffb6a Don't allow invites if allowjoin is off 2020-08-17 06:55:43 -04:00
Sally Coolatta d163f67700 Update presence when maxplayers is changed 2020-08-17 06:52:46 -04:00
Sally Coolatta 83192827dc Fix ZONE being all caps, standardize the function comments 2020-08-17 06:13:32 -04:00