Louis-Antoine
74fa35221d
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup
...
# Conflicts:
# src/hardware/hw_main.c
# src/p_spec.c
2020-05-18 16:14:05 +02:00
MascaraSnake
42e6d1a593
Merge branch 'fof-cleanup' into 'next'
...
FOF cleanup
See merge request STJr/SRB2!910
2020-05-17 02:30:16 -04:00
MascaraSnake
b068a37d14
Merge branch 'udmf-next' into udmf-polyobjects
...
# Conflicts:
# src/p_polyobj.c
2020-05-16 11:18:47 +02:00
MascaraSnake
55aacf6b83
polywaypointdata_t: Turn reverse and continuous into flags
2020-05-16 09:49:30 +02:00
Jaime Passos
c69a4f9ced
Merge remote-tracking branch 'origin/next' into pictureformats
2020-05-15 01:34:54 -03:00
Latapostrophe
fc789790bb
Create a quick P_StartQuake without epicenter/radius support and clean up the grand total of 4 earthquake uses in the code
2020-05-14 17:28:33 +02:00
MascaraSnake
93b6615e61
Store PolyObject waypoint return behavior in an enum
2020-05-13 16:21:47 +02:00
MascaraSnake
9ead3a8b47
Merge branch 'udmf-next' into executordelay
2020-05-13 10:01:41 +02:00
MascaraSnake
c2037391d2
Merge branch 'next' into udmf-next
2020-05-13 10:01:12 +02:00
MascaraSnake
2e9a6afa3e
Merge branch 'udmf-next' into executordelay
...
# Conflicts:
# src/p_spec.c
2020-05-13 09:55:25 +02:00
Sally Coolatta
0038241325
Merge branch 'master' into new-cars-movie
2020-05-12 22:41:37 -04:00
Sally Coolatta
1788d29263
Merge branch 'master' into pet-robo
2020-05-12 22:38:23 -04:00
MascaraSnake
7004d8ca75
Merge branch 'next' into waypoints
2020-05-12 23:51:32 +02:00
MascaraSnake
4c526f6e50
Store waypoints (for zoom tubes, rope hangs, polyobjects) explicitly
2020-05-12 23:50:30 +02:00
Sally Coolatta
15d18640de
Merge remote-tracking branch 'public/master' into merge-12
2020-05-12 03:16:14 -04:00
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
