stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-25 05:41:42 +00:00
Code Issues Projects Releases Packages Wiki Activity
14384 commits 173 branches 41 tags 182 MiB
Commit graph

771 commits

Author SHA1 Message Date
Eidolon
bbd4cff75c Revert "Merge branch 'gamepadtweaks' into 'next'" 
This reverts commit 96bfd8cea7, reversing
changes made to 24f9ec4ec4.
 2023-01-26 19:24:21 -06:00
LJ Sonic
379cc4207a Revert "Merge branch 'netcode-refactor' into merging" 
This reverts merge request !1920
 2023-01-15 17:57:23 +00:00
LJ Sonic
41fb0c8943 Merge branch 'netcode-refactor' into merging 2023-01-15 17:45:06 +01:00
LJ Sonic
7c2fe20cd5 Move tic and net command handling to new files 2023-01-05 22:51:17 +01:00
katsy
3a04e11743 allow targeting invulnerable bosses 2023-01-05 14:11:54 -06:00
Arthur
bc519ad132 Fix for issue #933 - special stage tokens should divert player until after the special stage with a custom exit map 2022-12-31 22:07:22 -05:00
LJ Sonic
717e0d5a17 Move netcode files to a new folder 2022-12-31 14:10:19 +01:00
spherallic
1964869c69 Remove redundant control axes & cleanup 2022-12-22 01:40:33 +01:00
spherallic
a85876d0c2 Change gamepad defaults again, post-refactor 2022-12-16 01:25:54 +01:00
Eidolon
6428d6fc61 Fix axis inversion and camera look inversion 2022-12-08 21:25:10 -06: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
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
LJ Sonic
28dba7f3c1 Add a separate control for switching to the previous viewpoint 2022-11-23 18:44:58 +01: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
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
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
Jaime Ita Passos
3e088e4e78 Use displayplayer instead of consoleplayer in G_GetInputPlayer 2022-11-15 23:36:32 -03:00
Jaime Ita Passos
f0c3de6976 Add gamepad library and hooks for Lua scripting 2022-11-14 02:18:24 -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
Alam Arias
1b5dd687d2 Cleanup whitespace changes from master branch 2022-11-11 20:31:41 -05:00
Eidolon
6d1a3bfce0 Reset camera when moving player to spawn/starpost 2022-11-08 18:48:50 -06:00
Eidolon
d511857675 Reset view interp in preticker 2022-05-05 19:43:55 -05:00
Eidolon
f0d7d8467f Refactor timing code even more 
System layer is greatly simplified and framecap
logic has been moved internally. I_Sleep now
takes a sleep duration and I_SleepDuration
generically implements a precise sleep with spin
loop.
 2022-05-01 00:32:46 -05:00
Eidolon
e79654a33a Completely refactor timing system 
Time is now tracked internally in the game using I_GetPreciseTime
and I_UpdateTime. I_Time now pulls from this internal timer. The
system code no longer needs to keep track of time itself.

This significantly improves frame and tic timing in interp mode,
resulting in a much smoother image with essentially no judder at
any framerate.
 2022-04-30 16:33:23 -05:00
Eidolon
3e5cec7e72 Intialize interpolator list at a better time 2022-04-26 20:56:31 -05:00
Eidolon
9c8d0a3b6f Add sector plane level interpolations 2022-04-26 20:56:30 -05:00
Eidolon
8908dcccde Only swap view interp state if a tick is run 2022-04-26 20:31:39 -05:00
Eidolon
b625076c87 Implement interpolation at the renderer level 
Instead of interpolating thinkers, we interpolate mobjs inside the
renderer. Further interpolation is TBI.
 2022-04-26 20:31:37 -05:00
