Zachary McAlpin
6f60341aec
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook
2020-01-08 18:52:56 -06:00
James R
2a6cf10f79
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
7c0021aaac
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook
2020-01-01 17:11:19 -06:00
Jaime Passos
0ab6fe1fd8
Rename `seenplayer to seenfriend`
2020-01-01 15:17:29 -03:00
Nami
9219699b42
Add MobjLineCollide hook
2019-12-31 15:17:02 -08:00
Jaime Passos
a811021112
**NEW!** hook_SeenPlayer
2019-12-31 14:37:45 -03:00
Nami
4456ff50ab
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
e4d1b9491c
Let's try this again!
2019-12-29 20:36:24 -08:00
Zachary McAlpin
e4e233d4de
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook
2019-12-26 17:29:54 -06:00
Jaime Passos
c832d26ee9
ViewpointSwitch improvements.
2019-12-23 20:22:57 -03:00
Zachary McAlpin
324b05032c
Revert "Added CalculateCamera Hook"
...
This reverts commit b545a13312 .
2019-12-19 17:21:55 -06:00
Zachary McAlpin
435f70ff85
Revert "Fix CalculateCamera compiling error"
...
This reverts commit 91ebec08c6 .
2019-12-19 17:21:46 -06:00
Zachary McAlpin
91ebec08c6
Fix CalculateCamera compiling error
2019-12-19 17:17:17 -06:00
Zachary McAlpin
b545a13312
Added CalculateCamera Hook
2019-12-19 16:41:25 -06:00
Jaime Passos
b65c6e3745
Shadowed variable declarations whoopsie!!! uwu
2019-12-18 23:53:26 -03:00
Jaime Passos
e47f171533
TeamSwitch hook for Lua
2019-12-18 23:40:58 -03:00
Jaime Passos
0e3bf527a2
ViewpointSwitch hook for Lua
2019-12-18 20:43:54 -03:00
Zachary McAlpin
a51475d5b7
Added PlayerThink hook
2019-12-14 15:28:24 -06:00
Steel Titanium
a5cdb0a4b3
Update copyright date on source files
2019-12-06 13:49:42 -05:00
Steel Titanium
c20023d35f
New intermission thinker hook
2019-10-13 20:50:46 -04:00
toaster
6f1128c84d
"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
81352aece1
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
a32fb94e09
Merge branch 'next' into lua_mapchange
2018-11-30 15:10:59 -02:00
MPC
e745cb60fc
Change MapChange so Lua returns the map number you change
2018-11-30 14:01:40 -03:00
Monster Iestyn
d824e05a6f
Merge branch 'master' into next
2018-11-25 20:39:17 +00:00
mazmazz
c91b2b4456
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Monster Iestyn
7989e9a482
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
1200793a94
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
Louis-Antoine
db20bfb3c3
Generic mobj hooks are now run before mobjtype-specific mobj hooks, and player/linedef executor hooks now have their own lists
2016-12-15 21:05:54 +01:00
toasterbabe
85fb02aaf6
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions
...
# Conflicts:
# src/p_inter.c
# src/p_user.c
# src/st_stuff.c
2016-11-20 16:44:38 +00:00
toasterbabe
0ee2937392
Adding ShieldSpecial hook. (Activates under different circumstances to the JumpSpinSpecial hook, and can be used to cancel existing shield actions.)
2016-10-24 13:52:52 +01:00
Prisima the Fox
fcf2fe79e0
Oops; PlayerQuit isn't a boolean!
2016-10-20 23:25:47 -04:00
Prisima the Fox
cb62f08364
"PlayerQuit" hook
2016-10-20 22:23:50 -04:00
toasterbabe
59fccab8e5
Restructured things so nojumpdamage characters can use the elemental, bubblewrap and attract shields.
2016-10-20 20:55:15 +01:00
Monster Iestyn
0fb89c620d
Merge branch 'master' into damage-control
2016-09-30 21:05:44 +01:00
Monster Iestyn
ea65e9e54f
Add "damagetype" argument to functions for Lua hooks ShouldDamage, MobjDamage, MobjDeath and HurtMsg
2016-07-20 22:02:02 +01:00
toasterbabe
ac2ff5e386
CA_MELEE. Mostly complete.
...
* When moving slowly, P_InstaThrust at S_SKIN's maxdash forward, and set momz to S_SKIN's mindash upwards. Plays a tok noise (not thok). Hurts enemies/bosses, busts spikes/monitors/all types of bustable blocks.
* When moving quickly... doesn't do anything yet, but WILL do a slide.
Also, P_DoSpinDash is now renamed to P_DoSpinAbility, and CA_TWINSPIN users can bust all bustable blocks on collision too.
2016-07-17 21:31:15 +01:00
Inuyasha
f07585191b
copyright dates/statements updated and such
...
(no actual SLOC changes)
2016-05-17 17:42:11 -07:00
Alam Ed Arias
b9eed02123
whitespace clean
2016-04-07 16:34:36 -04:00
wolfy852
5c9aaf2fe4
Move hook into G_SpawnPlayer
2016-02-25 22:28:19 -06:00
wolfy852
db3797fd35
Add PlayerSpawn hook
2016-02-14 06:10:20 -06:00
Yukita Mayako
ecdf3412c0
Rewrote the entirety of lua_hooklib.c
...
This _should_ solve some significant performance
issues Lua experiences. If not, I will be very
upset for having wasted so much time and effort.
There will be bugs, this kind of thing needs to
be thuroughly tested and this is just the first
iteration of it.
2015-06-10 07:28:09 -04:00
Alam Ed Arias
404b5f666c
SRB2 2.1.12 release
2014-11-11 19:55:07 -05:00
Alam Ed Arias
c028c83235
SRB2 2.1.9 release
2014-08-03 23:49:33 -04:00
RedEnchilada
37d3780458
Add hook for chat messages, including csays
2014-06-18 15:28:09 -05:00
Alam Ed Arias
b93cb1b65a
SRB2 2.1 release
2014-03-15 13:11:35 -04:00