Commit graph

7055 commits

Author SHA1 Message Date
toaster
375a635c8a Merge branch 'spectator-little-things' of https://git.do.srb2.org/KartKrew/Kart-Public.git into public_speclil 2021-12-02 18:07:50 +00:00
toaster
71f2d638e6 Merge branch 'next' of https://git.do.srb2.org/KartKrew/Kart-Public.git into public_next
# Conflicts:
#	src/f_finale.c
2021-12-02 17:42:50 +00:00
toaster
56df30a009 Merge branch 'credits-update-14' into 'public_next'
Credits changes for 1.4

See merge request KartKrew/Kart!469
2021-12-02 16:58:53 +00:00
James R
1cd08dc5f1 Add Ivo's name to the credits 2021-11-29 14:05:33 -08:00
James R
07d5cbcab0 Remove name at contributor's request 2021-11-29 13:53:45 -08:00
SteelT
fd88c139a6 Merge branch 'master' into next 2021-11-21 16:01:29 -05:00
SteelT
651d04f91b Merge branch 'opulence' into 'public_next'
Add Opulence objects

See merge request KartKrew/Kart!442
2021-11-04 22:31:12 +00:00
Sal
520b1f2a75 Merge branch 'linespecial-fixes-jug' into 'next'
Delayable linedefs crash fix

See merge request KartKrew/Kart-Public!269
2021-09-12 00:09:15 +00:00
Sal
8cd205cd28 Merge branch 'freeslot-errors' into 'master'
Error checking for running out of freeslots

See merge request KartKrew/Kart-Public!267
2021-09-12 00:09:01 +00:00
JugadorXEI
ab2bbf3b08 validation against mo (guards against delays) 2021-09-07 22:09:03 +02:00
Ashnal
6e7bdc6031 Changed readfreeslots error checking to work like lib_freeslot
Uses loop variable to determine error condition
Also small change to lib_freeslot for SFX for consistent use of I_Error
2021-09-06 16:12:33 -04:00
Ashnal
4b750e0504 Adjust S_AddSoundFx to also use I_Error when exhausting Freeslots 2021-09-06 16:12:13 -04:00
Ashnal
f5bcfc6379 Add I_Errors for when the game exhausts all freeslots of any type. 2021-09-06 16:11:57 -04:00
SteelT
82b1499eb0 Merge branch 'master' into next 2021-09-05 01:30:12 -04:00
Sal
e66eaf001e Merge branch 'james-full-name' into 'master'
Add my full name in the credits

See merge request KartKrew/Kart-Public!264
2021-08-31 04:31:14 +00:00
James R
64ff789f2f Add my full name 2021-08-30 18:45:56 -07:00
lachablock
4ed6c3665a Add missing explicit break 2021-08-20 20:03:55 +10:00
Sal
52879a7632 Merge branch 'instashield-fix' into 'next'
Instashield crash fix

See merge request KartKrew/Kart-Public!260
2021-08-08 03:27:54 +00:00
JugadorXEI
1d62fb8eb3 Fix duplicated matchgenericflags (was causing crash) 2021-08-07 16:41:22 +02:00
JugadorXEI
31b3a9ac90 Merge branch 'next' of https://git.do.srb2.org/KartKrew/Kart-Public into next 2021-08-05 17:27:57 +02:00
Sal
17d45fc790 Merge branch 'mobjscale-itemthrow' into 'next'
Small mapobjectscale fixes

See merge request KartKrew/Kart-Public!259
2021-07-24 17:15:56 +00:00
lachablock
98142864d7 comment formatting 2021-07-24 19:16:28 +10:00
lachablock
62529f748a Add Opulence objects 2021-07-24 19:08:04 +10:00
SinnamonLat
c839a7c5d8 Fix mixed declaration in K_KartDrift while i'm at it 2021-07-10 12:09:52 +02:00
SinnamonLat
c149ee441a Fix item throws and startboost scale in mobjscaled maps 2021-07-10 12:08:54 +02:00
Sal
a0f0b473ab Merge branch 'more-fixes-jug' into 'next'
Various gameplay & stability fixes

