Commit graph

15838 commits

Author SHA1 Message Date
spherallic
007bd6705e Merge branch 'fruits-clipper' of git.do.srb2.org:STJr/SRB2 into fruits-clipper 2024-02-04 22:43:32 +01:00
spherallic
1aea6f8f35 Merge branch 'maretimers' of git.do.srb2.org:STJr/SRB2 into maretimers 2024-02-04 22:41:18 +01:00
spherallic
8f2f70aeec Merge branch 'next' into maretimers 2024-02-04 22:39:25 +01:00
sphere
c91fc082f9 Merge branch 'oldspecnightsrecordsfix' into 'next'
Fix hud_nightsrecords in old (multiplayer) special stages

See merge request STJr/SRB2!2191
2024-02-04 21:35:36 +00:00
sphere
fd92193f7e Merge branch 'fix-slope-plane-distortion' into 'next'
Fix equation plane distortion

See merge request STJr/SRB2!2283
2024-02-04 21:33:17 +00:00
sphere
233949789e Merge branch 'unlock-trigger-fix' into 'next'
Update unlockables before level load executors

See merge request STJr/SRB2!2289
2024-02-04 21:33:02 +00:00
Sally Coolatta
c6a68f69ce Update unlockables before level load executors
Another issue that seems related to #1122
2024-02-04 01:22:11 -05:00
Sal
3bd53b6ca3 Merge branch 'fix-ingame-join' into 'next'
Fix netgame joining

