thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
6887 commits 1 branch 12 tags 205 MiB
Commit graph

6887 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sally Coolatta
2d7c835c4d Dedicated servers can change discordinvites without needing RPC support 2020-08-30 23:20:06 -04:00
James R
7c1f73ed71 NO_DISCORDRPC to disable rich presence on Windows 2020-08-30 19:11:30 -07:00
James R
b66b0bf648 Update versions to 1.3 2020-08-30 19:06:31 -07:00
James R
fbd1280e17 Update patch.kart asset hash 2020-08-30 19:02:31 -07:00
James R
ffff6accce Merge remote-tracking branch 'origin/master' into next 2020-08-30 19:01:04 -07:00
Sal
1bf259e341 Merge branch 'world-tour' into 'next' 
Flush random map pool after all but 3 are played

See merge request KartKrew/Kart-Public!216
 2020-08-30 21:49:20 -04:00
Sal
d55e5e8d8d Merge branch 'easy-colors' into 'master' 
Caret color codes in server name

See merge request KartKrew/Kart-Public!218
 2020-08-30 21:49:03 -04:00
Sal
4b9188b626 Merge branch 'discord-rpc-support' into 'next' 
Discord Rich Presence

See merge request KartKrew/Kart-Public!207
 2020-08-30 21:48:44 -04:00
Sally Coolatta
b8f1842855 Use ENTER and ESC 
A and B are v2 terminology
 2020-08-30 21:42:04 -04:00
James R
8557f23b9e Merge branch 'master' into next 2020-08-29 18:22:19 -07:00
James R
754347987d Fix stupid NONET 
(cherry picked from commit 679bfa21edec6b652def93082da5586e6c755678)
 2020-08-29 18:19:39 -07:00
James R
df78298a11 C90? 
(cherry picked from commit 1f38db46298181d117432e12e88b326a92b4b785)
 2020-08-29 18:19:15 -07:00
James R
c7dbc889ef Merge remote-tracking branch 'origin/master' into next 2020-08-29 11:26:52 -07:00
Sally Coolatta
18a7f1b3f6 Add join/leave notification sounds 2020-08-27 20:10:25 -04:00
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
James R
7a19d9a9df Convert caret color codes to SRB2 color codes 2020-08-27 15:44:06 -07:00
James R
dcad2cd1fa Convert from caret colors when sending SERVERINFO 2020-08-27 15:43:20 -07:00
Sal
9c04407967 Merge branch 'expose-demoplayback' into 'next' 
Expose demo.playback to Lua

See merge request KartKrew/Kart-Public!217
 2020-08-27 18:18:39 -04:00
Steel Titanium
9be59cc560 Expose demo.playback to Lua 2020-08-27 14:58:46 -04:00
TehRealSalt
99e3adcdca Flush random map pool after all but 3 are played 2020-08-27 14:32:44 -04:00
Sal
9df376e537 Merge branch 'check-defaultdir' into 'master' 
Check ~/.srb2kart for srb2.srb

See merge request KartKrew/Kart-Public!215
 2020-08-27 14:08:17 -04:00
James R
e4a522353f Say DEFAULTDIR not .srb2kart 2020-08-26 23:37:52 -07:00
James R
45af41ef0c Check DEFAULTDIR for srb2.srb after cwd 2020-08-26 20:20:40 -07: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