Sally Coolatta
ed88e4dd7c
This should be set for server too!!
2020-08-27 19:36:37 -04:00
Sally Coolatta
5e9e3e163d
Attach initial join discord info to servercfg, so that we don't have a pause from needing to also send XD_DISCORD
...
XD_DISCORD is now reserved for when the options are changed mid-game
2020-08-27 19:14:45 -04:00
Sally Coolatta
61d6ee0982
Misc changes to how the program runs
...
- Call DRPC_Init at the end of D_SRB2Main instead of in the middle
- Call Discord_RunCallbacks in D_SRB2Loop instead of G_Ticker
- Fix errorcount nums in I_Error, an old leftover from when Discord_Shutdown was not handled by I_AddExitFunction
2020-08-27 18:50:36 -04:00
Sally Coolatta
54c487feff
Merge branch 'next' into discord-rpc-support
2020-08-26 12:56:58 -04:00
Sally Coolatta
29b4bf872f
Merge branch 'master' into next
2020-08-26 12:56:38 -04:00
Sal
55821da246
Merge branch 'various-compiling-fixes-2' into 'master'
...
Fix some compile flags
See merge request KartKrew/Kart-Public!213
2020-08-26 09:58:35 -04:00
Sal
3064c87212
Merge branch 'too-many-characters' into 'master'
...
Warn players when going over the skin limit
See merge request KartKrew/Kart-Public!214
2020-08-26 09:58:22 -04:00
ThatAwesomeGuy173
11f98adad4
Replace 'ignoring skin' debug print with a proper console warning
2020-08-25 23:13:58 -06:00
Sal
f93c5f435d
Merge branch 'various-compiling-fixes' into 'next'
...
Various compiling fixes
See merge request KartKrew/Kart-Public!212
2020-08-25 18:36:51 -04:00
James R
3f8edd38a5
Fix NOHW compiling
2020-08-24 18:06:00 -07:00
James R
a79316b375
Kill NOHS
2020-08-24 17:58:39 -07:00
James R
6a14d9c1d4
Fix NOMIXER compiling
2020-08-24 17:55:42 -07:00
James R
594600e5ae
Fix NOPNG compiling
2020-08-24 17:52:55 -07:00
James R
d52a35e5b6
Fix NOGME compiling
2020-08-24 17:51:01 -07:00
Sal
60dc56dfe3
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
23b1f8fc5e
Initialize this variable
2020-08-24 01:25:34 -04:00
Steel Titanium
94ca85b229
Hopefully the last time...
2020-08-24 01:18:38 -04:00
Steel Titanium
6c0c0d710f
Remind me why NONET exists?
2020-08-24 01:13:59 -04:00
Steel Titanium
0021128446
This is just stupid
2020-08-24 01:06:10 -04:00
Steel Titanium
7005d8303c
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
d1d1b3aadf
Screw you C90
2020-08-24 00:58:14 -04:00
Steel Titanium
858f345802
Haha NONET...
2020-08-24 00:56:53 -04:00
Steel Titanium
5d5385f7a1
It's discord-rpc, not libgme
2020-08-23 17:45:31 -04:00
Steel Titanium
f20f0b2f19
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
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
