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
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
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
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
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
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
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
Logan Aerl Arias
3de4547f74
Merge branch 'expos-camreset' into 'next'
...
Expose P_ResetCamera / camera->reset to Lua
See merge request STJr/SRB2!2009
2024-01-03 15:36:16 +00:00
Logan Aerl Arias
3992e83e8f
Revert "Merge branch 'thokking-hell' into 'next'"
...
This reverts merge request !1551
2024-01-03 03:46:26 +00:00
Logan Aerl Arias
6ad24c4368
Merge branch 'fix-1166' into 'next'
...
Fix #1166
Closes #1166
See merge request STJr/SRB2!2256
2024-01-03 03:44:55 +00:00
Lactozilla
7fbd8f7025
Merge branch 'next' into more-sprite2
2024-01-02 22:09:17 -03:00
Lactozilla
31f7616d3a
Fix #1166
2024-01-02 20:58:55 -03:00
Zwip-Zwap Zapony
29c7a0bfd8
Fix a -Winline warning
2024-01-02 20:38:18 +01:00
Logan Aerl Arias
a72e80a528
Merge branch 'update-quittime-while-idling' into 'next'
...
Update player->quittime while a Server is Idling, Attempt 2
Closes #1143 and #1119
See merge request STJr/SRB2!2254
2024-01-02 18:32:31 +00:00
Zwip-Zwap Zapony
e717731ea3
Update player->quittime when a server idles, again
2024-01-02 19:00:18 +01:00
Logan Aerl Arias
4dd2415262
Merge branch 'exitfix' into 'next'
...
Only Consider ExitLevel a Cheat When Used to Cheat
See merge request STJr/SRB2!2159
2024-01-02 03:05:24 +00:00
Logan Aerl Arias
474d112ae4
Merge branch 'setflip' into 'next'
...
Add "allowflip" Parameter to P_DoJump
See merge request STJr/SRB2!2158
2024-01-02 02:38:19 +00:00
Logan Aerl Arias
e943b9a98b
Merge branch 'master' into next
2024-01-01 20:41:53 -05:00
Logan Aerl Arias
920f375f4a
Update features.mk
...
fix miniupnpc typo in features.mk
2024-01-01 20:40:11 -05:00
Logan Aerl Arias
4853eded8e
Merge branch 'master' into next
2024-01-01 20:35:33 -05:00
Logan Aerl Arias
dd8ae3db09
Merge branch 'raise-skin-limit' into 'next'
...
Raise the skin limit
See merge request STJr/SRB2!1466
2024-01-01 22:07:42 +00:00
Logan Aerl Arias
e371ab5b9b
Merge branch 'raise-skin-limit' of git.do.srb2.org:STJr/SRB2 into raise-skin-limit
2024-01-01 16:55:47 -05:00
Logan Aerl Arias
487b0d22ed
Merge branch 'next' into raise-skin-limit
2024-01-01 16:55:04 -05:00
Logan Aerl Arias
8009b945f7
Merge branch 'next' into raise-skin-limit
2024-01-01 16:43:28 -05:00
Logan Aerl Arias
07645d6771
Merge branch 'opengl-fix-cullingplane-fofs' into 'next'
...
OpenGL: Fix linedef type 10 not culling FOFs (Closes #438 )
Closes #438
See merge request STJr/SRB2!1399
2024-01-01 19:48:47 +00:00
ChaoLoveIceMDBoy
e29085580c
OpenGL: Fix linedef type 10 not culling FOFs ( Closes #438 )
2024-01-01 19:48:47 +00:00
Logan Aerl Arias
b55b91bc24
Merge branch 'pit-savior' into 'next'
...
Make Dead / NoClipHeight Objects Immune to Death Pits (Resolves #553 )
Closes #553
See merge request STJr/SRB2!2001
2024-01-01 16:28:37 +00:00
Logan Aerl Arias
0182973b4d
Merge branch 'interpolate-shield-spawning' into 'next'
...
Copy Interpolation to Shields and Overlays, Splitscreen Overlays
Closes #997
See merge request STJr/SRB2!1992
2024-01-01 15:10:24 +00:00
