Commit Graph

68 Commits

Author SHA1 Message Date
LJ Sonic d325c7e6d3 The year is 2021 2021-05-07 17:45:56 +02:00
lachablock 6ea9653681 Add PlayerHeight and PlayerCanEnterSpinGaps Lua hooks 2021-03-25 21:41:09 +11: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 e55d842d7f Kill SEENAMES 2020-12-12 02:11:23 -08:00
GoldenTails 59d2646593 Send a `quitting` argument to the GameQuit Lua hook 2020-11-29 08:30:50 -06:00
Steel Titanium ac7781a3b3 Expose more music functions to Lua 2020-10-31 21:15:41 -04:00
Zachary McAlpin d26c7654ff Ported Lat's PlayerCmd hook to vanilla SRB2 2020-07-17 00:08:38 -05:00
Zachary McAlpin 31b19f69a2 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-04-09 20:12:11 -05:00
James R 2fda89f1c3 Merge branch 'bot-respawn-hook' into 'next'
BotRespawn hook

See merge request STJr/SRB2!804
2020-04-09 19:52:25 -04:00
Zachary McAlpin 21353f1209 Screw merge conflicts 2020-03-24 20:38:46 -05:00
Louis-Antoine e3cbdf8fab Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
fickleheart e0badd1e5b Rename hook to ShouldJingleContinue 2020-03-18 22:35:21 -05:00
Zachary McAlpin bb08b55b43 Created GameQuit hook, but I need to decide where to execute it 2020-03-12 12:22:04 -05:00
fickleheart f2c968dea8 Add JingleStatus hook for carrying custom jingle tunes
The extra argument is the music name, as passed into
P_PlayJingleMusic(player, musname), to run the hook for, optional.
Arguments are (player, musname) - the latter to allow global hooks
that still differentiate between different tracks.
2020-02-23 17:20:44 -06:00
James R 7060083db5 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Sally Cochenour 934808ef62 BotRespawn hook
Lets you force when and when not to respawn the bot
2020-02-12 14:16:23 -05:00
Louis-Antoine f209721ded Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into keep-body
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
2020-01-22 03:57:22 +01:00
Louis-Antoine d374bf4f9b Let clients rejoin the server without losing their status
This is accomplished by simply preserving
the player's body after disconnecting.

Bodies will despawn after the number of minutes
specified by the "rejointimeout" console variable (float).
A value of 0 disables the feature completely.

Clients rejoining are identified by their IP address,
and may rejoin even if the server is full or joins are disabled,
for as long as their body remains.

From a technical standpoint, when the user disconnects,
the player they were controlling does not leave,
the underlying player_t just keeps working normally,
except it does not receive any input anymore.
When the user reconnects, they are simply "relinked"
to their player_t.

Those "soulless" players can be identified through
their "quittime" field, which is the number of tics
elapsed since the user disconnected, or zero
if still connected. "quittime" is exposed to Lua.
2020-01-22 03:05:08 +01:00
Zachary McAlpin 11d21dd950 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2020-01-08 18:52:56 -06:00
James R 0bbc11c2a9 Merge branch 'lua-neatstuff' into 'next'
Extra functionality for lua

