Commit graph

16762 commits

Author SHA1 Message Date
GoldenTails
4c2a3e6c77 Expose V_GetStringColormap to Lua via v.getStringColormap(). 2020-09-01 10:47:02 -05:00
James R
2948885660 Don't let players change their name more than five times per minute 2020-08-31 20:08:22 -07:00
James R
6466291ac6 Oops :v 2020-08-31 19:34:43 -07:00
James R
33c11f1b0b Save chosen renderer to file, use on startup if no -software or -opengl parameter 2020-08-31 19:29:09 -07:00
James R
d78befc713 Merge branch 'master' into next 2020-08-31 16:10:05 -07:00
James R
e4b7257ec9 Fix NOHW compiling 2020-08-31 16:09:41 -07:00
James R
7cbc9add07 Kill NOHS
(cherry picked from commit a79316b375)
2020-08-31 16:06:40 -07:00
James R
1818693d71 Fix NOGME compiling
(cherry picked from commit d52a35e5b6)
2020-08-31 16:04:09 -07:00
James R
9ad0a0660c Just SetCurrentDirectory to the exe's folder on windoze 2020-08-31 01:23:56 -07:00
Sally Coolatta
7561c69266 Increase cipher length 2020-08-31 00:25:28 -04:00
Sally Coolatta
528ed46661 Remove default dirs on Windows
Cause more issues than fixes. Still around for Linux.
2020-08-31 00:06:47 -04:00
Sally Coolatta
2a93c2260d Expand IP_SIZE 2020-08-30 23:41:27 -04:00
Sally Coolatta
f11481fbe2 Move to D_RegisterServerCommands 2020-08-30 23:35:41 -04:00
Sally Coolatta
1a0e134d10 Bruh, lowercase 2020-08-30 23:31:54 -04:00
Sally Coolatta
40b0a2479e Wrong file 2020-08-30 23:26:00 -04:00
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
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