See merge request STJr/SRB2!2288
2024-02-04 06:07:39 +00:00
Lactozilla
053a9fc2e2 Fix netgame joining
Regression introduced by !2279.
2024-02-04 02:43:28 -03:00
Lactozilla
235bf724f0 Merge branch 'fix-sw-polyobject-interpolation' into 'next'
Interpolate polyobjects properly for the software renderer (resolves #950)

Closes #950

See merge request STJr/SRB2!2284
2024-02-02 00:08:06 +00:00
Alug
afa9b32408 compiler complains 2024-02-01 19:13:13 +01:00
Alug
e892cc1d4b Fix FOFs with transferline flag and many linedefs randomly crashing
linenum could go out of bounds if you use more than 4 linedefs for such setup, hence making the game unable to retrieve textures and therefore crashing the games sometimes

many thanks to indev for helping me figuring this one out c:
2024-02-01 18:57:55 +01:00
MIDIMan
5bbc1e323a Merge branch SRB2:next into disable-powerup-hud 2024-01-31 19:34:05 +00:00
sphere
bae687a1b9 Merge branch 'fix-slope-convex-sectors' into 'next'
Fix physics quirkiness on slopes with convex sectors

See merge request STJr/SRB2!2250
2024-01-30 22:38:56 +00:00
Lactozilla
41d9601018 Interpolate polyobjects properly for the software renderer 2024-01-30 18:57:24 -03:00
Lactozilla
c7c13e3372 Recalculate slope vectors at render time 2024-01-30 14:29:38 -03:00
Lactozilla
b15fca4d66 Fix line slopes 2024-01-30 14:05:01 -03:00
Lactozilla
1088310ae8 Replace FIXED_TO_DOUBLE and DOUBLE_TO_FIXED with FixedToDouble and DoubleToFixed 2024-01-30 00:00:35 -03:00
Lactozilla
8847cf77b4 Minor changes 2024-01-29 23:55:12 -03:00
Lactozilla
6180ddde32 Fix slope plane distortion 2024-01-29 22:08:22 -03:00
sphere
4649f3a46b Merge branch '1173-next-moved-upnp-to-it-s-own-thread' into 'next'
Resolve "[NEXT] moved UPnP to it's own thread"

Closes #1173

See merge request STJr/SRB2!2263
2024-01-29 13:59:00 +00:00
sphere
225f085937 Merge branch 'optimize-batch-sorting' into 'next'
Optimize polygon sorting on batch renderer

See merge request STJr/SRB2!2253
2024-01-29 13:58:13 +00:00
sphere
4407b70fbb Merge branch 'fix-ban-corruption' into 'next'
Fix bans by remote admins corrupting banlist

See merge request STJr/SRB2!2266
2024-01-29 13:57:09 +00:00
sphere
770bc934b1 Merge branch 'visit-unlockables-fix' into 'next'
Update & save unlockables when visiting a new map

Closes #1122

See merge request STJr/SRB2!2279
2024-01-29 13:55:43 +00:00
sphere
9e8020276f Merge branch 'fix-3d-floor-skewtd' into 'next'
Fix 3D floor texture skewing

See merge request STJr/SRB2!2281
2024-01-29 13:55:40 +00:00
sphere
5a00859baa Merge branch 'bouncy-nights-fixes' into 'next'
General NiGHTS Fixes

See merge request STJr/SRB2!2199
2024-01-29 13:55:25 +00:00
sphere
f6cd5ab13e Merge branch 'fix-removed-viewmobj-segfault' into 'next'
Fix segfault when setting up view frame for a removed mobj

See merge request STJr/SRB2!2270
2024-01-29 13:53:59 +00:00
Lactozilla
1a63e72f5c Fix #1183
- Fixed an incorrect access of skincolor_remaps[] in R_GetTranslationRemap
- Fixed R_GetTranslationForThing not being able to apply a translation over TC_RAINBOW or TC_DASHMODE
- OpenGL: Fixed MF2_LINKDRAW sprites possibly not using the correct translation
2024-01-29 04:32:52 -03:00
Lactozilla
61701c3c53 Fix 3D floor texture skewing 2024-01-29 03:54:15 -03:00
MIDIMan
ccb2785c44 Merge branch SRB2:next into disable-powerup-hud 2024-01-28 17:27:32 +00:00
Sally Coolatta
1e04896d3f Update & save unlockables when visiting a new map
Resolves #1122
2024-01-26 15:37:38 -05:00
Alam Ed Arias
ebe3262d74 Update .gitlab-ci.yml file
Try to make a batocera:amd64 build
2024-01-24 19:08:24 +00:00
Alam Ed Arias
abbb3a4489 Update .gitlab-ci.yml file
keep --verbose for Alpine builds
2024-01-24 03:08:20 +00:00
Alam Ed Arias
083176f1c2 Update .gitlab-ci.yml file
OK, very old version of ccache do not have --show-log-stats, just return code 0
2024-01-24 02:51:14 +00:00
Alam Ed Arias
d1de54dc28 Update .gitlab-ci.yml file
Old version of ccache do not have --verbose, add a fallback for that
2024-01-24 02:43:35 +00:00
Alam Ed Arias
4d0b37223f Update .gitlab-ci.yml file
Add a Debian old build as well, just for ARM64, with no GME support
2024-01-24 02:13:40 +00:00
Alam Ed Arias
dcd68addb6 Update .gitlab-ci.yml file
Add a Debian oldstable build, just with no GME support
2024-01-24 02:01:00 +00:00
Lactozilla
36e64cb683 Merge branch 'fix-1177' into 'next'
Fix #1177

Closes #1177

See merge request STJr/SRB2!2268
2024-01-21 23:57:33 +00:00
Lactozilla
0739c310b3 Merge branch 'fixes-for-2190' into 'next'
Fixes for !2190

See merge request STJr/SRB2!2273
2024-01-21 23:54:22 +00:00
Lactozilla
7cabf43e85 Merge branch 'lua-colorlib-get-sector-translation' into 'next'
Add v.getSectorColormap and P_GetSectorLightLevelAt

See merge request STJr/SRB2!2230
2024-01-21 23:54:08 +00:00
Lactozilla
5ef55cc6af Merge branch 'improve-download-refuse-message' into 'next'
Improve addon download refusal messages

See merge request STJr/SRB2!2153
2024-01-21 23:53:57 +00:00
Lactozilla
8cff33e681 Changes:
Ported skincolor cache management from the secondcolor branch
Adjusted R_GetTranslationRemap to use a similar caching scheme
Made sure that if a skincolor was updated, then related translations would be rebuilt
2024-01-20 01:47:03 -03:00
Lactozilla
9851ec56cf Correct comment 2024-01-19 21:16:20 -03:00
Lactozilla
712c274988 Add third argument to getColormap that accepts a translation name
Delete 'translations' Lua global
2024-01-19 20:50:36 -03:00
Lactozilla
4e818b87fd Support combinations of skincolors and translations 2024-01-19 20:39:28 -03:00
Hanicef
092ae9bf4d Allow ban masks to be specified for banip 2024-01-20 00:22:26 +01:00
Lactozilla
4b057f84ec Support compound translations 2024-01-19 19:35:29 -03:00
Lactozilla
6d1908c93e Changes:
Moved string conversion helpers into m_misc.c
Adapted parser to check for '"'
Check if tokenizer returned NULL
2024-01-19 17:01:27 -03:00
Lactozilla
8bbc512b14 Tokenizer changes:
Capture '"' characters
Capture ';' tokens
Implement tracking of the current line
2024-01-19 16:40:32 -03:00
Hanicef
820a70b854 Fix segfault when setting up view frame for a removed mobj 2024-01-19 00:00:53 +01:00