Eidolon
4c72154d4f
Merge remote-tracking branch 'local-SRB2/next' into public_next
2022-12-08 21:26:28 -06:00
Eidolon
6428d6fc61
Fix axis inversion and camera look inversion
2022-12-08 21:25:10 -06:00
Eidolon
7d8e8e20b7
Merge branch 'gamepad-refactor-lua-rumble' into 'next'
...
Add haptic functions for Lua scripting
See merge request STJr/SRB2!1872
2022-12-09 02:17:17 +00:00
Eidolon
7f1cafcd3d
Merge branch 'gamepad-refactor-lua-features' into 'next'
...
Add gamepad library and hooks for Lua scripting
See merge request STJr/SRB2!1871
2022-12-09 02:17:03 +00:00
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
spherallic
d0a91646ef
Allow setting hoop pitch/yaw in degrees (binary)
2022-12-07 12:34:35 +01:00
Eidolon
df131ef131
Bump SRB2VERSION and MODVERSION for 2.2.11 pre2
2022-12-06 18:43:59 -06:00
Eidolon
aac04b818c
Merge branch '22-safe-addfolder' into 'public_next'
...
Path security checks for addfile, addfolder and exec
See merge request STJr/SRB2Internal!633
2022-12-07 00:43:31 +00:00
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
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
Zwip-Zwap Zapony
396db189e7
Draw the input prompt while the console is moving
2022-11-20 11:51:40 +01:00
Zwip-Zwap Zapony
435e1f6e7e
Make con_height adjustable on the fly
2022-11-20 11:50:57 +01:00
Zwip-Zwap Zapony
256d9b5fdb
Uncap console opening/closing animation
2022-11-20 11:50:01 +01:00
Zwip-Zwap Zapony
969dc4813a
Allow cosmetic add-ons mid-save
2022-11-19 19:57:08 +01:00
Sally Coolatta
5103253e0b
Allow unlockable executors again
2022-11-16 11:14:33 -05:00
Sally Coolatta
d3ff5342dd
Minor adjustments
2022-11-16 11:14:32 -05:00
Sally Coolatta
947dbda045
Use savemoddata for ultimate file check
2022-11-16 11:14:32 -05:00
Sally Coolatta
f082acbbdb
Don't allow Record Attack in cheated games
2022-11-16 11:14:31 -05:00
Sally Coolatta
a22fa1c455
Compromise on cheats setting modified game
...
Instead of modifying the game, cheats now set a separate "cheats were used in this session" variable, which returns some of the old behavior.
HOWEVER, cheats will STILL allow spawning / collecting emblems & unlocking unlockables. Cheats will purely prevent saving progress. (It was always frustrating that devmode would make debugging unlockable features harder...)
Lastly, the function to set no-saving was exposed to Lua (`G_SetUsedCheats(silent)`). Just thought it'd be useful for large-scale gamedata-using mods that want to add their own cheat commands.
2022-11-16 11:14:31 -05:00
Sally Coolatta
4a520e63c6
Don't allow a gamedata named the same as the default time attack folder
...
That'd be kinda scary!
2022-11-16 11:14:30 -05:00
Sally Coolatta
bcfe0da8fc
Use old modded behavior when loading old files, instead of ignoring
...
Let's not pretend script-kiddie edited old files are now perfectly A-OK :p
2022-11-16 11:14:30 -05:00
Sally Coolatta
1b43cdddd5
Allow saving in modified games.
2022-11-16 11:14:29 -05:00
