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 |
|
Logan Aerl Arias
|
3331e073ea
|
Merge branch SRB2:next into slash-n
|
2023-12-31 17:05:06 +00:00 |
|
Logan Aerl Arias
|
82f37ccadd
|
Merge branch SRB2:next into emblemexitfix
|
2023-12-31 17:03:43 +00:00 |
|
Logan Aerl Arias
|
8c3d590730
|
Merge branch SRB2:next into exitfix
|
2023-12-31 17:03:12 +00:00 |
|
Logan Aerl Arias
|
530c93c1e7
|
Merge branch SRB2:next into setflip
|
2023-12-31 17:02:58 +00:00 |
|
Logan Aerl Arias
|
e24a9c2fe4
|
Merge branch 'next' into improve-download-refuse-message
|
2023-12-31 11:58:10 -05:00 |
|
Logan Aerl Arias
|
c159987a30
|
Merge branch SRB2:next into blockedexposed
|
2023-12-31 16:57:01 +00:00 |
|
Logan Aerl Arias
|
07b0df0fba
|
Merge branch 'next' into sector-portals
|
2023-12-31 11:56:34 -05:00 |
|
Logan Aerl Arias
|
c409b69dec
|
Merge branch SRB2:next into fireflower-icon
|
2023-12-31 16:53:11 +00:00 |
|
Logan Aerl Arias
|
28f982fdce
|
Merge branch SRB2:next into pandoradev
|
2023-12-31 16:48:54 +00:00 |
|
Logan Aerl Arias
|
987f6fbe2b
|
Merge branch SRB2:next into theyseemerollingtheybraking
|
2023-12-31 16:48:15 +00:00 |
|
Logan Aerl Arias
|
cd5bc8b6eb
|
Merge branch SRB2:next into expos-camreset
|
2023-12-31 16:45:58 +00:00 |
|
Logan Aerl Arias
|
5a7171a814
|
Merge branch SRB2:next into pit-savior
|
2023-12-31 16:45:01 +00:00 |
|
Logan Aerl Arias
|
25c24bb9d8
|
Merge branch SRB2:next into expos-local
|
2023-12-31 16:44:47 +00:00 |
|
Logan Aerl Arias
|
38dec322ba
|
Merge branch SRB2:next into interpolate-shield-spawning
|
2023-12-31 16:44:23 +00:00 |
|
Logan Aerl Arias
|
a343abed01
|
Merge branch SRB2:next into static-void-drawstaticbox
|
2023-12-31 16:44:10 +00:00 |
|
Logan Aerl Arias
|
456f7ef9a6
|
Merge branch SRB2:next into devmode-hudlines
|
2023-12-31 16:43:54 +00:00 |
|
Logan Aerl Arias
|
12418623a5
|
Merge branch SRB2:next into custom-2.2.10
|
2023-12-31 16:43:06 +00:00 |
|
Logan Aerl Arias
|
be6b7ca1b3
|
Merge branch 'next' into bustablemobjzfix
|
2023-12-31 11:40:36 -05:00 |
|