toaster
b3d006b093
structs gunched
2021-04-17 00:27:13 +01:00
Sryder
8344ac3489
Actually just get rid of seenplayer and NAMECHECK altogether.
2021-03-03 18:03:41 +00:00
James R
98bcfc7cac
Conflicts e9bbdb8cc3 ef1ca357de
2021-02-27 03:35:38 -08:00
Sally Coolatta
9d7ec0ab8f
Merge SRB2 next
...
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
2021-02-27 05:18:36 -05:00
Sally Coolatta
d63b428565
Merge Kart-Public next
2021-02-27 02:16:21 -05:00
James R
956fd338f0
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
41f1b3b97c
Kill SEENAMES
2020-12-12 02:11:23 -08:00
GoldenTails
ded87cb54c
Send a quitting argument to the GameQuit Lua hook
2020-11-29 08:30:50 -06:00
James R
fe031088ae
Lua: "defrosting" global to tell how many tics are processing in the preticker
2020-11-24 19:32:01 -08:00
Sally Coolatta
fc934b38e1
Merge public next
2020-11-10 15:32:48 -05:00
Zachary McAlpin
7efb33a38e
Added PlayerThink hook
2020-11-05 21:23:22 -08:00
James R
cacca05ed3
PreThinkFrame and PostThinkFrame hooks
...
Changes from e4d1b9491c ,
4456ff50ab ,
20494c4c42 ,
ee0e68d8dc .
2020-11-05 21:04:25 -08:00
Steel Titanium
ef1ca357de
Expose more music functions to Lua
2020-10-31 21:15:41 -04:00
Sally Coolatta
7c2bd0d1c2
Merge remote-tracking branch 'srb2/next' into the-scary-22-merge
2020-10-24 20:50:58 -04:00
Sally Coolatta
3e446a167c
Restructure how damage works in kart COMPLETELY
...
Instead of doing its best to avoid P_DamageMobj, it embraces it, using the damagetype system to decide how the player takes damage. Overall less stupid.
2020-08-19 00:55:36 -04:00
Sally Coolatta
0dc21106e5
Lua stuff is done
2020-08-15 07:47:18 -04:00
Sally Coolatta
9a21b3a46b
g_demo compiles
2020-08-12 23:08:31 -04:00
Sally Coolatta
e296e1309a
YAY, round 2
2020-08-09 21:02:56 -04:00
SteelT
c5f9a586a0
Merge lua_hook.h
2020-08-04 00:58:37 -04:00
Zachary McAlpin
6877df94bc
Ported Lat's PlayerCmd hook to vanilla SRB2
2020-07-17 00:08:38 -05:00
Sally Coolatta
63917ffccc
The start of the scary 2.2 merge
...
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
Zachary McAlpin
b6a2c21db7
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-04-09 20:12:11 -05:00
James R
61a4fe06d5
Merge branch 'bot-respawn-hook' into 'next'
...
BotRespawn hook
See merge request STJr/SRB2!804
2020-04-09 19:52:25 -04:00
Wolfy
1d1b1514b4
Remove stupid dumbfuck #ifdefs
...
WHY THE FUCK DID THESE BREAK IT AAAAAAAAAAAAAAAAAAA
2020-04-07 05:24:38 -05:00
Wolfy
e9bbdb8cc3
Reimplement the MusicChange hook
...
why the fuck was this removed
2020-04-05 12:09:44 -05:00
Zachary McAlpin
61447c20be
Screw merge conflicts
2020-03-24 20:38:46 -05:00
Louis-Antoine
46df2b9551
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
fickleheart
2176136480
Rename hook to ShouldJingleContinue
2020-03-18 22:35:21 -05:00
Zachary McAlpin
9bb2aa262e
Created GameQuit hook, but I need to decide where to execute it
2020-03-12 12:22:04 -05:00
Latapostrophe
af4922b53e
VoteThinker Hook for Lua
2020-03-10 18:58:44 +01:00
fickleheart
5aebc0ed6d
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
2274129f57
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Sally Cochenour
4735788e60
BotRespawn hook
...
Lets you force when and when not to respawn the bot
2020-02-12 14:16:23 -05:00
Louis-Antoine
a997683d1c
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
c2682ac1b6
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
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