Sal
1aca163d12
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
29f156aac2
Use ENTER and ESC
...
A and B are v2 terminology
2020-08-30 21:42:04 -04:00
James R
bca656e4ac
Merge branch 'master' into next
2020-08-29 18:22:19 -07:00
James R
daf6e66268
Fix stupid NONET
...
(cherry picked from commit 679bfa21edec6b652def93082da5586e6c755678)
2020-08-29 18:19:39 -07:00
James R
95a026c98d
C90?
...
(cherry picked from commit 1f38db46298181d117432e12e88b326a92b4b785)
2020-08-29 18:19:15 -07:00
James R
3f842937a8
Merge remote-tracking branch 'origin/master' into next
2020-08-29 11:26:52 -07:00
Sally Coolatta
82bfdf9ccc
Add join/leave notification sounds
2020-08-27 20:10:25 -04:00
Sally Coolatta
17318ceec7
This should be set for server too!!
2020-08-27 19:36:37 -04:00
Sally Coolatta
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
Sally Coolatta
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
James R
54c3aed86c
Convert caret color codes to SRB2 color codes
2020-08-27 15:44:06 -07:00
James R
f802e9fbcb
Convert from caret colors when sending SERVERINFO
2020-08-27 15:43:20 -07:00
Sal
734ce8dee5
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
35122d3a22
Expose demo.playback to Lua
2020-08-27 14:58:46 -04:00
TehRealSalt
86754cf820
Flush random map pool after all but 3 are played
2020-08-27 14:32:44 -04:00
Sal
5e7926d87f
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
4c816f4059
Say DEFAULTDIR not .srb2kart
2020-08-26 23:37:52 -07:00
James R
6e3facf8f4
Check DEFAULTDIR for srb2.srb after cwd
2020-08-26 20:20:40 -07:00
Sally Coolatta
cb5ab33a93
Merge branch 'next' into discord-rpc-support
2020-08-26 12:56:58 -04:00
Sally Coolatta
ee1ea21336
Merge branch 'master' into next
2020-08-26 12:56:38 -04:00
Sal
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
Sal
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
ThatAwesomeGuy173
27b72ccbf5
Replace 'ignoring skin' debug print with a proper console warning
2020-08-25 23:13:58 -06:00
Sal
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
James R
04d774c765
Fix NOHW compiling
2020-08-24 18:06:00 -07:00
James R
3437b0690a
Kill NOHS
2020-08-24 17:58:39 -07:00
James R
16fc87edcf
Fix NOMIXER compiling
2020-08-24 17:55:42 -07:00
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
