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
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
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
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
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
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
SMS Alfredo
12f36719b4
Allow player.lastlinehit and player.lastsidehit to be used outside of Knuckles' climbing ability
2020-11-25 14:31:24 -06:00
SMS Alfredo
0118d60c06
Expose player.skin and player.availabilities to Lua as Read-only
2020-11-25 12:35:36 -06:00
Zachary McAlpin
d418a8cd45
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading
2020-11-24 20:42:08 -06:00
Zachary McAlpin
d96f1738a1
Expose the selectheading option from mapheader_t in Lua
2020-11-24 20:41:11 -06:00
lachwright
9172661e47
Prevent non-CA2_SPINDASH characters from getting crushed by roll-jumping into a crevice
2020-11-24 14:56:22 +11:00
GoldenTails
17092cc5b0
Replace credits with original authors
2020-11-23 21:42:33 -06:00
GoldenTails
d673604b48
Split dehacked.c into multiple files.
2020-11-23 21:42:26 -06:00
James R
df6a742547
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
8a9c3c57f7
Fix a dumb typo of luaL_checklstring i made whoops
2020-11-23 21:20:17 -06:00
Jaime Ita Passos
eee4548d3f
Fix a crash
2020-11-23 12:53:59 -03:00
SMS Alfredo
d33aab487a
...snickerdoodles
2020-11-23 09:23:02 -06:00
SMS Alfredo
a60a74e33e
Remove PF_SPINNING when jumping if you have SF_NOJUMPDAMAGE
2020-11-23 09:21:00 -06:00
SMS Alfredo
21d9e870aa
Revert "Fix no spin characters being able to damage enemies with their jump out of a spin without removing PF_SPINNING"
...
This reverts commit 826a4429dd
2020-11-23 09:18:05 -06:00
SMS Alfredo
fee455ec7a
Remove unneeded S_PLAY_ROLL check
2020-11-22 23:23:35 -06:00
LJ Sonic
2e71d1be63
Fix PlayerCmd not handling angle and aiming correctly
2020-11-23 01:23:34 +01:00
James R
85bf84193d
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
bd82b02478
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
4f39497feb
Merge branch 'master' into next
2020-11-22 15:23:12 -08:00
James R
fd8a15dc37
Merge remote-tracking branch 'origin/what-is-a-standard-2'
2020-11-22 15:19:39 -08:00
James R
1a2c2c8471
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
Jaime Ita Passos
490758eac2
Remove SHORT macros for referencing patch width/height/offsets
2020-11-22 20:02:47 -03:00
James R
d7e32e616d
Merge remote-tracking branch 'origin/next' into plane-sorting-fix-part-3
2020-11-22 14:41:42 -08:00
