James R
fbde926497
Fix NOPNG compiling
2020-08-24 17:52:55 -07:00
James R
0d57ba1d02
Fix NOGME compiling
2020-08-24 17:51:01 -07:00
Sal
bea6b6a9d2
Merge branch 'fix-asktime-really' into 'next'
...
Avoid underflows on connection screen timer (fixes hosting servers)
See merge request KartKrew/Kart-Public!211
2020-08-24 16:09:33 -04:00
Steel Titanium
c6164a1947
Initialize this variable
2020-08-24 01:25:34 -04:00
Steel Titanium
41c742a699
Hopefully the last time...
2020-08-24 01:18:38 -04:00
Steel Titanium
87d2ad0c23
Remind me why NONET exists?
2020-08-24 01:13:59 -04:00
Steel Titanium
04b7051141
This is just stupid
2020-08-24 01:06:10 -04:00
Steel Titanium
84bab3fc9f
Turns out compiling with the internal version of curl was broken on CMake the entire time 🙃
2020-08-24 01:00:28 -04:00
Steel Titanium
d4006d00c3
Screw you C90
2020-08-24 00:58:14 -04:00
Steel Titanium
509c57a8d6
Haha NONET...
2020-08-24 00:56:53 -04:00
Steel Titanium
e58c9ac410
It's discord-rpc, not libgme
2020-08-23 17:45:31 -04:00
Steel Titanium
d9cbb69327
Better CMake support
...
No idea if it compiles on Mac, it does on Linux though, at least for me.
2020-08-23 16:15:33 -04:00
Sally Coolatta
585cb1cfe3
Finish DEVELOP mode functionality
2020-08-23 07:15:33 -04:00
Sally Coolatta
720eced665
Attempt to improve discord-rpc checking in CMake
...
Haven't ever gotten CMake to compile SRB2, so I'm unable to really check if this works
2020-08-23 06:45:35 -04:00
Sally Coolatta
ed58cb5468
Move the .dll's to libs\dll-binaries
2020-08-23 05:58:09 -04:00
Sally Coolatta
175fa43c90
Update win 32 bit libraries, implement win 64 bit libraries
2020-08-23 05:47:55 -04:00
Sally Coolatta
e2f3e76db8
Merge branch 'next' into discord-rpc-support
2020-08-23 05:32:32 -04:00
Sal
88e7b6198d
Merge branch 'lineriding-b-gone' into 'next'
...
Kill offroad line riding
See merge request KartKrew/Kart-Public!199
2020-08-23 05:09:55 -04:00
Sally Coolatta
7d380c326b
Merge branch 'master' into next
2020-08-23 04:44:27 -04:00
Sally Coolatta
3ce6b8a54f
Fix version string
2020-08-23 04:44:05 -04:00
Sal
d0629a9c13
Merge branch 'fix-ogl-timedemo' into 'master'
...
Fix timedemo in OpenGL mode
See merge request KartKrew/Kart-Public!209
2020-08-23 04:38:57 -04:00
Sal
3f16ef2eaa
Merge branch 'misc-optimizations' into 'master'
...
Remove ESLOPE POLYOBJECTS POLYOBJECTS_PLANES #ifdefs (backport srb2 2.2)
See merge request KartKrew/Kart-Public!204
2020-08-23 04:38:05 -04:00
James R
035fab5f6c
Merge branch 'demoleak-fix' into 'master'
...
Fix replay recording memory leak
See merge request KartKrew/Kart-Public!208
2020-08-22 21:42:34 -04:00
James R
5daaef7e87
Avoid underflow hacks completely with asktime
2020-08-22 18:38:20 -07:00
James R
89ba08a376
Make join requests options on pause menu selectable even if you're already in the menu
2020-08-22 17:16:49 -07:00
James R
805fb01df9
Skip XD_DISCORD payload in non Discord builds
2020-08-22 16:26:15 -07:00
Hannu Hanhi
4210352be9
Fix timedemo in OpenGL mode
2020-08-23 00:10:50 +03:00
Hannu Hanhi
5c13727aac
Fix replay recording memory leak
2020-08-22 22:04:45 +03:00
Sally Coolatta
084756ec72
Fix XOR not working
2020-08-22 09:46:25 -04:00
Sal
cc3eb94b26
Merge branch 'dehacked-slipup' into 'next'
...
Correct misplaced MT_ARIDTOAD listing
See merge request KartKrew/Kart-Public!206
2020-08-22 08:16:41 -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
lachwright
32f2ed4a53
Correct misplaced MT_ARIDTOAD listing
2020-08-22 17:35:31 +08: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
