Sryder
388528d7b8
Merge branch 'the-scary-22-merge' of git@git.magicalgirl.moe:KartKrew/Kart.git into the-scary-22-merge
2020-08-23 19:19:37 +01:00
Sryder
2de3c15b16
Merge branch 'the-scary-22-merge' of git@git.magicalgirl.moe:KartKrew/Kart.git into the-scary-22-merge
2020-08-23 19:18:18 +01:00
Sryder
23ec089d51
Fix splitscreen joining destroying textcmd buffer
2020-08-23 19:18:02 +01:00
Sally Coolatta
fa957f2022
P_TryCameraMove return false :V
2020-08-23 14:16:30 -04:00
Sally Coolatta
376a41162b
Minor fixes
2020-08-23 14:08:54 -04:00
Hannu Hanhi
baaf19249b
Add tic and ui times to render stats
2020-08-23 20:09:55 +03:00
Sally Coolatta
5127696fcf
Finish DEVELOP mode functionality
2020-08-23 07:15:33 -04:00
Sally Coolatta
74bad0e34c
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
a235062557
Move the .dll's to libs\dll-binaries
2020-08-23 05:58:09 -04:00
Sally Coolatta
a92ec01f43
Update win 32 bit libraries, implement win 64 bit libraries
2020-08-23 05:47:55 -04:00
Sally Coolatta
3b8066a28e
Merge branch 'next' into discord-rpc-support
2020-08-23 05:32:32 -04:00
Sal
a85bc82ece
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
8e62efb79c
Merge branch 'master' into next
2020-08-23 04:44:27 -04:00
Sally Coolatta
36c5abf611
Fix version string
2020-08-23 04:44:05 -04:00
Sal
e5c675c679
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
33c7e91b41
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
e02829186f
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
481f8c2caa
Avoid underflow hacks completely with asktime
2020-08-22 18:38:20 -07:00
James R
688adb2055
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
7194aa9ad6
Skip XD_DISCORD payload in non Discord builds
2020-08-22 16:26:15 -07:00
Hannu Hanhi
37c5c1ca8a
Fix timedemo in OpenGL mode
2020-08-23 00:10:50 +03:00
Hannu Hanhi
28882fec24
Fix replay recording memory leak
2020-08-22 22:04:45 +03:00
Sally Coolatta
d302ad6e38
Fix XOR not working
2020-08-22 09:46:25 -04:00
Sal
64b38df5b9
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
8c79d62b22
Merge remote-tracking branch 'public/next' into discord-rpc-support
2020-08-22 07:28:21 -04:00
Sally Coolatta
7228cc80a1
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
26295bb793
Ask to join is a menu option, rather than trying to replace your menu temporarily.
2020-08-22 07:16:52 -04:00
lachwright
9feee5348d
Correct misplaced MT_ARIDTOAD listing
2020-08-22 17:35:31 +08:00
Sally Coolatta
a7ab3d34f2
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
38ec458903
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
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
James R
cedb09bd92
Fix pointers on LUA_Archive and LUA_UnArchive
...
(servers joinable again)
2020-08-21 19:47:53 -07:00
James R
7d6d0f216a
Fix mismatched type of followercolor in netsave
2020-08-21 18:34:10 -07:00
GoldenTails
8b6450fa4d
Forgot to check if the file was important, whoops!
2020-08-21 04:00:54 -05:00
GoldenTails
972c8da4bb
Fix a bug where adding the same mod multiple times counted to the mod limit
...
A one line fix. Seriously.
2020-08-21 03:30:22 -05: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
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
James R
ec3dffbb94
Makefile: add WINDOWSHELL=1 for the Windows detect
2020-08-20 20:19:50 -07:00
Ashnal
60cfc091e5
Add return false to the connect timeout
2020-08-20 23:09:12 -04:00
