Commit graph

15875 commits

Author SHA1 Message Date
Lactozilla
4cf9d38fb6 Delete leftover composite texture handling 2024-01-15 02:05:25 -03:00
Lactozilla
861d22fd44 Always generate composite textures with post data 2024-01-15 00:29:21 -03:00
Lactozilla
72b63a1305 Merge branch 'next' into patch-refactor 2024-01-14 22:16:32 -03:00
Logan Aerl Arias
c5bf6d07ed Merge branch 'fix-ipv6-bans-blocking-ipv4' into 'next'
Fix IPv6 bans incorrectly banning IPv4 address

See merge request STJr/SRB2!2265
2024-01-14 20:29:33 +00:00
Hanicef
dff390e197 Fix final edge cases in sector points
Co-authored-by: Zwip-Zwap Zapony <zwipzwapzapony@gmail.com>
2024-01-14 21:07:45 +01:00
Hanicef
4eb514ce71 Fix IPv6 bans incorrectly banning IPv4 address 2024-01-14 19:20:25 +01:00
Hanicef
e8706fa9e8 Check hash instead of each field when batching 2024-01-13 17:53:00 +01:00
Hanicef
ef4f2e71ad Revert "Avoid batching skybox and horizon lines"
This reverts commit fc1e8fb52f88e56c6a32b3e7e643bc1356b507c8.
2024-01-13 17:53:00 +01:00
Gustaf Alhäll
71f326a152 Avoid batching skybox and horizon lines 2024-01-13 17:37:20 +01:00
Gustaf Alhäll
d5fe5586a0 Retain skybox and horizon line order 2024-01-13 17:37:20 +01:00
Gustaf Alhäll
636b3ab954 Optimize polygon sorting on batch renderer 2024-01-13 17:37:20 +01:00
Lactozilla
970a9d65dd Merge branch 'next' into more-sprite2 2024-01-13 03:43:34 -03:00
spherallic
35b6b21562 Clean up NiGHTS attack character code, fix compile issues 2024-01-11 13:18:32 +01:00
sphere
4ae2482283 Merge branch 'character-nightsattack' into 'next'
Draw Character in NiGHTS Attack

See merge request STJr/SRB2!2175
2024-01-11 12:11:54 +00:00
Mari0shi
5a2a24b868 Draw Character in NiGHTS Attack 2024-01-11 12:11:54 +00:00
Logan Aerl Arias
8073ac6520 add mutex locks to UPnP Client code
add mutex locks to UPnP Client code
2024-01-10 16:44:27 -05:00
sphere
154cd8f158 Merge branch 'fix-singlesided-sloped-gl-midtextures' into 'next'
[OpenGL] Fix DSZ2 Wall Bruhs

See merge request STJr/SRB2!2264
2024-01-10 20:33:49 +00:00
Zwip-Zwap Zapony
9d718bc639 Fix single-sided sloped midtextures in OpenGL 2024-01-10 21:26:04 +01:00
Logan Aerl Arias
c9232f4a07 Update i_tcp.c
set upnpc_started to 1 a the end
wrap upnpc_started into a struct
2024-01-10 13:10:39 -05:00
Logan Aerl Arias
ca0b899a54 Moved UPnP startup code to a thread
Moved UPnP startup code to a thread
2024-01-10 12:45:53 -05:00
sphere
c938d7757b Merge branch 'fix-3dfloor-scaling' into 'next'
Fix 3D floor side texture scale when there are multiple on the same line

See merge request STJr/SRB2!2262
2024-01-10 14:41:34 +00:00
Lactozilla
3e34c96165 Fix 3D floor sides not using the correct set of line flags 2024-01-09 14:14:49 -03:00
Lactozilla
28c30a9294 Optimize for when wall_scalex == 1.0 2024-01-08 22:08:50 -03:00
Lactozilla
159307c552 Fix 3D floor side texture scale when there are multiple on the same line 2024-01-08 22:03:31 -03:00
Logan Aerl Arias
1f0c9619dd Merge branch SRB2:next into propercheats 2024-01-08 23:40:56 +00:00
Logan Aerl Arias
4edebbe67f Merge branch 'blockedexposed' into 'next'
Expose P_LineIsBlocking to Lua

See merge request STJr/SRB2!2150
2024-01-08 23:38:11 +00:00
Logan Aerl Arias
f5c3c200b5 Merge branch 'lua-colorlib' into 'next'
Lua colorlib

