SMS Alfredo
ebdc36f56b
Merge branch 'next' into awayview-fix
2023-06-30 16:13:15 -05:00
SMS Alfredo
aa43aa7c8c
Call P_ResetCamera Upon Switching To/From an Away View Camera
2023-06-03 15:43:58 -05:00
Sally Coolatta
29f55471dd
Fix instances reverted to old unlocked variable
2023-06-02 16:06:50 -04:00
Sally Coolatta
49fa46d80e
Online emblems
...
Currently, emblems share with everyone. Will add an option to toggle this.
2023-06-02 16:06:43 -04:00
MascaraSnake
e4933b3e94
Merge branch 'allow-modified-saving' into 'next'
...
[SUGOI] Allow saving in modified games.
See merge request STJr/SRB2!1749
2023-05-24 05:04:26 +00:00
sphere
3f499178b0
Merge branch 'forceverticalflipflag' into 'next'
...
Add flag to action 433 to force MFE_VERTICALFLIP
See merge request STJr/SRB2!1948
2023-03-31 16:13:23 +00:00
spherallic
1470d099e3
Update copyright year & credits
2023-03-31 14:53:31 +02:00
spherallic
540c5d6cc0
Add flag to action 433 to force MFE_VERTICALFLIP
2023-03-20 15:46:15 +01:00
MascaraSnake
b5c3b30f13
Merge branch 'fix-wnon-literal-null-conversion-and-wconstant-conversion' into 'next'
...
Fix -Wnon-literal-null-conversion and -Wconstant-conversion warnings
See merge request STJr/SRB2!1929
2023-03-02 09:12:24 +00:00
sphere
51d32f87ba
Merge branch 'deprecation-warnings' into 'next'
...
Deprecated map effect stuff
Closes #956
See merge request STJr/SRB2!1933
2023-02-28 13:59:30 +00:00
MascaraSnake
bb9e7045c5
Fix wrong flag being checked in P_ProcessTeamBase
2023-02-25 15:43:51 +01:00
MascaraSnake
aba57612d5
-Only print deprecated map effect warnings once on map load
...
-Add missing unsupported effect warnings to P_WriteTextmap
-Apply spikes MSF_TRIGGERSPECIAL_TOUCH hack in UDMF too
2023-02-19 07:27:16 +01:00
MascaraSnake
02fa860c46
Merge branch 'thingonspecial3dfloor' into 'next'
...
Re-add P_ThingOnSpecial3DFloor for Lua backwards compatibility
See merge request STJr/SRB2!1905
2023-01-28 06:32:42 +00:00
Jaime Ita Passos
b64dac714f
Fix -Wnon-literal-null-conversion and -Wconstant-conversion warnings
2023-01-28 00:18:55 -03:00
MascaraSnake
e472c551e1
Re-add P_ThingOnSpecial3DFloor for Lua backwards compatibility
2023-01-01 11:31:44 +01:00
MascaraSnake
937127e987
Disable exit sectors in non-NiGHTS special stages because they interfere with the pits
2022-12-27 16:49:52 +01:00
MascaraSnake
2cc7fe2bf0
Fix callcount typo
2022-12-04 09:14:55 +01:00
Sally Coolatta
5103253e0b
Allow unlockable executors again
2022-11-16 11:14:33 -05:00
Sally Coolatta
1b43cdddd5
Allow saving in modified games.
2022-11-16 11:14:29 -05:00
Eidolon
9a88c9ea47
Merge branch 'gravityflipping' into 'next'
...
Gravity flip bugfixes & additions
Closes #378 , #661 , and #430
See merge request STJr/SRB2!1808
2022-11-12 23:33:07 +00:00
Eidolon
c489b8e2fe
Merge branch 'udmf-splat-cut' into 'next'
...
Cut inner walls of splat FOFs
Closes #891
See merge request STJr/SRB2!1829
2022-11-11 23:03:08 -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
MascaraSnake
a5a7b20d95
Add_Scroller: Don't call IsSector3DBlock if affectee is a side
2022-11-06 07:48:05 +01:00
sphere
fa4394b3ad
Merge branch 'udmf-conveyor-flip' into 'next'
...
Automatically apply flipspecial to upside-down FOF conveyor belts
See merge request STJr/SRB2!1827
2022-10-28 09:11:18 +00:00
sphere
31a6b7b365
Merge branch 'improve-439-again' into 'next'
...
Allow linedef action 439 to set different back-side textures (again)
See merge request STJr/SRB2!1812
2022-10-10 16:21:06 +00:00
MascaraSnake
a6a1b0a720
Refactor linedef type 439 a little
2022-10-10 07:39:34 +02:00
spherallic
81b1526c2c
Check the correct backside for textures, then go back to front textures.
2022-10-09 18:53:34 +02:00
MascaraSnake
496bd79f9b
Cut inner walls of splat FOFs
2022-10-09 16:56:25 +02:00
MascaraSnake
979bc471ba
Conveyor belts: Only apply flipspecial if it's a 3D floor
2022-10-09 15:27:07 +02:00
MascaraSnake
2afea367cb
Apply flipspecial automatically to ceiling carry effects
2022-10-08 11:06:14 +02:00
MascaraSnake
d2f2c71685
Don't require floor touch for currents in non-FOF sectors unless it's a horizontal currents in binary (because backwards compatibility)
2022-10-08 10:20:20 +02:00
spherallic
73e2d8d1bc
Fix CircleCI build error
2022-10-04 10:38:57 +02:00
spherallic
9da90cef8e
Merge branch 'next' into gravityflipping
2022-09-30 21:27:32 +02:00
sphere
70161ff52e
Merge branch 'fancarry' into 'next'
...
Add carry type to fans (with fixed merge conflicts)
See merge request STJr/SRB2!1809
2022-09-30 13:07:19 +00:00
spherallic
f37d466343
Merge branch 'next' into gravityflipping
2022-09-29 19:27:00 +02:00
sphere
ac7f983c8a
Merge branch 'exclusivescrollfix' into 'next'
...
Fix 'exclusive' flag on plane scrollers being inverted
Closes #885
See merge request STJr/SRB2!1813
2022-09-28 21:03:56 +00:00
spherallic
5f62af05f1
Fix 'exclusive' flag on plane scrollers being inverted
2022-09-18 11:21:00 +02:00
spherallic
cd85240ec3
Add toggle for action 439 to use backside textures
2022-09-17 11:40:44 +02:00
spherallic
872a2001c8
Add new linedef executor trigger that checks gravity
2022-09-17 02:14:25 +02:00
spherallic
b7dd3ac4bf
Restore CR_FAN application for fan sectors
2022-09-16 22:56:26 +02:00
spherallic
0ee81a1cc3
Support gravity override flag in UDMF
2022-09-11 19:46:57 +02:00
spherallic
1f73c9cf99
Add flag to per-sector gravity for overriding MF2_OBJECTFLIP
2022-09-11 16:15:50 +02:00
spherallic
f0adc71f9b
Add flag to invert current gravity to gravity flip executor
2022-09-08 16:56:35 +02:00
MascaraSnake
ec119eac2f
Merge branch 'next' into udmf-fof-flags
2022-07-31 13:27:03 +02:00
MascaraSnake
8d4baace53
Add Lua backwards compatibility for FOF flags
2022-07-31 12:04:42 +02:00
Eidolon
69c5da2720
Merge branch 'next' into uncappedrevengeance
2022-07-15 00:14:27 -05:00
Eidolon
6829e4ae62
Merge branch 'sp-secfset-update-triggertag' into 'next'
...
Update triggertag on sector tag fset
Closes #865
See merge request STJr/SRB2!1789
2022-05-31 21:15:56 +00:00
MascaraSnake
af7c0f4d6c
Allow linedef types 409/410 to change the trigger tag
2022-05-29 12:24:14 +02:00
Eidolon
f94c25c05c
Change UDMF wall scroll scale to SCROLL_SHIFT
...
UDMF special 502 now must scale arg 2 and 3 in the same scale
space as line length scrolling in binary format. This
is to ensure compatibility with the binary format.
Fixes STJr/SRB2#862
Co-Authored-By: MascaraSnake <jonassauer27@gmail.com>
2022-05-29 02:02:20 -05: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