spherallic
14295ac7de 2022 2022-03-03 20:24:46 +01:00
sphere
c79c6531e6 Merge branch 'server-bots' into 'next' 
Improve bots (resolves #710)

Closes #710

See merge request STJr/SRB2!1679
 2022-02-19 20:24:12 +00:00
LJ Sonic
9c5427555b Merge branch 'fix-exitgame-ztarget-crash' into 'next' 
Fix lock-on crash (Resolves #746)

Closes #746

See merge request STJr/SRB2!1704
 2022-02-06 17:24:01 +00:00
lachablock
1a5995968c Revert server-sidedness of bots 2022-01-19 00:48:25 +11:00
lachablock
4af820e82c Restore a cast I didn't realize used to be there 2022-01-13 09:56:47 +11:00
lachablock
70a1dd6db0 Merge remote-tracking branch 'origin/next' into server-bots 2022-01-13 09:52:38 +11:00
lachablock
8ed18a12a4 Merge remote-tracking branch 'origin/next' into server-bots 2022-01-11 20:04:22 +11:00
GoldenTails
e0afc2d2b6 Add a player->mo check before attempting to account for ztargetting. 2022-01-09 17:09:57 -06:00
spherallic
0a38fef147 Several changes to default control settings: 
- Renamed Simple to Automatic, and made it the default
- Renamed Standard to Manual
- Changed some camera settings to make Automatic easier to control
- Changed most default gamepad controls, to fit Automatic playstyle
- Changed a few default keyboard controls
- Added default binds for custom actions 1-3
- Removed forced camera settings in the tutorial (to account for
upcoming tutorial update)
- Also lowered default sound/music volume a little bit
 2021-12-29 19:29:36 +01:00
katsy
effcb948ad Don't count bots in playersforexit 2021-12-29 09:59:54 +00:00
lachablock
1eb1ad2677 Fix compile warning 2021-12-22 19:46:16 +11:00
lachablock
2794727201 Improve bot handling: 
- bot ticcmds are generated and sent by the server only
- fix issue where server would not send all ticcmds to clients if bots were in the game
- fix bots still responding to P1's inputs while P1's controls are locked
- fix bot player's directional controls being rotated when controlled by P2
 2021-12-12 18:52:27 +11:00
LJ Sonic
1acd0f6bac Merge branch 'starstruck' into 'next' 
Null gamestate before map transition to prevent unwanted interactions with the map (resolves #601)

Closes #601

See merge request STJr/SRB2!1624
 2021-12-03 18:02:06 +00:00
katsy
ed5942a0b6 fix tailsbot controls 2021-09-22 23:18:54 -05:00
katsy
791b981fd8 null gamestate during pre-intermission to prevent unwanted interaction 2021-09-22 16:22:47 -05:00
Tatsuru
6ed063dcce Merge branch 'polish-lua-inputs' into 'next' 
Polish the Lua input library

See merge request STJr/SRB2!1598
 2021-09-11 14:59:41 +00:00
LJ Sonic
5340db5f67 Make gc_ constants uppercase 2021-08-15 16:15:28 +02:00
LJ Sonic
5bc0ce7a62 Give fields in event_t better names 2021-08-14 23:42:39 +02:00
LJ Sonic
c2907b89f7 Pass a keyevent_t userdatum to key hooks 2021-08-14 20:34:59 +02:00
CobaltBW
22f42efb61 Cleaned up leftover comments 2021-07-15 15:09:02 -07:00
CobaltBW
48514ee88d Fixed G_RemovePlayer crash in players.iterate 
This was done by storing flag-for-removal status as a boolean inside the player struct.
Bot players are instead removed at the start of G_Ticker, rather than being removed immediately by G_RemovePlayer.
 2021-07-15 15:04:24 -07:00
CobaltBW
4f04097066 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into addplayer 2021-06-29 14:32:46 -07:00
CobaltBW
c3fa9bea0f ri# mified: src/tazx# mofied: src/tazx# modified: src/tazx# modified: src/tazxc 2021-06-29 14:07:49 -07:00
Shane Ellis
09f445f227 Merge branch 'next' into 'addplayer' 
# Conflicts:
#   src/g_game.c
 2021-06-19 20:20:45 -04:00
LJ Sonic
e3a5da3f6f Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into HEAD 
# Conflicts:
#	src/lua_hook.h
#	src/lua_hooklib.c
 2021-06-19 20:49:12 +02:00
LJ Sonic
cfa48574be Merge branch 'next' into 'lua-inputs' 
# Conflicts:
#   src/lua_script.c
 2021-06-19 10:34:48 -04:00
sphere
786516fa5f Merge branch 'kart-latency' into 'next' 
Kart cmd->latency port

See merge request STJr/SRB2!1470
 2021-06-09 10:53:09 -04:00
James R
4d22b9f17f Merge remote-tracking branch 'origin/next' into hooklib-refactor 2021-06-07 18:12:52 -07:00
Shane Ellis
18c47afc76 Merge branch 'next' into 'addplayer' 
# Conflicts:
#   src/lua_baselib.c
#   src/r_skins.c
 2021-06-02 11:47:11 -04:00
sphere
2df75610e6 Merge branch 'allow-lua-to-override-special-stages' into 'next' 
Allows Lua to transport you to a different map in place of a Special Stage.

See merge request STJr/SRB2!1368
 2021-06-02 11:16:15 -04:00
SteelT
ad2b4b1809 Merge branch 'save-skin-names' into 'next' 
Save skin names in save files instead of skin numbers

See merge request STJr/SRB2!1503
 2021-05-28 22:05:20 -04:00
SteelT
2cb920a5a6 Merge branch 'failed-level-lua' into 'next' 
[SUGOI] Make stagefailed more useful, add linedef executor to toggle, and expose to Lua

Closes #361

See merge request STJr/SRB2!1463
 2021-05-28 21:51:00 -04:00
Sally Coolatta
d136c60a3f Add some comments, write an empty string instead of a boolean determining if the bot skin exists or not. 
I was a little scared of doing this at first, but after a bit of thought & some testing that it'll be fine.
 2021-05-07 20:13:16 -04:00
Sally Coolatta
dc6851dabc Save skin name instead of skin number into save files 
Allows you to save a game as any character, and you don't have to load the files in a specific order to access the save file.
 2021-05-07 19:41:44 -04:00
LJ Sonic
d325c7e6d3 The year is 2021 2021-05-07 17:45:56 +02:00
Tatsuru
4f2f94d02d Compatibility with the current identifier 2021-04-21 22:22:37 -03:00
Tatsuru
da56e84d2c Change TOL_ERZ3 identifier 2021-04-21 22:17:16 -03:00
Sally Coolatta
57d81ddb21 Kart cmd->latency port 
Nev3r was talking about something that would've been drastically improved with this, and it is really simple, so I ported it :)
 2021-04-21 19:58:14 -04:00
Sally Coolatta
d59f25a6cd stagefailed is more useful 
- Can now apply to normal stages, simply defaults to "false" in normal stages.
- Post-level cutscenes are now always skipped when the stage was failed.
- Exposed the boolean as a Lua read+write global.

Desired for SUGOI, as it allows for visited flags not be updated, and level completion emblems to not be awarded. Which means a lot less crappy non-ideal workarounds.

Normal stage intermission currently does not reflect failure state at all. Maybe it could always skip, never award score bonuses, have different text... etc. Probably would leave that up to vanilla dev opinion.
 2021-04-18 12:59:49 -04:00
Steel Titanium
33b7075d46 bruh 2021-04-05 22:50:22 -04:00
Steel Titanium
397fdef034 Load intermission patches in Y_LoadIntermisionData 2021-04-05 22:34:52 -04:00
SwitchKaze
3895c02330 Revert "Remove key stuff" 
This reverts commit a439e569
 2021-04-02 15:46:08 -05:00
SwitchKaze
0db07cef0e Adjust joystick axis enum 2021-04-02 15:46:08 -05:00
SwitchKaze
cb3a8f7a58 Remove key stuff 2021-04-02 15:46:08 -05:00
SwitchKaze
eb2dc9e99b Mouse improvements 2021-04-02 15:46:08 -05:00
SwitchKaze
3faa98cf4a Expose inputs to Lua 2021-04-02 15:45:59 -05:00
SwitchKaze
6bf76602ed Refactor mouse 2021-04-02 15:22:22 -05:00
LJ Sonic
09d911a5b6 Revert "Replace all instances of P_AproxDistance with FixedHypot" 
This reverts commit 75633bde50.
 2021-02-13 17:45:20 +01:00
LJ Sonic
dfc1767794 Only call PlayerCmd hooks if added to game 2021-02-11 00:24:42 +01:00
LJ Sonic
83947d4428 Merge branch 'redundant-hypot' into 'next' 
Replace P_AproxDistance with FixedHypot, and replace FixedHypot's algorithm with R_PointToDist2's

See merge request STJr/SRB2!1320
 2021-01-25 18:08:25 -05:00
Shane Ellis
25bf4b54e2 Restructured botticcmds into G_Ticker 2021-01-23 10:36:44 -05:00
Shane Ellis
0e9b4acb58 Update g_game.c (Account for bot type 3) 2021-01-15 19:29:03 -05:00
Shane Ellis
505ba1ff63 Update g_game.c 2021-01-15 18:06:36 -05:00
SteelT
da37d3c168 Merge branch 'fix-ticcmd-received' into 'next' 
Fix TICCMD_RECEIVED being overridden by gamelogic

See merge request STJr/SRB2!1337
 2021-01-07 16:31:45 -05:00
GoldenTails
3b4a52b8b8 Allows Lua to transport you to a different map in place of a Special Stage. 2021-01-04 00:03:18 -06:00
LJ Sonic
b82cee780a Fix TICCMD_RECEIVED being overridden by gamelogic 2020-12-16 17:35:39 +01:00
James R
a86a7822d1 Merge remote-tracking branch 'origin/next' into hooklib-refactor 2020-12-12 15:38:46 -08:00
James R
75633bde50 Replace all instances of P_AproxDistance with FixedHypot 2020-12-12 14:53:54 -08:00
James R
7b6675178e Merge branch 'oldguards' into 'next' 
Kill remaining HAVE_BLUA and SEENAMES

See merge request STJr/SRB2!1319
 2020-12-12 17:34:04 -05:00
James R
93e4f43e4b Hooklib macros names -> uppercase + documentation 2020-12-12 03:16:30 -08:00
James R
e55d842d7f Kill SEENAMES 2020-12-12 02:11:23 -08:00
James R
2778cc3ce9 Merge remote-tracking branch 'origin/next' into hooklib-refactor 2020-12-12 02:02:38 -08:00
James R
4275d52267 Merge branch 'marathon-mode-tokens' into 'next' 
Fix emeralds,  tokens, etc not resetting when restarting marathon mode in first level

See merge request STJr/SRB2!1252
 2020-12-10 14:57:23 -05:00
James R
8d382e49fb Big Large Lua Hooklib Refactor 
* Hooks are no longer a mess of lua boiler plate. Helper functions reduce hooks
  to, at the most basic level, only two calls.
* Lua tables (the array part) are used to index hooks. Such tables contain only
  hooks of the same type.
* Hook types are defined in one place so you no longer need to sync up the enum
  and name array.
 2020-12-10 00:36:41 -08:00
LJ Sonic
7ff6443659 Fix PlayerCmd not handling angle and aiming correctly 2020-11-23 01:23:34 +01:00
Riku Salminen
b9fa50f7ef No need to reset tokens twice 2020-11-22 23:23:32 +02:00
Riku Salminen
f51be77aa2 Now the fix actually does what the MR says... +lua banks 2020-11-22 23:19:24 +02:00
Riku Salminen
0a1beab8c8 Reset a couple of other variables while we're at it 2020-11-14 20:17:35 +02:00