See merge request STJr/SRB2!2094
2024-01-08 19:40:20 +00:00
Logan Aerl Arias
0781adc3ca Merge branch 'pandoradev' into 'next'
Enable Pandora and Level Select with Devmode / Always allow Level Select if unlocked

See merge request STJr/SRB2!2066
2024-01-08 19:20:23 +00:00
Logan Aerl Arias
03e5edb6f0 Merge branch 'chat_on' into 'next'
Expose chat_on to Lua as chatactive

See merge request STJr/SRB2!2023
2024-01-08 19:13:30 +00:00
Jisk
efb1b491aa Expose chat_on to Lua as chatactive 2024-01-08 19:13:30 +00:00
Lactozilla
0ffcf89c85 Merge branch 'next' into more-sprite2 2024-01-08 02:55:19 -03:00
Lactozilla
f7e20bc381 Merge branch 'next' into custom-map-names 2024-01-08 02:50:43 -03:00
Logan Aerl Arias
845df8f1df Merge branch 'sector-portals' into 'next'
Sector portals

See merge request STJr/SRB2!2139
2024-01-08 03:28:43 +00:00
Logan Aerl Arias
154af01348 Merge branch 'theyseemerollingtheybraking' into 'next'
Fix roll braking assuming player angle is camera angle (resolves #1055)

Closes #1055

See merge request STJr/SRB2!2053
2024-01-08 03:13:57 +00:00
Logan Aerl Arias
be5ca1a4fb lua_infolib.c: replace lua_objlen with luaL_getn in setRamp() 2024-01-07 22:13:09 +00:00
Logan Aerl Arias
4ae7a0e093 LUA mapthing_t checks
add check that LUA can't access fields that don't exist in mapthing_t
2024-01-07 16:21:09 -05:00
Logan Aerl Arias
cb3deaaaac Update lauxlib.h
lauxlib.h: mark luaL_error as a REPORT function
2024-01-07 15:20:32 -05:00
Alam Ed Arias
626ac069f2 Merge branch 'master' into next 2024-01-07 14:22:43 -05:00
Alam Ed Arias
a1308d8aa5 Update .gitlab-ci.yml file
Drop Debian musl jobs
2024-01-07 19:21:30 +00:00
Alam Ed Arias
caaeaef6cc fixup Valgrind warning:
Conditional jump or move depends on uninitialised value(s)
strncpy (vg_replace_strmem.c:599)
MIT_SetCurBackground (m_menu.c:2650)
M_IterateMenuTree (m_menu.c:2581)
M_SetMenuCurBackground (m_menu.c:2790)
F_InitMenuPresValues (f_finale.c:2276)
D_StartTitle (d_main.c:998)
G_Responder (g_game.c:2117)
D_ProcessEvents (d_main.c:282)
Local_Maketic (d_clisrv.c:5297)
NetUpdate (d_clisrv.c:5701)
TryRunTics (d_clisrv.c:5371)
D_SRB2Loop (d_main.c:820)
2024-01-07 13:09:47 -05:00
Alam Ed Arias
5b6c24281d Fixup DEBUGMODE builds
doomdef.h: check if the build system already define our DEBUG code
version.mk: do not fail on our inline functions in DEBUGMODE
features.mk: we do not need the VALGRIND libraies, just the headers
mserv.c: start registered with false in Update_parameters()
2024-01-07 13:07:28 -05:00
Logan Aerl Arias
8fefb8a87b CircleCI: move to LINUX64 build 2024-01-05 22:17:00 +00:00
Alam Ed Arias
c05f6e8053 Update config.yml 2024-01-05 16:49:52 +00:00
Alam Ed Arias
f613bd1279 Update config.yml 2024-01-05 16:47:48 +00:00
Logan Aerl Arias
1d88da8f05 CirecleCI build bot doesn't have libminiupnpc-dev 2024-01-05 16:24:47 +00:00
Logan Aerl Arias
e2164309a2 added libminiupnpc-dev to CircleCI build, try number two 2024-01-05 15:46:05 +00:00
Logan Aerl Arias
3f7dbcd15b Update config.yml
added libminiupnpc-dev to CircleCI build
2024-01-05 15:42:28 +00:00
Gustaf Alhäll
0211492d96
Change point-in-polygon algorithm 2024-01-04 20:12:20 +01:00
Logan Aerl Arias
7cb2fcd058 Merge branch 'fix-inline-warning' into 'next'
Fix a -Winline warning

See merge request STJr/SRB2!2255
2024-01-04 16:40:34 +00:00
Zwip-Zwap Zapony
c46f861034 New gamepad defaults, with Shield on B 2024-01-04 08:29:30 +01:00