Steel Titanium
e7683fb239
Reword the error to be more consistent with other errors
2020-12-03 21:14:27 -05:00
Steel Titanium
acf0d768fb
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into lua-skinsprites
2020-12-03 17:29:08 -05:00
Tatsuru
e9a7d98522
Initialize in p_spec.c too + magic number replacement
2020-12-03 17:50:10 -03:00
Zippy_Zolton
dc53970fac
g
2020-12-03 02:05:10 -06:00
Zippy_Zolton
5fc6864cc2
Fix fire objects disappearing in lava
2020-12-03 01:28:54 -06:00
GoldenTails
db7cc8e988
Fix missing stuff
2020-12-02 19:47:00 -06:00
Jaime Ita Passos
4b8b5d928d
Don't clip if the 3D floor is fog
2020-12-02 15:34:11 -03:00
Jaime Ita Passos
fefd953a83
Fix 3D floor culling with polyobject segs
2020-12-02 15:31:11 -03:00
Tatsuru
2f44a9ab02
Don't spawn the projectile if you're just gonna delete it
2020-12-02 12:05:40 -03:00
Nev3r
0b6585b51d
Move the numerical arg check below so that the string gets checked first (who decided to give them such similar names anyway).
2020-12-01 19:44:58 +01:00
Nev3r
f17cae1b5d
Follow GZDoom's convention for stringargs.
2020-12-01 18:35:24 +01:00
Zachary McAlpin
7eebfdc7d4
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading
2020-11-30 23:48:49 -06:00
James R
6dea40beaa
Fix double define
2020-11-30 19:04:23 -08:00
Zippy_Zolton
3015ee07ae
thanks zap
2020-11-30 16:39:24 -06:00
Tatsuru
8502675e1b
Initialize junk line tag lists
2020-11-30 18:21:06 -03:00
Zippy_Zolton
6bfccec3c3
oops
2020-11-30 12:05:45 -06:00
Zippy_Zolton
8c836971de
overhaul
2020-11-30 12:04:35 -06:00
James R
a7621f4e96
Fix compiler warning
2020-11-29 16:41:48 -08:00
James R
e5a15f49bc
Merge branch 'plane-sorting-fix-part-2' into 'master'
...
More consistent fix to plane sorting false positive
See merge request KartKrew/Kart!330
2020-11-29 19:14:03 -05:00
James R
9c912f0cd4
Merge branch 'bot-fixes' into 'master'
...
Fix bots having weird rubberbanding in 2.2
See merge request KartKrew/Kart!337
2020-11-29 19:13:54 -05:00
James R
71553a8ad0
Merge branch 'battle-rethink' into 'master'
...
Battle rethink
See merge request KartKrew/Kart!335
2020-11-29 19:13:38 -05:00
Zippy_Zolton
556dd3bfca
P_GivePlayerRings
2020-11-29 17:39:54 -06:00
Zippy_Zolton
96ff6d002d
Make P_DoSuperTransformation (with giverings) add 50 rings instead of setting it
2020-11-29 17:16:57 -06:00
GoldenTails
d8ab3a75ed
Remove the rest of the Playing() checks for GameQuit hook
2020-11-29 16:53:29 -06:00
Sal
8861da8108
Merge branch 'replay_fuckery' into 'master'
...
Replay fuckery (resolves #95 )
Closes #95
See merge request KartKrew/Kart!338
2020-11-29 16:21:25 -05:00
LJ Sonic
079df8df4d
Merge branch 'fix-stacktrace' of https://git.do.srb2.org/STJr/SRB2.git into next
...
# Conflicts:
# src/dehacked.c
# src/dehacked.h
2020-11-29 21:54:15 +01:00
Zachary McAlpin
522dd26376
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading
2020-11-29 13:59:10 -06:00
GoldenTails
7c8a447d8f
Always call GameQuit when quitting via the Quit menu option on the title screen.
2020-11-29 08:32:04 -06:00
GoldenTails
ded87cb54c
Send a quitting argument to the GameQuit Lua hook
2020-11-29 08:30:50 -06:00
Nev3r
ed041a88a4
Merge branch 'fix-playercmd' into 'next'
...
Fix PlayerCmd not handling angle and aiming correctly
See merge request STJr/SRB2!1265
2020-11-29 05:30:01 -05:00
Nev3r
7f9eca0b13
Merge branch 'no-dd-make' into 'master'
...
Remove Direct Draw from Makefile
See merge request STJr/SRB2!1263
2020-11-29 05:29:21 -05:00
Nev3r
9fe6bd7ae9
Merge branch 'optimise-overridden-actions' into 'fix-stacktrace'
...
Only call the Lua API for overridden actions
See merge request STJr/SRB2!1254
2020-11-29 05:27:33 -05:00
Nev3r
17955311b9
Merge branch 'dehacked-hell' into 'next'
...
Split dehacked.c into multiple files.
See merge request STJr/SRB2!1222
2020-11-29 05:18:45 -05:00
James R
d5688f53a0
Don't print W_VerifyFile errors more than once
2020-11-28 20:51:21 -08:00
SMS Alfredo
6b83600300
Allow non-player objects to apply the CR_PLAYER carry type without crashing the game
2020-11-28 22:03:02 -06:00
James R
0587b89b93
Don't add pk3 if there are holes
...
ZIP tools often read the final central directory, but SRB2 may not if there are
multiple central directories. It's just easier to not allow "holes", or
unaccounted for bytes in the file.
2020-11-28 20:00:01 -08:00
toaster
891f14dd26
Don't show post-race bot inputs on input display UI.
2020-11-28 17:29:28 +00:00
toaster
762dfd3063
When resuming from a rewind, don't:
...
* run wipes again
* run titlecards again
* stop the music
2020-11-28 12:31:16 +00:00
toaster
495e4896dc
Fixed Chengi's sprite2 bug, and started on (but haven't nailed down) the rewind crash.
2020-11-28 11:45:25 +00:00
toaster
c2447154ec
Bracketing fix for Sryder.
2020-11-28 11:32:29 +00:00
James R
e3cae2315a
Add missing *individual* skin flags
2020-11-28 02:22:08 -08:00
James R
7367acf00d
Replace TC macros with an enum that automatically counts up
...
Also fixes TC_DASHMODE not being accessible to Lua.
2020-11-28 02:19:52 -08:00
Sal
57cebd383f
Merge branch 'fix-pause-refocus-mute' into 'master'
...
Fix pausing then refocusing the window causing the music to stay muted
See merge request KartKrew/Kart-Public!244
2020-11-27 16:45:02 -05:00
Sal
46bb13683f
Merge branch 'microwavable-thinkframe' into 'next'
...
Add a Lua global to tell if you are in the preticker
See merge request KartKrew/Kart-Public!245
2020-11-27 16:44:47 -05:00
toaster
f72108c4fa
A whole bunch of cleanup to get most record attack/replay stuff reasonably functional.
...
* Fix the screen being stuck black at the very start of start record attack.
* Bump up the demoversion to 7, because I want all previous v2 demos to be guaranteed kaput (it was previously 4, but 7 is a nice number).
* Fix a ton MORE shitcausing misalignments in the replay system, this time specifically focused on getting ghosts functional.
* Plug a few holes in the "best lap" record implementation that allowed for stupidly easy records due to the way v2's finish lines work.
* Make a few follower-related things sane, to prevent spurious console prints that were getting in the way of my test prints.
2020-11-27 20:30:28 +00:00
toaster
9c0edb097f
Fix demos doing incomprehensibly nasty bullshit; now they only desync for a handful of easier-to-hammer-down cases.
2020-11-27 17:59:57 +00:00
toaster
6f6e87f9df
Fix replays not being accessible via menus.
2020-11-27 17:32:04 +00:00
Zachary McAlpin
09d4fb3a69
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading
2020-11-26 10:39:41 -06:00
Zippy_Zolton
9a8493f1c4
Fix normal one-up sound playing in Mario mode
2020-11-25 21:46:45 -06:00
James R
d6ed2f4ac8
Merge branch 'spritestuff2-fixes' into 'next'
...
Some fixes for spritestuff2
See merge request STJr/SRB2!1264
2020-11-25 19:26:49 -05:00
