Commit graph

14187 commits

Author SHA1 Message Date
Eidolon
5cb13f9d1c Bump SRB2VERSION and MODVERSION for 2.2.11 pre1 2022-12-06 18:39:32 -06:00
Eidolon
cf699f23f9 Merge branch 'next' into public_next 2022-12-06 18:39:06 -06:00
Eidolon
9a7d15761d Merge branch '22-exec-files-only' into 'public_next'
Fix exec crashing with out of memory if opening a directory

See merge request STJr/SRB2Internal!634
2022-12-06 08:42:04 +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
Ace Lite
da9786b593 exposed floorlightsec, ceilinglightsec variables. 2022-11-25 23:16:11 +00:00
Ace Lite
656f7f94ac hw_main.c ceiling_y/xoffs renamed 2022-11-25 23:06:22 +00:00
Ace Lite
c5daa248d1 r_fps.c ceiling_y/xoffs renamed 2022-11-25 23:06:07 +00:00
Ace Lite
3217984f55 c-side offset/angle variable renamed 2022-11-25 23:01:27 +00:00
Ace Lite
9d4a3b91c3 change names of Lua variables for last time. 2022-11-25 22:27:41 +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
spherallic
ba1bad7a96 Merge branch 'next' into fullscreen-toggle 2022-11-24 21:41:06 +01:00
Ace Lite
27c6afb80b Yikes. how did I miss "_" on every single variable 2022-11-24 18:51:53 +00:00
LJ Sonic
28dba7f3c1 Add a separate control for switching to the previous viewpoint 2022-11-23 18:44:58 +01:00
Ace Lite
e789bf1fb2 Fix for consistency
just *angle for *_angle
2022-11-23 17:29:44 +00: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
Ace Lite
34cc1d1cc4 Exposed floor/ceiling pic x/y offsets to Lua. 2022-11-23 17:09:54 +00: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
James R
5411d522e5 r_bbox.c: use size_t to access column array 2022-11-22 18:13:40 -08:00
James R
8430dfa063 Fix copyright year in r_bbox.c 2022-11-22 18:13:40 -08:00
toaster
f7fa9fcc19 Fix compilation issue with nested defines for r_opengl.c UnSetShader 2022-11-22 18:13:40 -08:00
James R
7855bae8a1 Remove R_ThingVisibleWithinDist
It's no longer used!
2022-11-22 18:13:40 -08:00
James R
bfaf2bc6f3 OpenGL hitbox renderer
I apologize for that vertex array.
2022-11-22 18:13:38 -08:00
James R
5b53017a09 r_opengl: add PF_WireFrame and SHADER_NONE
Draw lines instead of tris and disable shader entirely.
2022-11-22 18:12:49 -08:00
James R
7527fdbb56 Remedy some quirky rendering of hitboxes if your viewpoint is too close
It's not correct but it's better than before.
2022-11-22 18:12:49 -08:00
James R
99653de134 Do not render viewmobj or skybox viewpoint hitbox
If you are a spectator (or in first person), the hitbox
exists right ontop of you and hitboxes don't render
correctly if they are too close to the viewpoint.
2022-11-22 18:12:49 -08:00
James R
694804cd96 Refactor hitbox renderer to project vissprites
Properly accounts for portals (skyboxes).
2022-11-22 18:12:49 -08:00
James R
356bdb25a1 Add a hitbox renderer to Software mode
renderhitbox
- Tangible - collision activating objects, minus rings
- All - every object
- Intangible - the opposite of Tangible, also no rings
- Rings - rings
2022-11-22 18:12:49 -08: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
ashifolfi
47e981d2a8 actually check the right type in lua 2022-11-20 16:07:14 -05:00
ashifolfi
1b14dff0e9 add comments + better checktexturename if statement 2022-11-20 16:06:47 -05:00
ashifolfi
e48f7d1538 actually use correct names in the header 2022-11-20 16:06:43 -05:00