Commit graph

6743 commits

Author SHA1 Message Date
lachwright
0a32babc25 Compile m_menu.c without HAVE_DISCORDRPC 2020-08-22 16:58:59 +08: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
Sally Coolatta
56694030ec Base xor off of inital seed 2020-08-22 00:11:33 -04:00
Sally Coolatta
318b2a8434 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
42ac955584 Don't reset menu in drawing function 2020-08-21 04:17:36 -04:00
Sally Coolatta
f000756448 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
734b099202 Invite menu started
Functions! Is not pretty yet!
2020-08-21 04:14:33 -04:00
James R
368ed6ad1e curl_global_cleanup 2020-08-20 22:36:41 -07:00
Sally Coolatta
3949826f89 Don't show map image for title screen demos 2020-08-21 01:18:40 -04:00
Sally Coolatta
d4a530ac5e 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
2492bfe335 Copy the saved wad directory to srb2path 2020-08-17 21:27:59 -07:00
James R
45091555b2 hate hate hate hate 2020-08-17 21:22:25 -07:00
Sally Coolatta
5af0eb7076 Don't show gametype when watching replays 2020-08-17 23:33:55 -04:00
James R
a29785aec3 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
9d304d3d16 Show game speed and encore 2020-08-17 09:08:05 -04:00
Sally Coolatta
1a966f4a11 Don't allow invites if allowjoin is off 2020-08-17 06:55:43 -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
Sally Coolatta
8fd0424f15 Add distinct images for map hell & normal custom maps 2020-08-17 04:42:22 -04:00
Sally Coolatta
bd29d0c6bb Check supported skins by name instead of number, so we can have bonuschars images 2020-08-17 04:42:05 -04:00
Sally Coolatta
9bf325eec6 Put the cvar in the menu 2020-08-17 02:31:30 -04:00
Sally Coolatta
59ebf07dd5 Guard discord.h, add cvar to disable rich presence 2020-08-17 02:25:05 -04:00
Sally Coolatta
352449010e Display time elasped/time limit 2020-08-17 02:05:16 -04:00
Sally Coolatta
5f86025f05 Use curl to retrieve your own IP address properly 2020-08-17 00:29:52 -04:00
Sally Coolatta
c70f706c2a 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
b5a378f850 Merge remote-tracking branch 'public/master' into discord-rpc-support 2020-08-16 22:12:36 -04:00
Sally Coolatta
7a9e781bea Little fixes 2020-08-16 21:31:03 -04:00
Sally Coolatta
632df264a3 Merge remote-tracking branch 'public/next' into discord-rpc-support 2020-08-16 20:57:31 -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
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