82bfdf9ccc
Add join/leave notification sounds
2020-08-27 20:10:25 -04:00
17318ceec7
This should be set for server too!!
2020-08-27 19:36:37 -04:00
51dce9707f
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
c165b0761c
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
cb5ab33a93
Merge branch 'next' into discord-rpc-support
2020-08-26 12:56:58 -04:00
ee1ea21336
Merge branch 'master' into next
2020-08-26 12:56:38 -04:00
f87b883ba5
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
7c69e49a05
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
27b72ccbf5
Replace 'ignoring skin' debug print with a proper console warning
2020-08-25 23:13:58 -06:00
34b6998b2e
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
04d774c765
Fix NOHW compiling
2020-08-24 18:06:00 -07:00
3437b0690a
Kill NOHS
2020-08-24 17:58:39 -07:00
16fc87edcf
Fix NOMIXER compiling
2020-08-24 17:55:42 -07:00
fbde926497
Fix NOPNG compiling
2020-08-24 17:52:55 -07:00
0d57ba1d02
Fix NOGME compiling
2020-08-24 17:51:01 -07:00
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
c6164a1947
Initialize this variable
2020-08-24 01:25:34 -04:00
41c742a699
Hopefully the last time...
2020-08-24 01:18:38 -04:00
87d2ad0c23
Remind me why NONET exists?
2020-08-24 01:13:59 -04:00
04b7051141
This is just stupid
2020-08-24 01:06:10 -04:00
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
d4006d00c3
Screw you C90
2020-08-24 00:58:14 -04:00
509c57a8d6
Haha NONET...
2020-08-24 00:56:53 -04:00
e58c9ac410
It's discord-rpc, not libgme
2020-08-23 17:45:31 -04:00
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
585cb1cfe3
Finish DEVELOP mode functionality
2020-08-23 07:15:33 -04:00
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
ed58cb5468
Move the .dll's to libs\dll-binaries
2020-08-23 05:58:09 -04:00
175fa43c90
Update win 32 bit libraries, implement win 64 bit libraries
2020-08-23 05:47:55 -04:00
e2f3e76db8
Merge branch 'next' into discord-rpc-support
2020-08-23 05:32:32 -04:00
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
7d380c326b
Merge branch 'master' into next
2020-08-23 04:44:27 -04:00
3ce6b8a54f
Fix version string
2020-08-23 04:44:05 -04:00
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
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
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
5daaef7e87
Avoid underflow hacks completely with asktime
2020-08-22 18:38:20 -07:00
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
805fb01df9
Skip XD_DISCORD payload in non Discord builds
2020-08-22 16:26:15 -07:00
4210352be9
Fix timedemo in OpenGL mode
2020-08-23 00:10:50 +03:00
5c13727aac
Fix replay recording memory leak
2020-08-22 22:04:45 +03:00
084756ec72
Fix XOR not working
2020-08-22 09:46:25 -04:00
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
5de27be169
Merge remote-tracking branch 'public/next' into discord-rpc-support
2020-08-22 07:28:21 -04:00
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
f61e3a77bd
Ask to join is a menu option, rather than trying to replace your menu temporarily.
2020-08-22 07:16:52 -04:00
32f2ed4a53
Correct misplaced MT_ARIDTOAD listing
2020-08-22 17:35:31 +08:00
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
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
e01c7aef32
Compile m_menu.c without HAVE_DISCORDRPC
2020-08-22 16:58:59 +08:00
Sally Coolatta