Commit graph

14533 commits

Author SHA1 Message Date
Monster Iestyn
d255d29942 remove statsec and statline as they appear to be entirely unused 2020-04-24 20:28:01 +01:00
Monster Iestyn
0916ca3642 Split off FOF archiving-related code into their own functions 2020-04-24 20:26:57 +01:00
Monster Iestyn
f26e8f3df7 Merge branch 'thinker-cleanup' into 'next'
Plane movement thinker cleanup

See merge request STJr/SRB2!880
2020-04-24 14:30:52 -04:00
Monster Iestyn
da9a53daca Merge branch 'crumbling-sink' into 'next'
Sync crumblestate in netgames

See merge request STJr/SRB2!890
2020-04-24 12:53:14 -04:00
Louis-Antoine
71d445a59e Fix mouse being grabbed in intermission and cutscenes 2020-04-24 18:33:35 +02:00
Monster Iestyn
db9c14702d These are flags! Serves me right for just rushing this out 2020-04-24 16:53:54 +01:00
Monster Iestyn
d1e49fa926 Sync crumblestate in netgames 2020-04-24 16:40:09 +01:00
Louis-Antoine
01c9281fc5 Add a menu option for the minimum join delay 2020-04-24 15:38:07 +02:00
Louis-Antoine
ccf4bbe194 Add a minimum delay between connections 2020-04-24 14:05:15 +02:00
Monster Iestyn
8fb68b025f Merge branch 'uh-oh-spriteinfo' into 'next'
Fix minor issue with lua spriteinfo

See merge request STJr/SRB2!872
2020-04-23 16:12:55 -04:00
Monster Iestyn
20ec3f6c89 Merge branch 'emeraldspawnfix' into 'next'
Fix emerald hunt not working properly, part 2

See merge request STJr/SRB2!887
2020-04-23 15:41:27 -04:00
Sally Cochenour
e26bb897d6 Prevent divide by zero in slopes code
Not exactly sure why this happens, or if this is the correct way to fix it
2020-04-23 14:18:43 -04:00
Monster Iestyn
e78a2fa297 Merge branch 'master' into next 2020-04-23 18:49:53 +01:00
Sal
c53b09c48c Merge branch 'update-cmakelists' into 'master'
Add new files to src/CMakeLists.txt

See merge request KartKrew/Kart!242
2020-04-23 12:48:43 -04:00
LJ Sonic
c7f8791894 Merge branch 'long-names' into 'next'
Enable entry searching functions to retrieve entry names longer than 8 characters

See merge request STJr/SRB2!885
2020-04-23 04:40:33 -04:00
Sally Cochenour
372544d28f Merge branch 'master' into pet-robo 2020-04-22 21:54:40 -04:00
Sally Cochenour
f920dd026d Minor things 2020-04-22 21:53:52 -04:00
Sally Cochenour
4bd88e47e3 Polishing turn stuff 2020-04-22 21:53:41 -04:00
Sally Cochenour
fb945ae523 Merge branch 'pet-robo' of https://git.magicalgirl.moe/KartKrew/Kart into pet-robo 2020-04-22 19:13:20 -04:00
Sally Cochenour
99cf835078 Improved banana usage 2020-04-22 19:13:14 -04:00
sphere
7955c96fa1 Restore carelessly removed const keywords. 2020-04-22 23:38:10 +02:00
sphere
d5863b912f Move variable declarations outside of for loops. 2020-04-22 23:17:18 +02:00
sphere
13c47b9e6f Fix variable-length array definition, just in case. 2020-04-22 23:10:43 +02:00
Hannu Hanhi
1e6444767e Fix mistake in previous commit 2020-04-22 23:50:50 +03:00
Hannu Hanhi
e4bbe42eec Fix lighting breaking if trying to use unavailable shaders 2020-04-22 23:50:14 +03:00
sphere
b3b7ffb889 Make P_SpawnEmeraldHunt even more concise, using Fisher-Yates shuffle. 2020-04-22 22:46:12 +02:00
Sal
dca2193121 Merge branch 'misc-camera' into 'master'
Camera tweaks

