Jaime Passos
a4d6addbca
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-05-09 17:12:52 -03:00
Sally Coolatta
9ea37836e2
New kart animations!
...
- Add unique frames for inward and outward drifting.
- Increase the speed threshold required to reach your "fast driving" frames.
- Use slow driving frames when you're slowing down, even if you're techincally above the fast speed threshold.
- Use frameangle to smooth out the transition into drifting, instead of having "pre-turned" drift frames.
2020-05-08 17:26:27 -04:00
MascaraSnake
9ebbb5b7c2
Fixed a typo
2020-05-07 21:59:39 +02:00
Wolfy
7fa7543358
Fix the RA only linedef
...
I forgot some stuff.
2020-05-05 10:25:40 -05:00
MascaraSnake
af8bd89558
Adapt basic PolyObject setup to UDMF
2020-05-04 22:40:49 +02:00
MascaraSnake
8c22834b46
Merge branch 'next' into udmf-next
2020-05-04 20:32:56 +02:00
MascaraSnake
b3f81349ae
Merge branch 'polyobject-cleanup' into 'next'
...
PolyObject cleanup
See merge request STJr/SRB2!919
2020-05-04 14:18:08 -04:00
MascaraSnake
58a5e4ce7c
Merge branch 'level-header-sector-typeskd' into 'next'
...
Allow some map-wide settings to be set via level header instead of sector types
See merge request STJr/SRB2!917
2020-05-04 05:21:49 -04:00
MascaraSnake
ef394eccfb
Simplify set/fade polyobject translucency code
2020-05-04 10:29:35 +02:00
MascaraSnake
5e188cb71b
Remove non-descriptive comments
2020-05-04 10:01:44 +02:00
MascaraSnake
a69201bf68
Move parameter parsing for EV_DoPolyObjFlag into its own function
2020-05-04 09:58:27 +02:00
MascaraSnake
c6d245879a
Pass parameters to EV_DoPolyObjFlag in a struct and not via the line
2020-05-04 09:54:32 +02:00
Sally Coolatta
cb12d1ebf8
Merge branch 'master' into pet-robo
2020-05-03 21:30:40 -04:00
Sal
765227d380
Merge branch 'speed-pads-tweaks' into 'master'
...
Speed pads tweaks
See merge request KartKrew/Kart!246
2020-05-03 21:27:54 -04:00
MascaraSnake
9566d7db96
Implement "set linedef executor delay" linedef type
2020-05-03 21:03:15 +02:00
MascaraSnake
5c0559a3d2
Adapt linedef executor delay to UDMF
2020-05-03 20:41:37 +02:00
MascaraSnake
2df5758ecf
Allow map-wide gravity to be set via level header
2020-05-03 18:33:18 +02:00
MascaraSnake
9abfcacc3c
Add level header options for setting special stage time and spheres requirements
2020-05-03 17:56:49 +02:00
MascaraSnake
40f228c952
Merge branch 'next' into egg-capsule
...
# Conflicts:
# src/p_spec.c
2020-05-03 15:29:20 +02:00
MascaraSnake
6002a0e443
Add "trigger egg capsule" linedef executor
2020-05-03 15:22:13 +02:00
James R
01cdc1af49
Also preserve player angle on speed pads
2020-05-02 19:10:05 -07:00
James R
652b7bbb9e
Retain drift on speed pads
2020-05-02 19:10:04 -07:00
MascaraSnake
8efec04051
Remove POLYOBJECTS and POLYOBJECTS_PLANES defines
2020-05-02 12:08:31 +02:00
MascaraSnake
58508e199d
Make the laser thinker find the FOF itself instead of storing it in the thinker struct
2020-05-02 10:03:16 +02:00
MascaraSnake
b9c5f65cbf
Clean up Thwomp spawning code
2020-05-02 09:15:34 +02:00
MascaraSnake
7f74258951
Merge branch 'next' into udmf-next
...
# Conflicts:
# src/p_saveg.c
# src/p_slopes.c
# src/p_spec.c
2020-05-01 12:44:39 +02:00
MascaraSnake
238513ffd6
Merge branch 'find-sector-from-tag' into 'next'
...
Remove P_FindSectorFromLineTag and P_FindLineFromLineTag
See merge request STJr/SRB2!901
2020-05-01 05:49:52 -04:00
MascaraSnake
e967c32a10
Merge branch 'more-thinker-refactor' into 'next'
...
More thinker refactoring
See merge request STJr/SRB2!900
2020-05-01 05:47:14 -04:00
MascaraSnake
5cf3fd0074
Merge branch 'next' into elevator-cleanup
...
# Conflicts:
# src/p_saveg.c
2020-05-01 11:42:05 +02:00
James R
a1502046cf
Merge remote-tracking branch 'origin/master' into resume
2020-04-30 09:32:40 -07:00
Monster Iestyn
edfbd799db
Merge branch 'next' into netarchive-cleanup
2020-04-29 15:27:07 +01:00
Sally Cochenour
174a76f7e8
Merge branch 'master' into pet-robo
2020-04-28 21:10:16 -04:00
Sally Cochenour
fb68e4f164
Merge branch 'master' into pet-robo
2020-04-28 20:20:05 -04:00
MascaraSnake
8e5646d708
Replace P_FindLineFromLineTag with P_FindLineFromTag
2020-04-27 14:34:42 +02:00
MascaraSnake
c2cf8d57d0
Remove P_FindSectorFromLineTag
2020-04-27 14:31:37 +02:00
MascaraSnake
398ee65646
Store "no bosses" setting for lasers in thinker instead of checking sourceline.
2020-04-27 13:09:57 +02:00
MascaraSnake
0dbcd8766b
Pass thwomp settings to P_AddThwompThinker
2020-04-27 13:01:31 +02:00
MascaraSnake
40d0fb714d
Store tag instead of sourceline in raise thinker
2020-04-27 12:54:08 +02:00
MascaraSnake
0b38dae561
Make P_AddRaiseThinker more configurable via function parameters (needed for UDMF)
2020-04-27 11:19:07 +02:00
MascaraSnake
ee2ee674d9
Deprecate the camera scanner effect and print a warning when it's used
2020-04-26 18:42:31 +02:00
Monster Iestyn
1e1cd04bdf
whoops the sequel
2020-04-25 16:53:52 +01:00
Monster Iestyn
b429de12f4
whoops
2020-04-25 16:52:11 +01:00
Nev3r
dbf2b9c0f0
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
5c9edcb751
Merge branch 'next' into udmf-next
2020-04-25 08:19:26 +02:00
MascaraSnake
dbebcc8466
Remove a line I overlooked in the thinker cleanup branch
2020-04-25 08:18:48 +02:00
James R
48b7c75e47
Why is this still here
2020-04-24 20:39:54 -07:00
James R
4b2c13da0c
Merge remote-tracking branch 'origin/master' into fof-things-suck
2020-04-24 20:36:30 -07:00
Monster Iestyn
d06d55e2ae
created P_GetFFloorID to get an "ID" of an FOF in its target sector (an opposite to P_GetFFloorByID you could say!), rewrote floor/ceiling rover archiving code to use both P_GetFFloorID and P_GetFFloorByID
2020-04-24 22:29:41 +01:00
MascaraSnake
d2e21afaf1
Merge branch 'next' into udmf-next
...
# Conflicts:
# src/p_mobj.c
# src/r_segs.c
2020-04-24 21:15:53 +02:00
Monster Iestyn
f26e8f3df7
Merge branch 'thinker-cleanup' into 'next'
...
Plane movement thinker cleanup
See merge request STJr/SRB2!880
2020-04-24 14:30:52 -04:00
