Commit graph

11727 commits

Author SHA1 Message Date
spherallic
78eae609cc Start bustable FOF sounds at the correct height 2022-09-26 23:51:51 +02:00
sphere
cfdbc8f44a Merge branch 'vissprite-color' into 'next'
Allow objects with MF2_LINKDRAW to use their own color

See merge request STJr/SRB2!1576
2022-09-17 07:32:51 +00:00
sphere
aaae90a5e3 Merge branch 'soundflags' into 'next'
Use sound flags for sfxinfo, fix SF_TOTALLYSINGLE checks

See merge request STJr/SRB2!1765
2022-09-16 22:31:51 +00:00
spherallic
efc0f7a758 Correct SF_TOTALLYSINGLE checks. 2022-09-16 23:59:19 +02:00
spherallic
ef35084d95 Merge remote-tracking branch 'public/master' into next 2022-09-08 16:52:54 +02:00
sphere
892ffbe01b Merge branch 'stop-wuse-after-free' into 'master'
Stop -Wuse-after-free warnings

See merge request STJr/SRB2!1805
2022-09-08 14:51:17 +00:00
sphere
65fa93c4f7 Merge branch 'skin-set-fix' into 'next'
Only set default skin/color when possible

See merge request STJr/SRB2!1772
2022-09-06 15:19:18 +00:00
sphere
fc1cc9ffe5 Merge branch 'unknown-command-dedicated-print' into 'next'
Fix "unknown command" not being printed on dedicated

See merge request STJr/SRB2!1771
2022-09-06 15:19:11 +00:00
sphere
2d16ccf176 Merge branch 'fixmapconditions' into 'next'
Fix map number checks when reading unlockable conditions

Closes #882

See merge request STJr/SRB2!1807
2022-09-06 08:05:35 +00:00
sphere
5d7d19d2bf Merge branch 'more-whitelisting' into 'next'
Add more menu graphics to the whitelist.

Closes #765

See merge request STJr/SRB2!1731
2022-09-06 07:40:56 +00:00
sphere
9e2d8f059d Merge branch 'write-textmap-bruh' into 'next'
Fix size_t compiler warnings in P_WriteTextmap

See merge request STJr/SRB2!1785
2022-09-05 21:54:20 +00:00
sphere
d67e88ee0c Merge branch 'fix-parenttriestosleep-desc' into 'next'
Fix description of A_ParentTriesToSleep

See merge request STJr/SRB2!1784
2022-09-05 21:49:34 +00:00
spherallic
508536e3d7 Fix map number checks when reading unlockable conditions. 2022-09-05 20:41:09 +02:00
Jaime Ita Passos
c27d7f916f Stop -Wuse-after-free warnings 2022-08-11 04:30:03 -03:00
Jaime Ita Passos
07011a7044 Stop -Waddress warnings 2022-08-11 04:24:24 -03:00
sphere
c65851d17c Merge branch 'autobrake-fix' into 'next'
Make autobrake account for scale

See merge request STJr/SRB2!1782
2022-07-29 09:33:29 +00:00
sphere
f8d2297e07 Merge branch 'colon-parenthesis' into 'next'
Fix semibright/fulldark frame flags not working with 3D models

See merge request STJr/SRB2!1779
2022-07-29 09:33:20 +00:00
Eidolon
955259d5c1 Remove win32 backend-specific files 2022-07-17 19:34:19 -05:00
Eidolon
0e5b5bf5d9 cmake: Set plist properties for macOS bundle
yay icon
2022-07-14 23:57:53 -05:00
Eidolon
66ab96363c cmake: Fix rpath issues in macOS bundle fixup 2022-07-14 23:32:34 -05:00
Eidolon
a3ffd04223 cmake: Adjust linkage for macOS
This properly links dylibs set during build instead of expecting
the libraries to be in the system path.
2022-07-14 18:37:17 -05:00
Eidolon
af8bc3af7e Merge branch 'udmf-plane-displacement-fix' into 'next'
UDMF conversion: Fix noclimb flag not being applied to linedef types 66-68

