Steel Titanium
fc042e90f0
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
James R
2274129f57
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
MascaraSnake
c2311dca45
Merge branch 'next' into udmf-next
2020-02-18 18:39:11 +01:00
MascaraSnake
4c4596a45f
Clean up the mess that is extracolormap_t::fog
2020-02-16 20:19:24 +01:00
MascaraSnake
e22661e150
Implement linedef alpha field (replaces specials 900-908)
2020-01-26 12:24:52 +01:00
MascaraSnake
588a76efe4
Merge branch 'next' into udmf-next
2020-01-24 22:38:26 +01:00
Jaime Passos
7ec8c607ce
typoe
2020-01-17 00:34:31 -03:00
MascaraSnake
d0a3447f5c
Merge branch 'udmf-next' into stringargs
2020-01-11 16:17:53 +01:00
MascaraSnake
4e3dcc70c3
Merge branch 'next' into udmf-next
...
# Conflicts:
# src/p_slopes.c
2020-01-11 16:16:57 +01:00
MascaraSnake
ebe467a664
Merge branch 'udmf-next' into stringargs
2020-01-11 16:03:38 +01:00
MascaraSnake
331fe7201c
Merge branch 'udmf-vslopes' into 'next'
...
Add textmap vertex slope support
See merge request STJr/SRB2!633
2020-01-11 10:02:51 -05:00
MascaraSnake
23da73f5df
Merge branch 'linedef-args' into 'udmf-next'
...
Add UDMF linedef arguments and make slope specials use them
See merge request STJr/SRB2!643
2020-01-11 10:00:07 -05:00
toaster
456778f950
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into public_hexang
...
# Conflicts:
# src/r_defs.h
2020-01-08 21:47:47 +00:00
James R
f97afe47fa
Merge remote-tracking branch 'origin/master' into next
2020-01-08 13:27:14 -08:00
toaster
336b6ad85e
Hexafaceted sprite angle support (See merge request description coming soon).
...
Also, some minor memory efficiency fixes to both rotsprite and ordinary sprite rotations.
2020-01-08 20:49:14 +00:00
MascaraSnake
16b515ba06
Implement linedef string arguments
2020-01-08 08:42:35 +01:00
MascaraSnake
64dc6659c5
Merge branch 'next' into linedef-args
2020-01-06 14:46:47 +01:00
Jaime Passos
71f7130abe
AA trees are not needed at all for rotated patches
2020-01-05 03:10:03 -03:00
MascaraSnake
6f3354f24f
Merge branch 'next' into linedef-args
2020-01-04 23:10:39 +01:00
Nev3r
d8b24fcfba
Merge branch 'remove-vertex-z-mk2' into udmf-vslopes
...
# Conflicts:
# src/lua_maplib.c
# src/p_setup.c
# src/r_defs.h
2020-01-04 22:59:42 +01:00
Nev3r
764a8ad43f
Remove vertex_t's z variable.
2020-01-04 18:29:02 +01:00
Nev3r
24e099298a
Add vertex height vars into the vertex struct, and their textmap parsing.
2020-01-04 10:24:42 +01:00
MascaraSnake
85a94e1a58
Implement linedef args (unused and untested so far)
2020-01-02 12:23:14 +01:00
Jaime Passos
285a2ec05d
Revert "Merge branch 'software-clownery' into 'master'"
...
This reverts merge request !578
2019-12-31 23:40:17 +00:00
Nev3r
938f81ba88
Merge branch 'software-clownery' into 'master'
...
Software clownery
See merge request STJr/SRB2!578
2019-12-31 12:49:44 -05:00
James R
e0c2e607f0
Merge remote-tracking branch 'origin/master' into next
2019-12-30 22:37:24 -08:00
James R
73643dafaf
Fix NOHW compiling
2019-12-30 20:18:08 -08:00
Jaime Passos
2bdd411736
Merge remote-tracking branch 'origin/master' into software-clownery
2019-12-30 23:21:42 -03:00
James R
67ca512120
Merge remote-tracking branch 'origin/master' into next
2019-12-30 13:16:53 -08:00
Nev3r
d689e06c6a
Add XNOD, XGLN and XGL3 BSP formats recognition and support.
2019-12-29 14:17:51 +01:00
MascaraSnake
1fc2a4755a
-Add linedef pointer to side_t, so sidedefs are able to tell if they're a front or back sidedef during setup
...
-Fix a broken condition during setup of texture fields for the change music linedef
2019-12-29 09:39:50 +01:00
Jaime Passos
518714a51a
Fix sprite rotation crashes.
2019-12-27 00:37:40 -03:00
Jaime Passos
016cced4a1
R_CalculateSegDistance stuff...
2019-12-26 01:58:38 -03:00
Nev3r
befe33e239
Remove redundant netarchive-related sector vars as they're not used anymore.
...
Replace lump-based difference checks for sectors in P_NetArchiveWorld(), now it uses the mapload-created copy instead.
2019-12-23 12:42:38 +01:00
Jaime Passos
6976b9bf01
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-10 23:01:10 -03:00
Steel Titanium
a5cdb0a4b3
Update copyright date on source files
2019-12-06 13:49:42 -05:00
toaster
dbeec7dacc
Prevent Knuckles latching onto horizon special linedefs.
...
Also, update all references to the horizon special to use a #defined constant instead of a magic number.
2019-11-23 14:20:41 +00:00
Jaime Passos
845b82668b
Merge remote-tracking branch 'origin/master' into renderswitch
2019-11-12 20:25:40 -03:00
Jaime Passos
1c46be78af
add r_patch.c
2019-10-28 15:28:42 -03:00
Jaime Passos
116fb2639e
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-10-28 14:29:10 -03:00
MascaraSnake
7129293121
Make spinbust behavior consistent with other bustable blocks and rename FF_ONLYKNUX to FF_STRONGBUST
2019-10-19 22:20:48 +02:00
toaster
1ba694aa0b
Resolve #242 by adding SF_TRIGGERSPECIAL_HEADBUMP, enabled by ML_EFFECT2.
...
Also, readd SF_INVERTPRECIP, which was done in a random branch last year and then lost because it was never merged. Enabled by ML_EFFECT1.
2019-10-06 14:34:25 +01:00
Jaime Passos
c02c7fb28b
JIMITA DO THE SOC
2019-09-28 19:13:51 -03:00
Jaime Passos
ce8b821691
Merge remote-tracking branch 'jimita/renderswitch' into renderswitch
2019-09-10 18:12:01 -03:00
Jaime Passos
59f403d67b
lua stuff
2019-09-09 17:24:13 -03:00
Jaime Passos
402012e973
I
2019-08-18 14:16:48 -03:00
Latapostrophe
a35cea9243
chaos conflict
2019-06-11 17:02:47 +02:00
Nev3r
d343770f1f
Small code cleanup
...
- Removed unused vars from the slope struct. I'm pretty sure they were meant for something at some point, but right now there's nothing using them and frankly I find it hard to understand what they were meant for.
- Removed unused slope flags.
- Flipped dynamic slope flag naming convention.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-19 20:30:13 +02:00
Nev3r
bb083f20b4
Dynamic slopes now use thinkers.
...
* Moved dynamic slope-related data into its own thinker.
* Vertex slopes no longer use the mapthings directly.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-19 14:14:43 +02:00
Jaime Passos
fd5fb73671
gl4
2019-03-17 22:27:50 -03:00