Sally Coolatta
8731c6b7a4
Another round of fixing up
...
- gametyperules are now fitting for kart, not applied to the whole codebase though
- a few more files compile
2020-08-11 16:13:17 -04:00
SteelT
d502ca31cb
Merge lua_hooklib.c
2020-08-10 12:34:38 -04:00
Sally Coolatta
e296e1309a
YAY, round 2
2020-08-09 21:02:56 -04:00
Sally Coolatta
9a9f7b8b1f
Merge lua_hooklib.c
2020-08-05 14:03:24 -04:00
Zachary McAlpin
70fc6854b1
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playercmd-kart-port
2020-07-30 15:37:41 -05:00
Zachary McAlpin
ad38289605
Bruh I screwed up
2020-07-17 00:33:07 -05:00
Zachary McAlpin
6877df94bc
Ported Lat's PlayerCmd hook to vanilla SRB2
2020-07-17 00:08:38 -05:00
Nev3r
e301d268ec
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
...
# Conflicts:
# src/hardware/hw_main.c
2020-06-30 20:29:48 +02:00
Zachary McAlpin
8376c8e987
I forgot to pop the error handler
2020-06-12 07:50:57 -05:00
Zachary McAlpin
75932c45d4
Updated LUAh_GameQuit to use new error handler
2020-06-11 15:11:01 -05:00
MascaraSnake
3ce62d7780
Merge branch 'next' into udmf-next
...
# Conflicts:
# src/p_mobj.c
# src/p_polyobj.c
2020-06-09 09:38:01 +02:00
Zachary McAlpin
d7228562e3
Updated LUAh_GameQuit
2020-06-05 13:18:22 -05:00
Zachary McAlpin
c7e64d635c
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-06-05 12:59:41 -05:00
Louis-Antoine
25cb181b8e
Refactor hook library a little
2020-05-30 20:28:45 +02:00
Louis-Antoine
a71f690241
Show the traceback when a Lua script error happens
2020-05-30 20:24:33 +02: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
Sally Coolatta
1788d29263
Merge branch 'master' into pet-robo
2020-05-12 22:38:23 -04:00
Nev3r
860c44d953
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
...
# Conflicts:
# src/lua_hooklib.c
2020-04-12 09:57:19 +02: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
James R
483243353b
Merge branch 'lua-hook-cleanup' into 'next'
...
Lua hook cleanup
See merge request STJr/SRB2!851
2020-04-09 19:40:09 -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
Sally Cochenour
ff621d3e46
Skins, rudimentary ticcmd building for bots
2020-03-28 12:39:27 -04:00
Sally Cochenour
751fd9ad1b
Start on bots, doesn't work
2020-03-27 23:51:49 -04:00
Zachary McAlpin
3b93250c55
Moved LUAh_GameQuit(void) function to the end of the lua_hooklib.c
2020-03-24 22:55:25 -05:00
Zachary McAlpin
61447c20be
Screw merge conflicts
2020-03-24 20:38:46 -05:00
MascaraSnake
9b76d3af6f
Merge branch 'next' into udmf-next
...
# Conflicts:
# extras/conf/Includes/SRB222_linedefs.cfg
# extras/conf/Includes/SRB222_misc.cfg
# src/p_spec.c
2020-03-21 20:04:31 +01:00
Louis-Antoine
46df2b9551
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
Louis-Antoine
5318e41f26
Fix misleading naming
2020-03-19 14:40:12 +01:00
Louis-Antoine
85d0a92eb4
Simplify hook code
2020-03-19 14:38:42 +01:00
fickleheart
7bf9bc4b9e
Merge remote-tracking branch 'upstream/next' into lua-music
2020-03-18 22:43:07 -05:00
fickleheart
ecb8a6f4e2
More union types for the union type god
2020-03-18 22:42:31 -05:00
fickleheart
95a01de67d
Clean up after myself
2020-03-18 22:38:51 -05:00
fickleheart
2176136480
Rename hook to ShouldJingleContinue
2020-03-18 22:35:21 -05:00
Monster Iestyn
f3bfa2b1db
Merge branch 'master' into next
2020-03-15 20:32:43 +00:00
Zachary McAlpin
9bb2aa262e
Created GameQuit hook, but I need to decide where to execute it
2020-03-12 12:22:04 -05:00
Nev3r
63fb8f846b
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-03-11 09:31:31 +01:00
Latapostrophe
af4922b53e
VoteThinker Hook for Lua
2020-03-10 18:58:44 +01:00
Monster Iestyn
f186def0bf
Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff
...
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
2020-03-09 13:54:56 +00:00
Monster Iestyn
97f8526e01
Merge branch 'follow-is-mobj' into 'next'
...
Turn FollowMobj into a mobj hook
See merge request STJr/SRB2!803
2020-02-29 12:48:39 -05: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
Sally Cochenour
18e3134efd
Make hook_FollowMobj a mobj hook instead of a player hook
...
Makes more logical sense, as if you have a custom follow item for a custom skin, you probably want your new thinker to only run for your new MT_ and not the vanilla ones.
2020-02-20 16:40:39 -05:00
James R
2274129f57
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
MascaraSnake
c2311dca45
Merge branch 'next' into udmf-next
2020-02-18 18:39:11 +01:00
Jaime Passos
304806d221
Fix LUAh_SeenPlayer not working
2020-02-17 23:06:38 -03: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
MascaraSnake
ebe467a664
Merge branch 'udmf-next' into stringargs
2020-01-11 16:03:38 +01:00