Closes #868

See merge request STJr/SRB2!1790
2022-06-05 23:13:04 +00:00
MascaraSnake
c9536ff4dc Fix copypaste error in P_GetMobjGravity 2022-06-04 17:46:00 +02:00
MascaraSnake
9971592dc6 UDMF conversion: Fix noclimb flag not being applied to linedef types 66-68 2022-06-04 11:14:31 +02: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
MascaraSnake
37da148996 Update triggertag on Tag_SectorFSet if in binary map and the sector has a trigger special 2022-05-29 11:56:30 +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
Zwip-Zwap Zapony
d10ca13eb9 Apply 1 suggestion(s) to 1 file(s) 2022-05-28 12:18:09 +00:00
MascaraSnake
e1a5f48c51 Fix even more size_t printfs 2022-05-28 14:08:19 +02:00
MascaraSnake
fd2a097c34 Fix more size_t mishaps 2022-05-28 10:29:35 +02:00
Eidolon
35a5c82c42 Update triggertag on sector tag fset
Fixes STJr/SRB2#865
2022-05-27 13:36:55 -05:00
MascaraSnake
28bdd7ef00 Fix size_t compiler warnings in P_WriteTextmap 2022-05-01 19:27:10 +02:00
ashi
c3001ac42a Fix description of A_ParentTriesToSleep 2022-04-30 14:21:51 +00:00
aiire
c4bb90fb0c do the thing 2022-04-21 16:55:57 +00:00
MascaraSnake
5fbe5189ce Merge branch 'udmf-sector-fields' into udmf-full 2022-04-20 21:01:52 +02:00
MascaraSnake
faa7d89e3e Merge branch 'udmf-more-linedef-types' into udmf-sector-fields 2022-04-20 21:01:16 +02:00
MascaraSnake
5660d896e6 Merge branch 'udmf-thing-types' into udmf-more-linedef-types 2022-04-20 21:00:44 +02:00
MascaraSnake
54640a8664 Merge branch 'udmf-executor-triggers' into udmf-thing-types
# Conflicts:
#	extras/conf/udb/Includes/SRB222_things.cfg
2022-04-20 20:59:55 +02:00
MascaraSnake
465327288c Fix int type error 2022-04-20 20:55:13 +02:00
MascaraSnake
39b7fb9ff8 Merge commit 'd624ee25' into udmf-thing-types
# Conflicts:
#	src/p_mobj.c
#	src/p_spec.c
2022-04-20 20:41:46 +02:00
MascaraSnake
9815d40c20 Adapt tutorial plant to UDMF 2022-04-20 20:06:08 +02:00
MascaraSnake
f76b104c4a Merge commit 'c7050671' into udmf-thing-types 2022-04-20 19:42:03 +02:00
MascaraSnake
36bf8b1a77 Merge branch 'udmf-linedef-executors' into udmf-executor-triggers 2022-04-19 22:33:53 +02:00
MascaraSnake
863b1e125a Merge branch 'udmf-lighting' into udmf-linedef-executors
# Conflicts:
#	src/p_spec.c
2022-04-19 22:31:57 +02:00
MascaraSnake
2e56c3de35 Merge branch 'udmf-polyobjects' into udmf-lighting 2022-04-19 22:18:30 +02:00
MascaraSnake
f672b1b940 Merge branch 'udmf-scrollers' into udmf-polyobjects
# Conflicts:
#	src/p_spec.c
2022-04-19 22:17:28 +02:00
MascaraSnake
f164809618 Merge branch 'udmf-plane-linedefs' into udmf-scrollers 2022-04-19 22:06:32 +02:00
MascaraSnake
36692483df Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs
# Conflicts:
#	src/p_inter.c
2022-04-19 22:04:04 +02:00
MascaraSnake
0b4bbacec0 Merge branch 'next' into udmf-fofs-mkii 2022-04-19 21:59:31 +02:00