James R
c7dbc889ef
Merge remote-tracking branch 'origin/master' into next
2020-08-29 11:26:52 -07:00
James R
f013b73dd5
Merge remote-tracking branch 'origin/master' into next
2020-08-28 19:52:25 -07:00
James R
f52b66fdf5
Merge branch 'makefile-detect-system' into 'master'
...
Detect which system the Makefile is running on to compile for
See merge request STJr/SRB2!1123
2020-08-28 22:49:34 -04:00
James R
2165d747cb
Merge branch 'default-warningmode' into 'master'
...
Use WARNINGMODE by default
See merge request STJr/SRB2!1122
2020-08-28 22:49:24 -04:00
Steel Titanium
f0ec718aae
Make the intro shorter as I felt it was a bit too long
...
Change the code a bit so less magic numbers.
2020-08-28 20:08:46 -04:00
Steel Titanium
2f06ff44cc
Add new STARTUP lump, for the splash screen
2020-08-28 17:11:38 -04:00
Steel Titanium
6a37f39ca8
New STJR Intro, replaces the old PURE FAT intro
2020-08-28 17:10:54 -04: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
GoldenTails
ba4310939a
Make Special Stage map transitions respect nextmapoverride.
...
In other words: lets Luas set the next map of Special Stages via G_SetCustomExitVars.
It's otherwise impossible to do so via Lua.
2020-08-26 23:22:53 -05: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
df4d57aab4
Do not reset nodetoplayer before XD_REMOVEPLAYER
2020-08-24 20:23:54 -07:00
Tatsuru
57b1becfe0
Decolorize players as intended
2020-08-24 23:53:21 -03:00
James R
48d071451e
servertics_pak.starttic -> UINT8
2020-08-24 19:48:11 -07: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
Sryder
3db9902829
Actually fix replay hut crash properly, we for some reason stopped saving RNG seed
2020-08-24 01:21:32 +01:00
Sryder
afcdfe70c7
Don't read RNG seed twice when loading demo info
2020-08-24 00:57:02 +01:00
Louis-Antoine
0846079c06
Fix bonus items sometimes overriding apples in Snake minigame
2020-08-24 00:34:44 +02: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
d6ddbfade1
Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge
2020-08-23 14:51:15 -04:00
Sally Coolatta
d755a7ae6c
Fix skincolor selection
2020-08-23 14:51:02 -04:00
Sryder
ce18be8a7d
Fix the splash screen again, I accidentally got rid of scaling
2020-08-23 19:30:08 +01:00