See merge request KartKrew/Kart-Public!256
2021-07-06 13:42:41 -04:00
JugadorXEI
4fdbfb1dc2 Abstain from handling connections instead if the level is loading 2021-05-30 23:36:07 +02:00
JugadorXEI
63f87b4cec Use toaster's approach to fix 0th position 2021-05-30 18:45:38 +02:00
JugadorXEI
4d8d5d7fa9 More robust check against yellow springs on grown players. 2021-05-30 18:28:27 +02:00
JugadorXEI
2c1d5a72b6 We use FRACBITS out there 2021-05-28 16:43:09 +02:00
JugadorXEI
733cf20a10 Set GS_LEVEL after level load, set GS_WAITINGFORPLAYERS during level transition if GS_LEVEL is current GS 2021-05-28 16:32:21 +02:00
JugadorXEI
dfc942a628 Removed superfluous logic that was causing midair drift charge to disappear 2021-05-20 20:21:08 +02:00
JugadorXEI
df769a13e4 Fix grown players no spark/wrongdrift interaction with yellow spring panels 2021-05-20 19:39:32 +02:00
JugadorXEI
bf911d02cb Thunder Shield now has COOLDOWNONSTART 2021-05-20 19:24:56 +02:00
JugadorXEI
e123f4bd53 Fix 0th position bug 2021-05-19 23:19:43 +02:00
JugadorXEI
5882338192 Fix rare sink crash, fix jawz particles hang, fix magnet landing 2021-05-06 03:10:01 +02:00
Sal
ff26ff9b61 Merge branch 'small-fixes-jug' into 'master'
Discord Invite Fixes + DUMPCONSISTENCY flag for makefile

See merge request KartKrew/Kart-Public!255
2021-04-20 15:12:48 -04:00
Sally Coolatta
83349b2473 Not while flashing 2021-04-13 02:06:57 -04:00
JugadorXEI
ea56bd472c Simply return address, don't allow self_ip to be possibly written as something else 2021-04-13 06:56:14 +02:00
JugadorXEI
d7e8642236 Discord Invite Fixes + DUMPCONSISTENCY flag for makefile 2021-04-13 00:33:06 +02:00
JugadorXEI
eea337029a Merge remote-tracking branch 'upstream/next' into next
Keeping this up to date.
2021-04-08 00:16:30 +02:00
Sal
6e33b5281d Merge branch 'discord-invite-fix' into 'master'
DRPC: Wait for join secret to be ready

See merge request KartKrew/Kart-Public!248
2021-04-07 17:47:59 -04:00
Sal
977917e61d Merge branch 'no-gamma-shortcut-v1' into 'master'
Replace gamma shortcut with a fullscreen toggle

See merge request KartKrew/Kart-Public!254
2021-04-07 17:42:53 -04:00
Sal
4c1ae5d649 Merge branch 'mines-no-fullbright' into 'next'
Mines lost their fullbright between inception and v1 release

See merge request KartKrew/Kart-Public!253
2021-04-07 17:38:52 -04:00
Sally Coolatta
4f5d5500f2 Merge branch 'next' into spectator-little-things 2021-04-07 17:14:54 -04:00
Sally Coolatta
a70faeccff Merge branch 'master' into next 2021-04-07 17:14:30 -04:00
Sally Coolatta
967a85db81 Merge branch 'master' into spectator-little-things 2021-04-07 17:14:09 -04:00
Sally Coolatta
163b215b0a Merge branch 'next' into spectator-little-things 2021-04-07 17:14:02 -04:00
Sal
24c234f968 Merge branch 'ensure-map-title-level-header' into 'next'
Allocate non-existent level header for G_BuildMapTitle

See merge request KartKrew/Kart-Public!252
2021-04-07 15:47:17 -04:00
Sally Coolatta
35b83ead37 Mines lost their fullbright between inception and v1 release
I got so mad about this I brought the fix to v1 also
2021-04-07 03:16:27 -04:00