stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-18 01:51:39 +00:00
Code Issues Projects Releases Packages Wiki Activity
13233 commits 176 branches 42 tags 221 MiB
Commit graph

601 commits

Author SHA1 Message Date
Eidolon
805941a98f Merge public next into uncappedrevengeance 
This is to capture the UDMF merges and make the later code review
easier.
 2022-05-03 14:45:14 -05:00
Eidolon
9f845622cd Revert "P_InitAngle, to fix angle interpolation on spawning objects" 
This reverts commit a80c98bd164a2748cbbfad9027b34601185d93f5.
 2022-04-26 20:56:34 -05:00
Eidolon
5790168194 Convert P_TeleportMove use to origin funcs 2022-04-26 20:56:34 -05:00
Sally Coolatta
d476b41dfa P_SetOrigin & P_MoveOrigin to replace P_TeleportMove 2022-04-26 20:56:33 -05:00
Sally Coolatta
e4930535f3 P_InitAngle, to fix angle interpolation on spawning objects 2022-04-26 20:56:31 -05:00
MascaraSnake
faa7d89e3e Merge branch 'udmf-more-linedef-types' into udmf-sector-fields 2022-04-20 21:01:16 +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
MascaraSnake
36692483df Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs 
# Conflicts:
#	src/p_inter.c
 2022-04-19 22:04:04 +02:00
spherallic
c782e81700 Give MT_METALSONIC_RACE a drop shadow & removed unused vars. 2022-03-12 17:44:37 +01: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
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
878b4dc5b6 Don't read or set MT_NULL's properties in A_SkullAttack 2022-02-04 20:09:37 +01:00
James R
6325185091 Add P_SetPower; remove mobj hack from line 434 2022-02-01 03:52:31 -08:00
James R
9dfa153e74 Use P_CheckMove 2022-02-01 03:52:28 -08:00
James R
f6f002e70b A_LobShot: remove ??? 
MT_NULL spawning, not cool bro.
 2022-02-01 02:43:00 -08:00
spherallic
6d19a55de9 oops 2022-01-23 19:19:26 +01:00
katsy
fe3a201df5 fix oldringexplode not scaling or flipping 2022-01-13 02:52:10 -06:00
spherallic
a08c7eac1f wip: staterange actions 2022-01-05 09:55:46 +01:00
MascaraSnake
86e2fefcac Add sector gravity field for UDMF 2021-12-30 18:19:42 +01:00
MascaraSnake
e76d332678 Disable the old hacky way of doing egg capsules in UDMF maps 2021-12-28 23:51:08 +01:00
MascaraSnake
a091b7d16d Adapt bosses to UDMF and remove now-unused mapthing flags 2021-12-28 22:52:24 +01:00
MascaraSnake
e71a952d70 Adapt monitors to UDMF 2021-12-28 17:54:26 +01:00
MascaraSnake
b4a206c063 Adapt remaining enemies to UDMF 2021-12-28 13:14:48 +01:00
MascaraSnake
3bab07d036 Adapt flickies to UDMF 2021-12-27 17:36:51 +01:00
MascaraSnake
8db84ffef9 Adapt boss waypoint to UDMF 2021-12-27 15:39:14 +01:00
MascaraSnake
06bbee50bf Adapt boss IDs and trigger tags to UDMF 2021-12-27 15:07:37 +01:00
MascaraSnake
a14eacd63a Bowser isn't a boss, so don't call A_BossDeath just to do that one thing it needs to do 2021-12-27 08:55:59 +01:00
MascaraSnake
ea6fe56df6 Refactor A_BossDeath 2021-12-26 20:31:02 +01:00
MascaraSnake
3661fd5079 Adapt boss fly point to UDMF 2021-12-26 20:09:38 +01:00
MascaraSnake
baa99150d0 Adapt Fang waypoint to UDMF 2021-12-25 09:58:00 +01:00
MascaraSnake
5eb2448a40 Adapt Pterabytes to UDMF 2021-12-21 21:57:35 +01:00
MascaraSnake
bfcbf5136b Adapt SDURF and Puma to UDMF 2021-12-21 17:28:29 +01:00
MascaraSnake
72e2c24fdb Adapt some reserved tags to UDMF 2021-12-20 23:28:18 +01:00
MascaraSnake
1b023732d0 Adapt rock spawner to UDMF 2021-12-13 08:24:52 +01:00
MascaraSnake
c4775ed37b Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs 
# Conflicts:
#	extras/conf/SRB2-22.cfg
#	src/p_ceilng.c
 2021-12-03 19:10:29 +01:00
sphere
491ffc7447 Merge branch 'firedeath' into 'next' 
Fix #214 (Crushstacean + Fireball Player Removal)

Closes #214

See merge request STJr/SRB2!1629
 2021-11-26 14:11:09 +00:00
SMS Alfredo
cf79bc8382 Fix #214 (Crushstacean + Fireball Player Removal) 2021-11-26 14:11:09 +00:00
SMS Alfredo
865c0a081d Make Overlay objects account for player->drawangle 2021-10-29 10:40:25 +00:00
MascaraSnake
a5959c0248 Merge branch 'next' into udmf-plane-linedefs 
# Conflicts:
#	src/p_inter.c
 2021-09-17 10:34:07 +02:00
Tatsuru
bb0a0bd4ab Merge branch 'oneline' into 'next' 
Add a missing scale assignment to A_Boss3ShockThink

See merge request STJr/SRB2!1588
 2021-09-12 22:04:28 +00:00
SMS Alfredo
d5cdb2dc78 Add a missing scale assignment to A_Boss3ShockThink 2021-09-12 22:04:28 +00:00
Tatsuru
9187656b90 Merge branch 'shocksplit' into 'next' 
Split up x/y/z averages in A_Boss3ShockThink (resolves #589)

Closes #589

See merge request STJr/SRB2!1538
 2021-09-12 21:49:28 +00:00
CobaltBW
4f04097066 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into addplayer 2021-06-29 14:32:46 -07:00
MascaraSnake
259700be3c Get rid of customspeed in EV_DoElevator and read speed from args[1] 2021-06-25 11:11:16 +02:00
MascaraSnake
7025f12d95 -Pass tag as argument to EV_ functions 
-Get rid of junk linedefs for specialized EV_ calls
-Store tag in args[0]
 2021-06-25 10:12:16 +02:00
Shane Ellis
09f445f227 Merge branch 'next' into 'addplayer' 
# Conflicts:
#   src/g_game.c
 2021-06-19 20:20:45 -04:00
LJ Sonic
e3a5da3f6f Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into HEAD 
# Conflicts:
#	src/lua_hook.h
#	src/lua_hooklib.c
 2021-06-19 20:49:12 +02:00