Sal
b238a6db50
Merge branch 'shockwave-action' into 'next'
...
Add a standalone action for shockwaves
See merge request STJr/SRB2!1777
2023-07-24 11:01:41 +00:00
sphere
5c87dd52ec
Merge branch 'action-super-fix' into 'next'
...
Make A_Action super act as expected
Closes #718
See merge request STJr/SRB2!1737
2023-07-19 19:40:42 +00:00
spherallic
1470d099e3
Update copyright year & credits
2023-03-31 14:53:31 +02:00
MascaraSnake
54640a8664
Merge branch 'udmf-executor-triggers' into udmf-thing-types
...
# Conflicts:
# extras/conf/udb/Includes/SRB222_things.cfg
2022-04-20 20:59:55 +02:00
MascaraSnake
39b7fb9ff8
Merge commit 'd624ee25' into udmf-thing-types
...
# Conflicts:
# src/p_mobj.c
# src/p_spec.c
2022-04-20 20:41:46 +02:00
MascaraSnake
f76b104c4a
Merge commit 'c7050671' into udmf-thing-types
2022-04-20 19:42:03 +02:00
spherallic
6a969c163b
Make boss 3's shockwave into a customizable action.
2022-04-06 15:31:25 +02:00
spherallic
6ef7221e38
A few drop shadow-related additions:
...
- Added A_SetShadowScale
- Added A_ShadowScream which combines the above with A_Scream, used for
badnik explosions
- Gave flickies drop shadows
2022-03-09 00:49:24 +01:00
sphere
7e26377264
Merge branch 'state-changes' into 'next'
...
Update Nightopians & other state changes
See merge request STJr/SRB2!1744
2022-03-06 15:45:59 +00:00
sphere
ab711128c7
Merge branch 'tutorial-scenery' into 'next'
...
Tutorial scenery
See merge request STJr/SRB2!1722
2022-03-06 15:45:53 +00:00
spherallic
14295ac7de
2022
2022-03-03 20:24:46 +01:00
spherallic
a6c52f5bad
Move MT_RAY to the very end of the mobj list.
2022-02-22 15:49:16 +01:00
Sally Coolatta
dcdbdec2bf
Make super for A_Actions act as described
2022-02-06 15:16:30 -05:00
spherallic
6e105a23f6
Update Nightopian states for the new sprites & fix another bug
2022-02-02 14:43:22 +01:00
James R
518de0ce10
Add P_CheckMove
...
Checks if P_TryMove would succeed without actually moving.
2022-02-01 03:37:03 -08:00
spherallic
be7f628e2c
Add new plant object for the revamped tutorial.
2022-01-23 20:13:26 +01:00
spherallic
a08c7eac1f
wip: staterange actions
2022-01-05 09:55:46 +01:00
MascaraSnake
1cff7a161a
Adapt ambient sound effects to UDMF
2021-12-28 09:58:45 +01:00
MascaraSnake
72e2c24fdb
Adapt some reserved tags to UDMF
2021-12-20 23:28:18 +01:00
MascaraSnake
ebf692f143
Adapt push/pull point to UDMF
2021-12-16 07:00:30 +01:00
LJ Sonic
d325c7e6d3
The year is 2021
2021-05-07 17:45:56 +02:00
James R
14c6d93c0c
Merge branch 'team-elementalfire' into 'next'
...
Player-Colored Elemental Fire for competitive gametypes
See merge request STJr/SRB2!1312
2020-12-15 20:47:45 -05:00
James R
e55d842d7f
Kill SEENAMES
2020-12-12 02:11:23 -08:00
Zippy_Zolton
f2095b57fd
Player-Colored Elemental Fire for competitive gametypes
2020-12-10 20:37:50 -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
GoldenTails
8fef61aa29
Split dehacked.c into multiple files.
2020-11-23 21:42:26 -06:00
Louis-Antoine
13ba25f4fe
Only call the Lua API for overridden actions
2020-11-15 01:15:58 +01:00
Zippy_Zolton
c0571b5fbf
g
2020-10-23 01:09:12 -05:00
Zippy_Zolton
a4459b6693
Dash state for Tails overlay
2020-10-23 00:47:47 -05:00
Nev3r
fd5b05cafc
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-07-06 11:13:27 +02:00
LJ Sonic
cf4087a014
Merge branch 'jetjawsound' into 'next'
...
Jet Jaw Sounds
See merge request STJr/SRB2!1018
2020-07-04 07:09:43 -04:00
LJ Sonic
8d511ed565
Merge branch 'cez3debris' into 'next'
...
New Debris for CEZ3
See merge request STJr/SRB2!1012
2020-07-04 07:00:20 -04:00
Nev3r
ff8759e507
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
...
# Conflicts:
# src/hardware/hw_main.c
2020-06-30 20:29:48 +02:00
Zippy_Zolton
dc2f689957
Jet Jaw Sounds
2020-06-25 00:38:07 -05:00
sphere
e9e9cd6133
Give ACZ3 boss MF_NOCLIP(HEIGHT) when entering pinch phase, to prevent softlocking.
2020-06-21 16:01:24 +02:00
Zippy_Zolton
fc68134938
Thanks for the feedback, I have fixed your issues.
2020-06-20 02:04:18 -05:00
Zippy_Zolton
bfa1382736
New Debris for CEZ3
2020-06-20 02:02:13 -05:00
MascaraSnake
969c48fac8
Merge branch 'udmf-next' into udmf-polyobjects
...
# Conflicts:
# src/p_polyobj.c
2020-05-16 11:18:47 +02:00
lachwright
63cb58a10a
Update new GFZ3 laser
2020-05-06 09:03:03 +08:00
lachwright
92c900f284
New GFZ3 laser
2020-05-06 09:01:02 +08:00
MascaraSnake
df3ca712d8
Move polyobject crush option to the first line args
2020-05-04 23:27:26 +02:00
James R
b8d40a5783
Merge branch 'dye' into 'next'
...
Expose colorization to mappers and SOC
See merge request STJr/SRB2!679
2020-04-09 19:50:32 -04:00
Steel Titanium
76f26cda24
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
James R
7060083db5
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Tatsuru
3022e38d15
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into Tatsuru/SRB2-dye
...
# Conflicts:
# src/d_player.h
# src/dehacked.c
2020-02-19 17:46:18 -03:00
Tatsuru
80edefa56e
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into dye
2020-02-19 17:32:43 -03:00
James R
92f65fd822
Merge branch 'exitmove-tweaks' into 'next'
...
Exitmove tweaks
See merge request STJr/SRB2!709
2020-02-18 21:58:18 -05:00
James R
71707e6dca
Reset rollangle on TNT explosion
...
This is the where the extreme lag when TNT Barrels explode came from. Probably
because the sprites are big and there's four of 'em! It shouldn't matter that
these aren't rotated--they're pretty round.
2020-01-31 14:32:47 -08:00
Tatsuru
9e4c519cad
In-map visual indicator
2020-01-19 19:02:03 -03:00
James R
1be648578f
Merge branch 'clear-sign-sprite' into 'next'
...
Add generic signpost sprite for skins that don't have one
See merge request STJr/SRB2!626
2020-01-16 19:57:54 -05:00
