Tatsuru
a67862665a
Don't spawn the projectile if you're just gonna delete it
2020-12-02 12:05:40 -03:00
Radicalicious
b254439592
Update hw_light.c
2020-12-02 00:17:57 -05:00
Nev3r
4d716cb170
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
c8ae28bbaf
Follow GZDoom's convention for stringargs.
2020-12-01 18:35:24 +01:00
Zachary McAlpin
7fde15d066
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading
2020-11-30 23:48:49 -06:00
James R
d004515d6a
Fix double define
2020-11-30 19:04:23 -08:00
Zippy_Zolton
69248cc684
thanks zap
2020-11-30 16:39:24 -06:00
Tatsuru
9770368ee9
Initialize junk line tag lists
2020-11-30 18:21:06 -03:00
Zippy_Zolton
20d1811983
oops
2020-11-30 12:05:45 -06:00
Zippy_Zolton
da1a3029a9
overhaul
2020-11-30 12:04:35 -06:00
Zippy_Zolton
412f3fc42b
P_GivePlayerRings
2020-11-29 17:39:54 -06:00
Zippy_Zolton
f913d60a9f
Make P_DoSuperTransformation (with giverings) add 50 rings instead of setting it
2020-11-29 17:16:57 -06:00
GoldenTails
119d2e9e37
Remove the rest of the Playing() checks for GameQuit hook
2020-11-29 16:53:29 -06:00
LJ Sonic
eef3028110
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
51d52f7327
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading
2020-11-29 13:59:10 -06:00
GoldenTails
b389700de3
Always call GameQuit when quitting via the Quit menu option on the title screen.
2020-11-29 08:32:04 -06:00
GoldenTails
59d2646593
Send a quitting argument to the GameQuit Lua hook
2020-11-29 08:30:50 -06:00
Nev3r
ecb333511b
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
42ced125a1
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
ab649e853d
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
bcf6823cbf
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
445d040795
Don't print W_VerifyFile errors more than once
2020-11-28 20:51:21 -08:00
SMS Alfredo
95dfb93a11
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
6b4d422664
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
James R
75c5c8ba6a
Add missing *individual* skin flags
2020-11-28 02:22:08 -08:00
James R
b9f6069cd0
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
Zachary McAlpin
0280721f08
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading
2020-11-26 10:39:41 -06:00
Zippy_Zolton
db6b0c6aa0
Fix normal one-up sound playing in Mario mode
2020-11-25 21:46:45 -06:00
James R
4ab667c6a0
Merge branch 'spritestuff2-fixes' into 'next'
...
Some fixes for spritestuff2
See merge request STJr/SRB2!1264
2020-11-25 19:26:49 -05:00
SMS Alfredo
5c71fe0710
Allow player.lastlinehit and player.lastsidehit to be used outside of Knuckles' climbing ability
2020-11-25 14:31:24 -06:00
SMS Alfredo
b2d6d4f83f
Expose player.skin and player.availabilities to Lua as Read-only
2020-11-25 12:35:36 -06:00
Zachary McAlpin
d095517999
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading
2020-11-24 20:42:08 -06:00
Zachary McAlpin
76822cef2b
Expose the selectheading option from mapheader_t in Lua
2020-11-24 20:41:11 -06:00
lachwright
87968c946b
Prevent non-CA2_SPINDASH characters from getting crushed by roll-jumping into a crevice
2020-11-24 14:56:22 +11:00
GoldenTails
930b5ea442
Replace credits with original authors
2020-11-23 21:42:33 -06:00
GoldenTails
8fef61aa29
Split dehacked.c into multiple files.
2020-11-23 21:42:26 -06:00
James R
349312327a
Merge branch 'fix-dumb-checkstring-typo' into 'next'
...
Fix a dumb typo of luaL_checklstring i made whoops
See merge request STJr/SRB2!1266
2020-11-23 22:42:00 -05:00
GoldenTails
d806655769
Fix a dumb typo of luaL_checklstring i made whoops
2020-11-23 21:20:17 -06:00
Jaime Ita Passos
5bdee63117
Fix a crash
2020-11-23 12:53:59 -03:00
SMS Alfredo
fe066b3ef2
...snickerdoodles
2020-11-23 09:23:02 -06:00
SMS Alfredo
ea7e06a616
Remove PF_SPINNING when jumping if you have SF_NOJUMPDAMAGE
2020-11-23 09:21:00 -06:00
SMS Alfredo
7b05ffd92d
Revert "Fix no spin characters being able to damage enemies with their jump out of a spin without removing PF_SPINNING"
...
This reverts commit ad9bf6085f
2020-11-23 09:18:05 -06:00
SMS Alfredo
7bbd563b73
Remove unneeded S_PLAY_ROLL check
2020-11-22 23:23:35 -06:00
LJ Sonic
7ff6443659
Fix PlayerCmd not handling angle and aiming correctly
2020-11-23 01:23:34 +01:00
James R
8d71559afe
Merge branch 'make-some-lua-globals-rw' into 'next'
...
Make several Lua global variables writable.
See merge request STJr/SRB2!1233
2020-11-22 18:47:53 -05:00
James R
8a30576d81
Merge branch 'plane-sorting-fix-part-3' into 'next'
...
Improved sprite sorting against 3d floors
See merge request STJr/SRB2!1235
2020-11-22 18:31:23 -05:00
James R
f39300ac74
Merge branch 'master' into no-dd-make
2020-11-22 15:29:37 -08:00
James R
6d9e036c7f
Merge branch 'master' into next
2020-11-22 15:23:12 -08:00
James R
b059ed40c6
Merge remote-tracking branch 'origin/what-is-a-standard-2'
2020-11-22 15:19:39 -08:00
James R
40e954779e
Resolve one last conflict in splat sorting
...
Can't use gz/gzt because there is no transformation to make those work
differently for splats.
2020-11-22 15:12:34 -08:00
