Commit graph

13911 commits

Author SHA1 Message Date
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
Jaime Ita Passos
3581d06012 Fix frame blend flags not working with 3D models 2022-04-08 16:01:41 -03:00
GoldenTails
b7711b2b97 Pass argument list directly to functions that use them; quote arguments when used. 2022-04-04 20:02:30 -05:00
GoldenTails
a614865d35 Make comptime.sh conform to POSIX and less redundant, among other improvements
- Shebang now directly calls /bin/sh
- Improved indenting within the comprevision() function
- Quoted several strings to prevent possible argument splitting
- Replaced archaic backtick command statements with more descriptive `"$(...)"` statements
- Replaced direct references to `test` with more readable, but equivalent `[ ... ]` statements
- Replaced the ${str:0:8} bashism with an equivalent statement using POSIX cut
- Moved redundant definitions of the comptime.h body to a single function that takes arguments
2022-04-04 20:02:30 -05:00
GoldenTails
9bfc82a14b Prevent comptime.* from failing compilation 2022-04-04 20:02:30 -05:00
Lach
b1c0dd43cd Merge branch 'fix-paper-roll' into 'next'
Fix papersprites being rotated incorrectly in Software when viewing them on the flipped side

See merge request STJr/SRB2!1770
2022-03-28 09:45:55 +00:00
SteelT
0da3064b10 Only set default skin/color when possible 2022-03-22 13:17:05 -04:00
SteelT
61b0c24cad Fix "unknown command" not being printed on dedicated 2022-03-22 13:09:29 -04:00
Sally Coolatta
8c62a0d640 Fix papersprites being rotated incorrectly in Software when viewing them on the flipped side 2022-03-22 05:53:21 -04:00
sphere
55854410ac Merge branch 'line-angle' into 'next'
Add angle field to linedef_t

See merge request STJr/SRB2!1602
2022-03-22 09:09:40 +00:00
sphere
563ae7f7ac Merge branch 'hangster-fix' into 'next'
Prevent Hangsters from sliding across the ceiling

Closes #787

See merge request STJr/SRB2!1766
2022-03-22 08:58:46 +00:00
sphere
2b9af0ff24 Merge branch 'unsteal-ideya-spheres' into 'next'
Fix Ideya Capture sometimes stealing extra spheres

See merge request STJr/SRB2!1768
2022-03-21 22:53:06 +00:00
sphere
a0aebb2ed0 Merge branch 'fast-r-load-textures' into 'next'
Do not reload every texture when adding a wad

See merge request STJr/SRB2!1725
2022-03-21 22:41:04 +00:00
sphere
7ec7b2699f Merge branch 'floorsprite-and-shadow-fake-planes-fix' into 'next'
Drop shadow fake floor/ceiling fix

See merge request STJr/SRB2!1638
2022-03-21 22:40:25 +00:00
Lactozilla
4f9ac9edb8 Drop shadow fake floor/ceiling fix 2022-03-21 22:40:24 +00:00
sphere
e997254136 Merge branch 'minus-fixes' into 'next'
Fix Minus & debris' reverse gravity behavior

See merge request STJr/SRB2!1764
2022-03-21 21:59:32 +00:00
sphere
20b73dedfe Merge branch 'multimare-grades' into 'next'
Show overall grade emblem requirement of a multi-mare NiGHTS stage in SP pause menu

Closes #71

See merge request STJr/SRB2!1762
2022-03-21 21:58:54 +00:00
sphere
1cd46c2208 Merge branch 'shadowscream' into 'next'
Remove drop shadow from badnik explosions, give drop shadows to Metal and flickies

Closes #218

See merge request STJr/SRB2!1761
2022-03-21 21:58:32 +00:00
sphere
7b6e4eb5fc Merge branch 'fullbright-ivsp' into 'next'
Make S_IVSP and  S_THUNDERCOIN_SPARK fullbright

See merge request STJr/SRB2!1755
2022-03-21 21:58:14 +00:00
sphere
e063084960 Merge branch 'myformerself' into 'next'
Make P_SpawnGhostMobj ghosts properly copy spritestuff2 (!1257) variables

See merge request STJr/SRB2!1741
2022-03-21 21:57:17 +00:00
sphere
c0a21ccbf3 Merge branch 'levelplatternames' into 'next'
Level platter name improvements

See merge request STJr/SRB2!1730
2022-03-21 21:57:03 +00:00
Zwip-Zwap Zapony
7fdebdcdb9 Suggested optimization 2022-03-20 13:18:22 +01:00
Zwip-Zwap Zapony
bca90893d2 Fix Ideya Capture sometimes stealing extra spheres
Also clean up redundant "startingspheres" variable
2022-03-20 09:52:47 +01:00
MascaraSnake
a78e4e553c Merge branch 'next' into udmf-fofs-mkii 2022-03-18 07:29:02 +01:00
spherallic
9769ad48e0 Prevent Hangsters from sliding across the ceiling. 2022-03-15 13:12:56 +01:00
spherallic
9ef2e7fc11 Change "ding" sound's singularity. 2022-03-13 22:05:17 +01:00
spherallic
113a3bdbb9 Replace magic numbers in sound info by actual SF_ flags 2022-03-13 18:58:34 +01:00
spherallic
29892a5f0c Update README.txt again 2022-03-13 14:22:22 +01:00
sphere
fd8deac385 Merge branch 'larg' into 'master'
Fix typo in linux-only compilation flag

See merge request STJr/SRB2!1759
2022-03-13 12:37:58 +00:00
sphere
5b650bc99d Merge branch 'diddy-kong' into 'master'
Remove MODID check from hooklib to fix compile issue (resolves #809)

See merge request STJr/SRB2!1758
2022-03-13 12:37:52 +00:00
spherallic
65d47ba355 Update README.txt 2022-03-13 13:33:46 +01:00
spherallic
bd2d763bd0 Fix Minus & debris behavior in reverse gravity. 2022-03-13 12:34:17 +01:00
spherallic
c782e81700 Give MT_METALSONIC_RACE a drop shadow & removed unused vars. 2022-03-12 17:44:37 +01:00
SteelT
3eaae066ef Show overall grade emblem requirement of a multi-mare NiGHTS stage in SP pause menu
Fixes #71
2022-03-08 21:06:01 -05:00
spherallic
6ef7221e38 A few drop shadow-related additions:
- Added A_SetShadowScale
- Added A_ShadowScream which combines the above with A_Scream, used for 
badnik explosions
- Gave flickies drop shadows
2022-03-09 00:49:24 +01:00
spherallic
50330c746b Merge branch 'next' into fast-r-load-textures 2022-03-08 22:11:16 +01:00
katsy
b161cb4588 e 2022-03-08 01:06:01 +00:00
katsy
86336d6bed remove MODID check from hooklib to fix compile issue 2022-03-07 18:33:15 -06:00
Sally Coolatta
c0a2d31a22 Merge remote-tracking branch 'upstream/2210-release' into refresh-spr2 2022-03-07 13:09:06 -05:00