stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-27 19:51:09 +00:00
Code Issues Projects Releases Packages Wiki Activity
14251 commits 175 branches 42 tags 316 MiB
Commit graph

1001 commits

Author SHA1 Message Date
Lactozilla
2b64698c4e Use different default viewpoint heights so that ceiling portals make more sense 2023-08-23 04:34:35 -03:00
Lactozilla
1506909a1f Reimplement sector portals 2023-08-23 04:24:06 -03:00
spherallic
f62c2f4c75 Fix arg # typos for "visible from inside" checks 2023-08-20 17:55:06 +02:00
spherallic
259732cccb Make FOF fades use 0-255 alpha, not 1-256 2023-08-20 17:42:27 +02:00
spherallic
66cc6a5f44 Correct flags for partially intangible FOFs 2023-08-17 19:31:55 +02:00
spherallic
8990b83071 Handle empty/"-" music lump name on music change 2023-08-02 17:05:38 +02:00
Sal
13c30ace2e Merge branch 'lua-texture-offsets-expose' into 'next' 
Exposed floor/ceiling offsets and light reference to Lua.

See merge request STJr/SRB2!1884
 2023-07-24 10:42:07 +00:00
Sal
31d26c6f55 Merge branch 'awayview-fix' into 'next' 
Call P_ResetCamera Upon Switching To/From an Away View Camera

See merge request STJr/SRB2!2011
 2023-07-24 09:15:56 +00:00
SMS Alfredo
66f8908b03 Reset Camera only if a new camera is set / Fix Lua jank with setting awayviewmobj or awayviewtics solo 2023-07-22 20:44:22 -05:00
sphere
9ea387acc0 Merge branch 'plinedefexectutefix' into 'next' 
Don't cancel P_LinedefExecute early

Closes #988

See merge request STJr/SRB2!1944
 2023-07-19 19:40:20 +00:00
sphere
860767aa65 Merge branch 'increasemaxunlockables' into 'next' 
Increase maximum unlockables

Closes #770

See merge request STJr/SRB2!1988
 2023-07-14 22:47:37 +00:00
Ace Lite
2240742720 Merge branch SRB2:next into lua-texture-offsets-expose 2023-07-06 18:35:00 +00:00
spherallic
49528c1558 Remove generalized FOF type (linedef action 260) 2023-07-06 18:11:52 +02:00
SMS Alfredo
ebdc36f56b Merge branch 'next' into awayview-fix 2023-06-30 16:13:15 -05:00
spherallic
d8dd988451 Don't cancel P_LinedefExecute early 2023-06-13 02:01:11 +02:00
spherallic
d9937953ad Fix linedef type 319/320 again 2023-06-13 01:54:49 +02: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
Ace Lite
3217984f55 c-side offset/angle variable renamed 2022-11-25 23:01:27 +00: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