stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-11 21:32:17 +00:00
Code Issues Projects Releases Packages Wiki Activity
16079 commits 172 branches 41 tags 242 MiB
Commit graph

16079 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
f6b201173f Merge branch SRB2:next into disable-powerup-hud 2023-12-31 17:11:37 +00: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
56325399cc Merge branch SRB2:next into playersetup-and-continue-lua 2023-12-31 17:10:47 +00: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
057a3efe7f Merge branch 'next' into fruits-clipper 2023-12-31 12:04:16 -05:00
Logan Aerl Arias
82f37ccadd Merge branch SRB2:next into emblemexitfix 2023-12-31 17:03:43 +00:00
Logan Aerl Arias
fb5bf2555f Merge branch SRB2:next into propercheats 2023-12-31 17:03:31 +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
6d7549476b Merge branch 'next' into showinput 2023-12-31 11:47:14 -05: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
Logan Aerl Arias
b1f1889a07 Merge branch SRB2:next into perfstats-thinkframes 2023-12-31 16:32:54 +00:00
Logan Aerl Arias
48d06337be Merge branch SRB2:next into drawfill-transparency 2023-12-31 16:28:26 +00:00
Logan Aerl Arias
b67b0d3ac2 Merge branch SRB2:next into menu-unresponsiveness-fix 2023-12-31 16:19:50 +00:00
Logan Aerl Arias
47b34b3454 Merge branch SRB2:next into constants-global 2023-12-31 16:18:48 +00:00
Logan-A
106a98ce5c Merge branch 'master' into next 2023-12-31 11:05:20 -05:00
Logan Aerl Arias
8d179825d9 switch to using sanitized subject for compnote 2023-12-31 15:56:37 +00:00
Logan Aerl Arias
e7d972757b Revert "Merge branch 'update-quittime-while-idling' into 'next'" 
This reverts merge request !2210
 2023-12-31 14:32:06 +00:00
Logan Aerl Arias
9b39493b42 Merge branch 'ogl-wireframe' into 'next' 
Wireframe mode for OpenGL

See merge request STJr/SRB2!1644
 2023-12-31 14:30:04 +00:00
Logan Aerl Arias
f5ac585338 Merge branch 'bind-multi-arg' into 'next' 
Allow `bind` to accept more arguments for a command.

See merge request STJr/SRB2!1596
 2023-12-31 14:24:39 +00:00
Logan Aerl Arias
091a874514 Merge branch 'thokking-hell' into 'next' 
New CA_THOK effect

See merge request STJr/SRB2!1551
 2023-12-31 14:16:27 +00:00
Logan Aerl Arias
7c13f6e9fd Merge branch 'update-quittime-while-idling' into 'next' 
Update player->quittime while a Server is Idling

Closes #1143 and #1119

See merge request STJr/SRB2!2210
 2023-12-31 13:58:29 +00:00
Logan-A
9dea09a7cc Update features.mk 
change HAVE_MINIUPNPC to NOUPNP
 2023-12-31 00:13:13 -05:00