Logan Aerl Arias
be6b7ca1b3
Merge branch 'next' into bustablemobjzfix
2023-12-31 11:40:36 -05:00
Alam Ed Arias
a2e288a4dc
Merge branch 'master' into fix-segfault-removemobj-spawn
2023-10-28 20:40:07 -04:00
Alam Ed Arias
277b64f290
Merge branch 'next' into bustablemobjzfix
2023-10-25 15:08:22 -04:00
Sally Coolatta
10a8f2d05e
Fix some minor warnings
...
- Fix `lib_getSkinSprite` overshadowing `sprites` global
- Rename terrible result_e `ok` so it stops overshadowing crap
- Remove inlining from w_wad.c since it reached the inline limit (remember kids, your compiler knows better than you these days whenever or not to inline something)
- Remove unused variable in G_PlayerReborn
2023-07-25 11:32:26 -04:00
Gustaf Alhäll
4967c296ab
Fix segfaults when P_RemoveMobj is called from MobjSpawn hook
2023-04-30 12:43:31 +02:00
spherallic
1470d099e3
Update copyright year & credits
2023-03-31 14:53:31 +02:00
spherallic
1a6e48de1e
Update mobj floorz/ceilingz after FOF destruction
2023-03-16 12:12:58 +01:00
MascaraSnake
3b9ed3e802
EV_DoFloor: Set dummy tag correctly for chained linedef executing
2022-12-27 10:54:24 +01:00
Eidolon
e59684b1a2
Merge branch 'bustablesoundz' into 'next'
...
Start bustable FOF sounds at the correct height
Closes #846
See merge request STJr/SRB2!1818
2022-11-11 23:15:26 -06:00
Eidolon
2aa9a92e7e
Merge branch 'nodoublecrumble' into 'next'
...
Prevent floating crumbling platforms from being triggered twice
Closes #797 and #594
See merge request STJr/SRB2!1817
2022-11-11 23:13:16 -06:00
Eidolon
12c2ddb115
Merge branch 'uncappedrevengeance' into next
...
Uncapped
See merge request STJr/SRB2!1856
# Conflicts:
# src/dummy/i_system.c
# src/win32/win_sys.c
2022-11-08 21:13:50 -06:00
spherallic
78eae609cc
Start bustable FOF sounds at the correct height
2022-09-26 23:51:51 +02:00
spherallic
1cf5bdf82b
Prevent floating crumbling platforms from being triggered twice
2022-09-26 20:32:57 +02:00
MascaraSnake
8d4baace53
Add Lua backwards compatibility for FOF flags
2022-07-31 12:04:42 +02:00
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
8f43b5afd0
Fix Mario block item placement
2022-04-28 22:32:35 -05:00
Sally Coolatta
dbd5ddf95d
Add interpolation to more moving plane types
...
Adds interpolation to the following:
- Crumbling platforms
- Mario blocks
- Floatbob platforms (this one works really strangely due to two thinkers, maybe double-check this one?)
2022-04-26 20:56:34 -05:00
Eidolon
9c8d0a3b6f
Add sector plane level interpolations
2022-04-26 20:56:30 -05:00
MascaraSnake
faa7d89e3e
Merge branch 'udmf-more-linedef-types' into udmf-sector-fields
2022-04-20 21:01:16 +02:00
MascaraSnake
5660d896e6
Merge branch 'udmf-thing-types' into udmf-more-linedef-types
2022-04-20 21:00:44 +02:00
MascaraSnake
36bf8b1a77
Merge branch 'udmf-linedef-executors' into udmf-executor-triggers
2022-04-19 22:33:53 +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
MascaraSnake
a78e4e553c
Merge branch 'next' into udmf-fofs-mkii
2022-03-18 07:29:02 +01:00
spherallic
14295ac7de
2022
2022-03-03 20:24:46 +01:00
MascaraSnake
5d343f9c13
Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs
...
# Conflicts:
# extras/conf/udb/Includes/SRB222_misc.cfg
# src/p_spec.h
2022-01-14 20:17:18 +01:00
MascaraSnake
6bb6dc88ca
Merge branch 'next' into udmf-fofs-mkii
...
# Conflicts:
# src/hardware/hw_main.c
# src/lua_maplib.c
# src/p_spec.c
# src/p_user.c
2022-01-14 07:24:05 +01:00
MascaraSnake
020b738aa9
Merge branch 'udmf-more-linedef-types' into udmf-sector-fields
2022-01-09 13:52:59 +01:00
MascaraSnake
e7a281d994
Merge branch 'udmf-thing-types' into udmf-more-linedef-types
2022-01-09 13:52:26 +01:00
MascaraSnake
95bf8ea4bb
Merge branch 'udmf-linedef-executors' into udmf-executor-triggers
2022-01-09 13:51:21 +01:00
MascaraSnake
a8e32cfe12
Fix incorrect turnaround behavior for bounceFloor and bounceCeiling
2022-01-05 00:26:10 +01:00
MascaraSnake
208395214a
Implement sector fields for linedef executor triggering
2021-12-31 11:39:34 +01:00
MascaraSnake
696d4945a7
Adapt linedef type 14 to UDMF
2021-12-30 07:54:16 +01:00
MascaraSnake
21f8baea4a
Make trigger conditions for "all players" triggers consistent
2021-12-09 21:36:46 +01:00
MascaraSnake
1a2b0d24ab
Make all players triggers work if players are in different sectors with the same tag
2021-12-08 20:29:10 +01:00
MascaraSnake
c9ed484129
Rewrite each time thinker
2021-12-07 07:17:58 +01:00
MascaraSnake
f359151457
Merge branch 'trigger-bruh' into udmf-executor-triggers
2021-12-05 08:36:11 +01:00
MascaraSnake
55fc7cbd67
Fix "all players" check in T_EachTimeThinker
2021-12-05 07:20:55 +01:00
MascaraSnake
87a6528f00
Merge branch 'udmf-linedef-executors' into udmf-executor-triggers
2021-12-03 19:26:46 +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
MascaraSnake
adce427299
Merge branch 'next' into udmf-fofs-mkii
...
# Conflicts:
# src/p_user.c
2021-12-03 18:58:02 +01:00
MascaraSnake
5f7babb53f
Adapt linedef type 313 to UDMF
2021-09-26 20:42:01 +02:00
MascaraSnake
bfc13c2529
Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs
2021-09-26 06:50:34 +02:00
MascaraSnake
f26f41e03a
Fix thinker functions that still use tag instead of args[0] for FOFs
2021-09-26 06:48:26 +02:00
MascaraSnake
5df1dd324d
Fix oversight in T_MoveFloor
2021-09-23 10:24:02 +02:00
MascaraSnake
2da5b54e73
Now that set flats linedef exists, simplify set heights linedef
2021-06-27 12:21:26 +02:00
flarn2006
a5cd764772
move MT_BOXSPARKLE in the list
2021-06-26 15:42:41 -04:00
flarn2006
22272732f0
Exclude MT_BOXSPARKLE from Mario blocks
2021-06-26 14:59:56 -04:00
MascaraSnake
588c56b224
Floor/ceiling movers: Stop abusing the texture variable to store the sourceline
2021-06-26 16:25:14 +02:00
MascaraSnake
446e78b6e2
Linedef type 403: Allow executor chaining and flat change at the same time
2021-06-26 15:28:28 +02:00
MascaraSnake
9fdd9060e4
Adapt crusher linedefs to UDMF
2021-06-26 12:53:14 +02:00
