Commit graph

169 commits

Author SHA1 Message Date
MascaraSnake
c1e22c4bb6 Add two more linedef/thing args because the maces need them 2021-12-14 06:43:06 +01:00
MascaraSnake
f5cda9f64c Merge branch 'udmf-lighting' into udmf-linedef-executors 2021-12-03 19:23:24 +01:00
MascaraSnake
aee4996eba Merge branch 'udmf-polyobjects' into udmf-lighting 2021-12-03 19:22:37 +01:00
MascaraSnake
6dc49042de Port katsy's bouncy FOF cleanup 2021-12-03 18:48:16 +01:00
MascaraSnake
03c1c592ab I surrender - we need more linedef args (also adapt the remaining linedef executors to UDMF) 2021-09-22 08:57:48 +02:00
MascaraSnake
e15c160773 Implement per-sector floor/ceiling lighting 2021-09-19 08:58:21 +02:00
MascaraSnake
23efeeed8e Merge branch 'next' into udmf-fofs-mkii 2021-06-23 19:48:26 +02:00
LJ Sonic
d325c7e6d3 The year is 2021 2021-05-07 17:45:56 +02:00
Nev3r
30ab512c3c Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-fofs-mkii
# Conflicts:
#	src/dehacked.c
2020-12-01 18:56:42 +01:00
Jaime Ita Passos
5e890ee6f8 Merge branch 'next' into spritestuff2 2020-11-19 00:52:43 -03:00
Nev3r
70512f11ff Merge branch 'udmf-multitag' into udmf-fofs-mkii and pray
# Conflicts:
#	src/p_floor.c
#	src/p_spec.c
2020-11-13 13:23:14 +01:00
Jaime Passos
a655257f4b Remove RF_VOXELSPRITE 2020-11-05 00:44:10 -03:00
Jaime Passos
0f9d85694d Implement an "ignore colormaps" sprite rendering flag 2020-10-27 19:54:50 -03:00
Nev3r
ad9e3411a1 Rename bustable type BT_SPIN to BT_SPINBUST to avoid conflicts with next. 2020-10-27 22:13:10 +01:00
Jaime Passos
ab526e47cc Implement object-defined floor sprite slopes. 2020-10-14 00:57:13 -03:00
Jaime Passos
4273896311 Implement relative and absolute sprite offsets for objects (mobjs)
Added RF_ABSOLUTEOFFSETS and RF_FLIPOFFSETS
2020-10-13 12:57:36 -03:00
Jaime Passos
831ccccdd6 OpenGL support for splats, fix some shadow draw bugs in Software 2020-10-12 19:53:21 -03:00
Jaime Passos
cc97e22e2f Changes to sprite rendering:
- Added render flags (see r_defs.h)
- Implemented floor splats
- Drop shadow sprite rendering through render flags
2020-10-12 00:13:22 -03:00
Jaime Passos
6e5f71dd45 Refactor patch rotation 2020-10-10 18:43:26 -03:00
Jaime Passos
dcaad758f4 Improved memory management for patches 2020-09-07 02:23:07 -03:00
Jaime Passos
2a0e47e28f Remove LUA_PATCH_SAFETY 2020-08-08 14:56:04 -03:00
Jaime Passos
91ed56ef40 Refactor patch loading 2020-08-08 05:16:47 -03:00
Nev3r
d1db5ebf56 Merge branch 'udmf-next' into udmf-fofs-mkii 2020-07-13 09:34:32 +02:00
Nev3r
ad55f5f872 Merge branch 'udmf-next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag
# Conflicts:
#	src/hardware/hw_main.c
#	src/p_ceilng.c
#	src/p_floor.c
#	src/p_mobj.c
#	src/p_mobj.h
#	src/p_polyobj.c
#	src/p_saveg.c
#	src/p_setup.c
#	src/p_spec.c
#	src/p_spec.h
#	src/p_user.c
#	src/r_bsp.c
#	src/r_defs.h
2020-07-10 18:18:07 +02:00
Nev3r
710097a0ca Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-10 11:47:16 +02:00
Jaime Passos
4f6420274f Remove Software tricks 2020-07-06 01:26:56 -03:00
MascaraSnake
8dd3c78b05 Add FOF flag for splat flat rendering 2020-06-12 08:27:10 +02:00
MascaraSnake
9dbfa28dbc Merge branch 'udmf-next' into udmf-fofs-mkii
# Conflicts:
#	extras/conf/udb/Includes/SRB222_linedefs.cfg
#	src/p_setup.c
2020-06-09 09:50:02 +02:00
MascaraSnake
d3ec12c842 Merge branch 'udmf-next' into executordelay
# Conflicts:
#	src/p_spec.c
2020-05-13 09:55:25 +02:00
MascaraSnake
6e7373a475 Merge branch 'next' into udmf-next 2020-05-04 20:32:56 +02:00
MascaraSnake
f26648e6f2 Adapt linedef executor delay to UDMF 2020-05-03 20:41:37 +02:00
MascaraSnake
1aafc2f463 Replace "bouncy FOF" sector type with "make FOF bouncy" linedef type 2020-05-03 12:44:30 +02:00
MascaraSnake
35e9e5b33c Rearrange FOF flags and improve custom FOF backwards compatibility 2020-05-03 09:13:14 +02:00
MascaraSnake
0d4d7bfc38 Adapt custom FOF setup 2020-05-02 23:00:22 +02:00
MascaraSnake
25219b614e Implement "Make FOF quicksand" linedef type 2020-05-02 22:07:42 +02:00
MascaraSnake
1f041496c7 Store bustable FOF data directly in ffloor_t instead of referring to master line 2020-05-02 21:19:55 +02:00
MascaraSnake
4dd25721f6 Merge branch 'movement-refactor' into udmf-fofs-mkii 2020-05-02 14:29:10 +02:00
MascaraSnake
485a4e5035 Remove POLYOBJECTS and POLYOBJECTS_PLANES defines 2020-05-02 12:08:31 +02:00
Nev3r
9ebb4071ee Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag
# Conflicts:
#	src/p_floor.c
#	src/p_mobj.c
#	src/p_spec.c
#	src/r_segs.c
2020-04-25 10:47:45 +02:00
MascaraSnake
3170f2b8c3 Merge branch 'next' into udmf-next
# Conflicts:
#	src/p_mobj.c
#	src/r_segs.c
2020-04-24 21:15:53 +02:00
Nev3r
ffc161e2aa Merge branch 'udmf-next' into udmf-multitag
# Conflicts:
#	src/p_spec.c
2020-04-18 14:04:15 +02:00
Nev3r
2b2a18fdf1 Merge branch 'udmf-colormaps' into 'udmf-next'
UDMF colormaps

See merge request STJr/SRB2!855
2020-04-18 07:42:24 -04:00
Nev3r
aa0d76f8fa Delete tags. 2020-04-18 00:23:24 +02:00
Nev3r
e87ad0fb38 Delete old taglists. 2020-04-18 00:05:55 +02:00
MascaraSnake
fd598f315e Add an enum for crumblestate 2020-04-17 23:54:37 +02:00
Nev3r
35f539e398 Merge branch 'udmf-next' into udmf-multitag 2020-04-14 22:21:32 +02:00
Nev3r
d40713d08b Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-04-14 22:20:54 +02:00
Nev3r
74bd23c275 Actually remove the entire code block in T_MovePlane(), and remove line_t.tagline as it served no other purpose. 2020-04-13 15:17:53 +02:00
Nev3r
a7e99ab5cf Added static multitag read and storage on mapload. 2020-04-12 11:56:36 +02:00
Nev3r
4128f826b7 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
# Conflicts:
#	src/lua_hooklib.c
2020-04-12 09:57:19 +02:00