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
Sally Coolatta
0b31f71b61
Merge branch 'master' into finish-line-beam
2020-08-29 21:53: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
Steel Titanium
ce666acdda
Fix some build errors
...
(cherry picked from commit f25235d1eb
2020-08-29 18:08:41 -07:00
James R
e6c914c7b2
Fix stupid NONET
2020-08-29 17:51:59 -07:00
James R
d31fb748b2
Do not do master server things when NOCURL
...
(cherry picked from commit b681b6e9e6
2020-08-29 17:45:28 -07:00
James R
c188d6eb5d
C90?
2020-08-29 17:21:54 -07:00
Steel Titanium
08aa1a5ad7
Fix compile error
2020-08-29 20:04:11 -04:00
Steel Titanium
13033c521b
Attempts to make the intro a bit more shorter
...
Make the scene time be 5 seconds long max
Use the standard fade which is much shorter in length.
2020-08-29 19:28:16 -04:00
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
