stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-28 05:30:47 +00:00
Code Issues Projects Releases Packages Wiki Activity
12298 commits 173 branches 41 tags 308 MiB
Commit graph

670 commits

Author SHA1 Message Date
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
Riku Salminen
8814980a06 Emeralds and tokens now reset when restarting marathon mode in first level 2020-11-14 19:18:36 +02:00