See merge request STJr/SRB2!601
2020-01-05 20:54:17 -05:00
Zachary McAlpin dc51ba6b64 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2020-01-01 17:11:19 -06:00
Jaime Passos 35ff383a4a Rename ``seenplayer`` to ``seenfriend`` 2020-01-01 15:17:29 -03:00
Nami ef4840555e Add MobjLineCollide hook 2019-12-31 15:17:02 -08:00
Jaime Passos 1c048275da **NEW!** hook_SeenPlayer 2019-12-31 14:37:45 -03:00
Nami a36920808b Revert changes to searchBlockmap because on reflection, the benefits didn't outweigh breaking every current usage of it
Readd ThinkFrame in its original position
PostThinkFrame now runs at the end of P_Ticker, only MapEnd runs after it
2019-12-30 19:04:27 -08:00
Nami 58dd578b09 Let's try this again! 2019-12-29 20:36:24 -08:00
Zachary McAlpin 9fe20aa1a3 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2019-12-26 17:29:54 -06:00
Jaime Passos a657392d39 ViewpointSwitch improvements. 2019-12-23 20:22:57 -03:00
Zachary McAlpin 124a0754a6 Revert "Added CalculateCamera Hook"
This reverts commit 9f82cdb401.
2019-12-19 17:21:55 -06:00
Zachary McAlpin f5c2341f59 Revert "Fix CalculateCamera compiling error"
This reverts commit c1465c5acc.
2019-12-19 17:21:46 -06:00
Zachary McAlpin c1465c5acc Fix CalculateCamera compiling error 2019-12-19 17:17:17 -06:00
Zachary McAlpin 9f82cdb401 Added CalculateCamera Hook 2019-12-19 16:41:25 -06:00
Jaime Passos 5da55e8b76 Shadowed variable declarations whoopsie!!! uwu 2019-12-18 23:53:26 -03:00
Jaime Passos be5fd1a0db TeamSwitch hook for Lua 2019-12-18 23:40:58 -03:00
Jaime Passos 0421c81e04 ViewpointSwitch hook for Lua 2019-12-18 20:43:54 -03:00
Zachary McAlpin 87b816e408 Added PlayerThink hook 2019-12-14 15:28:24 -06:00
Steel Titanium d415cd5c6d
Update copyright date on source files 2019-12-06 13:49:42 -05:00
Steel Titanium 0f79396757
New intermission thinker hook 2019-10-13 20:50:46 -04:00
toaster 3eb9b85fd4 "PlayerCanDamage" hook!
* Takes function(player, mo) input.
* Return TRUE for stating that yes, the player is in a state that can cause contact damage, do with that what you will.
* Return FALSE for stating that no, the player is weak and vulnerable and cannot cause contact damage, do with that what you will.
* Return NIL for allowing the function to continue regular operation.

Fills a different ideological niche than ShouldDamage - that's for determining whether damage dished between two objects should happen, this is for determining which way around damage should be dished when considering a player-object interaction.

Or, in other words, think of it as "ShouldDamage is whether damage that has been requested should be granted, for object-object interaction, while PlayerCanDamage is for whether global player properties should cause damage to enemies and monitors in the first place, like spinning, hammering or stomping."
2019-06-19 12:55:05 +01:00
mazmazz 075f28b7c8 WIP 20190101 merge
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
2019-01-02 01:09:15 -05:00
Jimita 6d7689c1a7
Merge branch 'next' into lua_mapchange 2018-11-30 15:10:59 -02:00
MPC 54cae84849 Change MapChange so Lua returns the map number you change 2018-11-30 14:01:40 -03:00
Monster Iestyn 1b2aea81dc Merge branch 'master' into next 2018-11-25 20:39:17 +00:00
mazmazz ea7162a76a Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
Monster Iestyn 268bde3fdf Merge branch 'public_next'
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
#	src/dehacked.c
#	src/g_game.h
#	src/hardware/hw_draw.c
#	src/hardware/hw_main.c
#	src/lua_baselib.c
#	src/lua_hook.h
#	src/lua_hooklib.c
#	src/lua_hudlib.c
#	src/lua_libs.h
#	src/lua_maplib.c
#	src/lua_script.c
#	src/m_misc.h
#	src/p_mobj.c
#	src/s_sound.c
#	src/sdl12/mixer_sound.c
#	src/w_wad.c
2018-11-10 15:41:57 +00:00
Monster Iestyn d8f3a20e65 Merge branch 'Playerquit_hook' into 'next'
"PlayerQuit" Lua Hook

See merge request STJr/SRB2!127
2018-11-08 15:53:35 -05:00
toasterbabe 844416855f Smiles follow-mobj initial support! Still using a Lua hook to follow closely behind, but now it doesn't need to be a generic thinkframe. Woo! 2017-10-02 14:08:58 +01:00
Monster Iestyn a6f830ddff Add the "MapThingSpawn" hook to Lua 2017-04-15 21:41:22 +01:00
Monster Iestyn e3ded1671c Added MobjMoveBlocked Lua hook
Also slightly edited P_XYMovement to properly check the mobj still exists before checking its eflags for MFE_SPRUNG, while I was at it
2017-01-21 23:49:18 +00:00
Inuyasha 37c8ef6369 Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal 2016-12-22 17:46:39 -08:00