See merge request KartKrew/Kart!241
2020-04-22 16:42:19 -04:00
Sal
4a198c0bfa Merge branch 'version-change' into 'master'
No more modulo bullshit in VERSION

See merge request KartKrew/Kart!238
2020-04-22 16:41:17 -04:00
Sal
17e2cea517 Merge branch 'bananas-are-items' into 'master'
Move all of the item destroy sector code to one place

See merge request KartKrew/Kart!240
2020-04-22 16:40:56 -04:00
Sal
e23027d678 Merge branch 'let-there-be-var' into 'master'
Change netvars in replays

See merge request KartKrew/Kart!234
2020-04-22 16:40:29 -04:00
Sal
9671090d06 Merge branch 'distance-to-finland' into 'master'
More consistent finish line distance & positions

See merge request KartKrew/Kart!237
2020-04-22 16:40:19 -04:00
sphere
d7185516f5 Fix a mistake with P_SpawnEmeraldHunt and make it more concise. 2020-04-22 20:38:58 +02:00
sphere
0868930d3b Make emerald hunt shards spawn at correct heights, and add Float option. 2020-04-22 18:58:40 +02:00
lachwright
4040698e24 Add new files to src/CMakeLists.txt 2020-04-22 23:24:25 +08:00
lachwright
dd126494b3 [Everyone disliked that.] (revert camera zoom) 2020-04-22 22:59:57 +08:00
Zipper
e794810d47 Update p_user.c 2020-04-22 07:59:08 -04:00
wolfs
e1f33d903e Merge branch 'text-fixes-that-bother-me' into 'awful-mix'
Text fixes that bother me

See merge request SinnamonLat/Kart-Public!13
2020-04-22 03:28:41 -04:00
ThatAwesomeGuy173
3e37730545 Use "addons" instead of "add-ons" for consistency 2020-04-22 01:24:59 -06:00
ThatAwesomeGuy173
59d7dfc753 Merge branch 'awful-mix' of https://git.magicalgirl.moe/SinnamonLat/Kart-Public into text-fixes-that-bother-me 2020-04-22 01:01:08 -06:00
Wolfy
5b7ce81809 FUCKING- 2020-04-22 02:00:44 -05:00
ThatAwesomeGuy173
d3e19a3b09 Merge branch 'awful-mix' of https://git.magicalgirl.moe/SinnamonLat/Kart-Public into text-fixes-that-bother-me 2020-04-22 00:48:09 -06:00
Wolfy
17236595e4 ASHNAL 2020-04-22 01:31:55 -05:00
ThatAwesomeGuy173
1bd3055937 Do the same for other messages too 2020-04-22 00:03:45 -06:00
ThatAwesomeGuy173
4c73e651cf Capitalize "record attack" as "Record Attack" and spell "addons" as "add-ons" in the replay hut 2020-04-22 00:01:03 -06:00
Wolfy
c40f1bf60d Shut the compiler up 2020-04-21 19:25:18 -05:00
Ashnal
abc17c9448 Fix dedicated servers not waiting for client wipes.
Now they run wipe logic to wait the same amount of
time that clients do, without actually rendering anything.
Previously, the server would start the new map immediately,
and clients would frameskip up to the server when they were done wiping.
2020-04-21 19:16:31 -05:00
ZipperQR
d62d43a76b Dust devil support 2020-04-22 00:59:12 +03:00
Hannu Hanhi
74b846a6e3 Sky dome from SRB2 2020-04-22 00:18:58 +03:00
Hannu Hanhi
0467510b2e Don't crash if shaders are unavailable 2020-04-21 23:45:48 +03:00
Hannu Hanhi
b388239410 Remove sometimes harmful NetUpdate call from HWR_RenderFrame 2020-04-21 23:32:31 +03:00