stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 09:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity
13587 commits 174 branches 41 tags 300 MiB
Commit graph

13587 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eidolon
696e2ab909 Merge branch 'gamepad-refactor' into next 
Some hacks from the snake minigame patch have been removed as they are
no longer needed.

See STJr/SRB2!1870

# Conflicts:
#	src/g_game.c
#	src/g_input.c
 2022-12-08 20:00:41 -06:00
Eidolon
d98d59494f Add missing level-load view reset from RR 2022-12-08 18:21:37 -06:00
sphere
b9c677e537 Merge branch 'triggerafterxcalls' into 'next' 
Fix callcount typo

Closes #922

See merge request STJr/SRB2!1890
 2022-12-08 12:25:03 +00:00
Eidolon
6d44eb8016 Revert previous RemoveMobjInterpolator move 
Matching Ring Racers. Previous move was actually a mistake on the Kart
port. Done so there is never a condition where the interpolator isn't
removed.
 2022-12-05 17:22:01 -06:00
Eidolon
5bb7a527a1 Remove mobj interp. on early-free in P_RemoveMobj 
Fixes a crash that occurred frequently in special stages/NiGHTS.
 2022-12-04 22:25:23 -06:00
MascaraSnake
2cc7fe2bf0 Fix callcount typo 2022-12-04 09:14:55 +01:00
sphere
153def463f Merge branch 'fix-downloadsnakeconcent' into 'next' 
[Snake Controller Fix] fix NONET builds

See merge request STJr/SRB2!1888
 2022-11-29 12:07:57 +00:00
sphere
2e3253592a Merge branch 'polyvisiblefix' into 'next' 
Fix PolyObject visibility/tangibility constants

See merge request STJr/SRB2!1886
 2022-11-29 11:28:57 +00:00
sphere
cef1cc3fdc Merge branch 'dynslope-fix' into 'next' 
Dynamic slope vertices: Allow untagged vertices which don't move

Closes #917

See merge request STJr/SRB2!1885
 2022-11-29 11:28:55 +00:00
Zwip-Zwap Zapony
4e303ec59d better ifdef 2022-11-26 20:46:25 +00:00
ashifolfi
9cec9fbe97 fix NONET builds 2022-11-26 15:34:32 -05:00
LJ Sonic
c025c3408b Merge branch 'reverse-viewpoint-switch' into 'next' 
Better viewpoint switching

See merge request STJr/SRB2!1875
 2022-11-26 15:17:56 +00:00
LJ Sonic
5a38bbbbf5 Merge branch 'fix-downloadsnakeconcent' into 'next' 
Fix Download Consent/Snake minigame not having controller support

Closes #836 and #835

See merge request STJr/SRB2!1883
 2022-11-26 15:14:35 +00:00
