Commit graph

15174 commits

Author SHA1 Message Date
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
Gustaf Alhäll
bc5a0098ea
fixup! Use angle instead of range when checking identical points 2024-01-03 21:10:11 +01:00
Gustaf Alhäll
4cdd638a07
Use angle instead of range when checking identical points 2024-01-03 20:49:17 +01:00
Gustaf Alhäll
cf7c6585eb
Merge remote-tracking branch 'fork/fix-slope-convex-sectors' into fix-slope-convex-sectors 2024-01-03 18:49:58 +01:00
Gustaf Alhäll
5edc828aaf
Fix physical weirdness on concave sectors, too 2024-01-03 18:48:41 +01: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
b6e4771085 Merge branch 'next' into translations 2024-01-02 22:06:14 -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
Logan Aerl Arias
484a9c5620 Merge branch 'expos-local' into 'next'
Expose P_IsLocalPlayer to Lua

See merge request STJr/SRB2!1997
2024-01-01 05:06:47 +00:00
Logan Aerl Arias
096efe422d Merge branch 'static-void-drawstaticbox' into 'next'
Rewrite M_DrawStaticBox

Closes #1014

See merge request STJr/SRB2!1990
2024-01-01 05:00:36 +00:00
Logan Aerl Arias
9972dd0d5b Merge branch 'devmode-hudlines' into 'next'
Always Allow con_hudlines when Using devmode

See merge request STJr/SRB2!1987
2024-01-01 04:55:43 +00:00
Logan Aerl Arias
520d1c16da Merge branch 'custom-2.2.10' into 'next'
Made filesearch aware of symbolic links

See merge request STJr/SRB2!1976
2024-01-01 04:51:09 +00:00
Logan Aerl Arias
050da08c15 Merge branch 'bustablemobjzfix' into 'next'
Update mobj floorz/ceilingz after a bustable FOF is destroyed

See merge request STJr/SRB2!1945
2024-01-01 04:44:09 +00:00
Logan Aerl Arias
37a917df49 Merge branch 'perfstats-thinkframes' into 'next'
Implement perfstats options for LUAh_PreThinkFrame and LUAh_PostThinkFrame

See merge request STJr/SRB2!1932
2024-01-01 04:05:16 +00:00
Logan Aerl Arias
341159fdc9 Merge branch 'drawfill-transparency' into 'next'
Add transparency flag support to drawFill

See merge request STJr/SRB2!1881
2024-01-01 03:59:56 +00:00
Logan Aerl Arias
2223cdd756 Merge branch 'icefix' into 'next'
Move player friction reset after movement code for lua qol

See merge request STJr/SRB2!1824
2024-01-01 03:10:11 +00:00
katsy
b52836e5f1 Move player friction reset after movement code for lua qol 2024-01-01 03:10:09 +00:00
Logan Aerl Arias
9ad45fbe2c Merge branch 'lua-sidenum-fix' into 'next'
Fix line.sidenum[i] in Lua

See merge request STJr/SRB2!2252
2024-01-01 03:04:02 +00:00
Monster Iestyn
1284ec6494 correct sidenum_get to use UINT32 instead of UINT16 2024-01-01 02:44:07 +00:00
Logan Aerl Arias
ee1186863e Merge branch 'MiniUPnPc_2.2.5_update' into 'master'
made UPnP port mapping enabled by default

See merge request STJr/SRB2!2251
2023-12-31 23:38:31 +00:00
Logan Aerl Arias
06b5c9d5f4 Merge branch 'menu-unresponsiveness-fix' into 'next'
Fix rare but possible menu/console unresponsiveness bug (Resolves #700)

Closes #700

See merge request STJr/SRB2!1677
2023-12-31 23:36:30 +00:00
Logan Aerl Arias
8dcc609144 Merge branch SRB2:next into custom-2.2.10 2023-12-31 20:17:32 +00:00
Logan Aerl Arias
5388d197dc Merge branch 'constants-global' into 'next'
Expose a `constants` dictionary to Lua.

See merge request STJr/SRB2!1646
2023-12-31 17:20:56 +00:00
Logan Aerl Arias
b6ef6e23b4 Merge branch 'master' into MiniUPnPc_2.2.5_update 2023-12-31 12:14:19 -05:00
Logan Aerl Arias
b438392d63 Merge branch SRB2:next into fix-slope-convex-sectors 2023-12-31 17:13:23 +00:00
Logan Aerl Arias
aa6faba24a Merge branch 'next' into fix-table-key-archiving 2023-12-31 12:12:13 -05:00
Logan Aerl Arias
51bb5d41e0 Merge branch 'next' into lua-colorlib-get-sector-translation 2023-12-31 12:11:12 -05:00
Logan Aerl Arias
a0bd81d09a Merge branch SRB2:next into bouncy-nights-fixes 2023-12-31 17:07:22 +00:00
Logan Aerl Arias
b700c3a8bf Merge branch 'next' into cv-can-change 2023-12-31 12:06:27 -05:00
Logan Aerl Arias
b6ffd8ce01 Merge branch SRB2:next into oldspecnightsrecordsfix 2023-12-31 17:05:51 +00:00