Commit graph

13174 commits

Author SHA1 Message Date
spherallic
289c8ec6e4 Merge branch 'next' into font_drawer 2022-09-05 17:00:29 +02: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
824bfa6f0e Merge branch 'delete-system32' into 'next'
Purge a bunch of legacy/unused stuff

See merge request STJr/SRB2!1801
2022-07-23 17:53:49 +00:00
Eidolon
c7e7f5c396 Remove FMOD files
Aren't used and definitely should not be in here anymore
2022-07-17 20:01:43 -05:00
Eidolon
22eceb403a Remove legacy SRB2Launcher 2022-07-17 19:56:08 -05:00
Eidolon
a4ef2133ab Remove old master server PHP scripts
Blast from the past, buuuut let's trim the fat here too.
2022-07-17 19:54:12 -05:00
Eidolon
292b8d1470 Remove unmaintained SOCEdit
Written in VB6. Superceded by better tools and also probably not even
buildable anymore.
2022-07-17 19:52:41 -05:00
Eidolon
af1485075b Remove old SDL 1.2 patches
SRB2 no longer works with 1.2 or Dreamcast so these are irrelevant
2022-07-17 19:50:58 -05:00
Eidolon
405c2101c2 Remove lumpmod tool
Superceded by far superior tools
2022-07-17 19:49:58 -05:00
Eidolon
7a5f1dec9e Remove DJGPP GDB stub
Once more, SRB2 no longer works on DOS so this is irrelevant
2022-07-17 19:48:49 -05:00
Eidolon
f0cd404234 Remove unused djgpp patch
SRB2 no longer works on DOS so this is irrelevant
2022-07-17 19:48:09 -05:00
Eidolon
0ab8576ddb Remove legacy SRB2Updater tool
Also unsupported and nonfunctional
2022-07-17 19:40:53 -05:00
Eidolon
2ff3035746 Remove SRB2 Music Player
This thing is ancient history and also depends on FMOD.
2022-07-17 19:37:46 -05:00
Eidolon
955259d5c1 Remove win32 backend-specific files 2022-07-17 19:34:19 -05:00
Eidolon
4fccd15f53 Merge branch 'cmake-mac-linkage' into 'next'
cmake: Various macOS build/package improvements

See merge request STJr/SRB2!1800
2022-07-15 05:02:36 +00: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
Eidolon
66bda92ac1 Merge branch 'udmf-gravity-fix' into 'next'
Fix copypaste error in P_GetMobjGravity

Closes #867

See merge request STJr/SRB2!1791
2022-06-05 23:09:42 +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
44764cb1a4 Merge branch 'sp-scrside-accel' into 'next'
Change UDMF wall scroll scale to SCROLL_SHIFT

Closes #862

See merge request STJr/SRB2!1788
2022-05-29 07:07:17 +00: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
35a5c82c42 Update triggertag on sector tag fset
Fixes STJr/SRB2#865
2022-05-27 13:36:55 -05:00
Nev3r
0953acca15 Merge branch 'udmf-linedef-executors' into 'next'
UDMF: Linedef executors

See merge request STJr/SRB2!1625
2022-05-01 07:45:43 +00:00
Nev3r
997f799383 Merge branch 'udmf-full' into 'next'
UDMF: The whole thing

See merge request STJr/SRB2!1714
2022-05-01 07:36:12 +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
d400a7186a Fix int type error 2022-04-20 20:57:16 +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
spherallic
5bdfb7ffc1 Fix semibright/fulldark frame flags for models 2022-04-09 16:42:54 +02:00
sphere
d9799540c6 Merge branch 'ogl-model-blend-flags-fix' into 'next'
Fix frame blend flags not working with 3D models

See merge request STJr/SRB2!1778
2022-04-09 14:39:59 +00:00