LJ Sonic
ddc708ac87 Remove shift+F12 shortcut 
This would conflict if your shift key is bound to a control =((
 2022-11-25 22:40:28 +01:00
sphere
0218f9c2fa Merge branch 'fix-suspicious-statue' into 'next' 
Fix suspicious statue still being tangible for ~40 tics after spawning lance-a-bot

Closes #856

See merge request STJr/SRB2!1882
 2022-11-25 19:51:15 +00:00
MascaraSnake
4de3ed0ab1 Fix PolyObject visibility/tangibility constants 2022-11-25 18:03:58 +01:00
MascaraSnake
1e6150e7fe Dynamic slope vertices: Allow untagged vertices which don't move 2022-11-24 22:20:54 +01:00
LJ Sonic
28dba7f3c1 Add a separate control for switching to the previous viewpoint 2022-11-23 18:44:58 +01:00
ashifolfi
29aad5b7d5 WOW ITS A GOOD THING I DIDNT FORGET THIS HUH? 2022-11-23 12:27:01 -05:00
ashifolfi
8f5f5c1e22 hack and a half but joystick works now 2022-11-23 12:23:51 -05:00
ashi
1fb6adf390 change |= to &= 2022-11-23 16:22:52 +00:00
ashifolfi
741b1f415d very cool of vscode to not save when I told it to 2022-11-23 11:18:33 -05:00
LJ Sonic
7454235882 Merge branch 'mapmusname-fix' into 'next' 
Fix mapmusname not overwriting Lua-provided strings (resolves #880)

Closes #880

See merge request STJr/SRB2!1803
 2022-11-23 09:40:43 +00:00
Radicalicious
31520a1a5d Revert usage warning to an error 2022-11-22 16:21:13 +00:00
ashifolfi
7e2dee8796 attempt to get joystick support in snake 2022-11-20 20:17:13 -05:00
ashifolfi
d7b96df07b fix controller not working in download consent menu 2022-11-20 19:00:36 -05:00
ashifolfi
33b5f76045 fix controllers not working in snake game 2022-11-20 18:56:16 -05:00
ashifolfi
aa8410c612 fix statue being tangible for ~40 tics post burst mobj spawn 2022-11-20 18:46:41 -05:00
LJ Sonic
98d2dc4b71 No longer spam the console with viewpoint switching notices 2022-11-16 10:21:59 +01:00
LJ Sonic
d34d90b78b Enable reverse-iterating through viewpoints with shift+F12 2022-11-16 10:21:39 +01:00
LJ Sonic
aba5b953b2 Move viewpoint switching to its own function 2022-11-16 10:11:39 +01:00
Eidolon
e6780f2bee Merge branch 'comptime-no-fail' into 'master' 
Minor comptime refactoring.

See merge request STJr/SRB2!1776

(cherry picked from commit dc02339cc9)

9bfc82a1 Prevent comptime.* from failing compilation
a614865d Make comptime.sh conform to POSIX and less redundant, among other improvements
b7711b2b Pass argument list directly to functions that use them; quote arguments when used.
 2022-11-15 21:48:47 -05:00
Jaime Ita Passos
4a19294ca8 Merge these two loops together in Controller_GetFromID 2022-11-15 23:45:14 -03:00
Jaime Ita Passos
14065fb23f Properly make padrumble and padrumble2 CV_OnOff toggles 2022-11-15 23:37:57 -03:00
Jaime Ita Passos
3e088e4e78 Use displayplayer instead of consoleplayer in G_GetInputPlayer 2022-11-15 23:36:32 -03:00
Eidolon
84bc03d24e Merge branch 'po2-32x32-fix' into 'next' 
Add PO2 flat cases for sizes smaller than 32x32 (resolves #624)

Closes #624

See merge request STJr/SRB2!1873
 2022-11-16 01:40:54 +00:00
Lactozilla
86a052537e Add PO2 flat cases for sizes smaller than 32x32 2022-11-16 01:40:54 +00:00
Eidolon
8109514b73 Merge branch 'fix-udmf-boss3' into 'next' 
Use udmf mt arg 4 for pinch phase LE in boss 3

Closes #910

See merge request STJr/SRB2!1869
 2022-11-15 10:00:07 +00:00
Eidolon
1f97ee3f5c Merge branch 'ogl-splitwall-midtexture-fixes' into 'next' 
Fix HWR_SplitWall and sloped midtextures (resolves #188 and #195)

Closes #195 and #188

See merge request STJr/SRB2!1781
 2022-11-15 09:55:59 +00:00
Lactozilla
4558cc1c1f Fix HWR_SplitWall and sloped midtextures 
- Fix bugs with HWR_SplitWall and sloped midtextures
- Clean up HWR_ProcessSeg and HWR_SplitWall
- Determine if the midtexture is visible earlier
- Ensure opaque midtextures always use PF_Masked
 2022-11-15 09:55:59 +00:00
Jaime Ita Passos
f0c3de6976 Add gamepad library and hooks for Lua scripting 2022-11-14 02:18:24 -03:00
Jaime Ita Passos
0516350bb4 Add haptic functions for Lua scripting 2022-11-14 01:52:20 -03:00
Jaime Ita Passos
46f7fa406f Refactor gamepad code 
Implements the SDL Game Controller API, haptics, and axis bindings.
 2022-11-14 00:37:08 -03:00
Eidolon
47ed0567b1 Use udmf mt arg 4 for pinch phase LE in boss 3 2022-11-13 21:28:36 -06:00
Eidolon
fb038a8387 Merge branch 'sdl-2.0.20' into 'next' 
Update Windows SDL files to version 2.0.20

See merge request STJr/SRB2!1775
 2022-11-14 02:25:58 +00:00
Lactozilla
0a5494676e Update Windows SDL files to version 2.0.20 2022-11-14 02:25:58 +00:00
Eidolon
c582d73e4c Merge branch 'slowball' into 'next' 
Make CA_SLOWFALL Account for Scale

See merge request STJr/SRB2!1806
 2022-11-14 02:23:39 +00:00
Eidolon
e0477a86b9 Merge branch 'multi-linkdraw' into 'next' 
Improve multiple MF2_LINKDRAW objects in Software

See merge request STJr/SRB2!1843
 2022-11-13 23:47:52 +00:00
Eidolon
c5527f9470 Merge branch 'pterabyte-tweaks' into 'next' 
Fix Pterabyte spawns (+ behavior tweaks)

See merge request STJr/SRB2!1839
 2022-11-13 23:40:56 +00:00
Eidolon
eac8a54a55 Merge branch 'uncap-water-ripples' into 'next' 
Uncapped Water Ripples

See merge request STJr/SRB2!1868
 2022-11-13 23:29:10 +00:00