Commit graph

6745 commits

Author SHA1 Message Date
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
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
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
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
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 8d386fba66 Display time elasped/time limit 2020-08-17 02:05:16 -04:00
Sally Coolatta d709e9782d Use curl to retrieve your own IP address properly 2020-08-17 00:29:52 -04: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 c8fa1dcfb5 Merge remote-tracking branch 'public/next' into discord-rpc-support 2020-08-16 20:57:31 -04: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
Sal 9590a769ba 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 9d9f8fd8a3 Bump MAXNETNODES to 127 2020-08-09 18:26:34 -07: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
Sal b320256a47 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 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