fickleheart
7fc1f02b07
Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
...
# Conflicts:
# src/doomdef.h
# src/g_game.c
# src/p_user.c
2019-03-19 22:17:25 -05:00
wolfy852
2b66daf12d
Remove P_CanRunOnWater
2019-03-11 00:28:30 -05:00
fickleheart
ca401aac8a
Try to keep the RNG seed in sync
2019-02-16 14:24:00 -06:00
Sal
910df92d5a
Merge branch 'expose-more-lua-stuff' into 'next'
...
More Lua stuff + PlayerCmd hook
See merge request KartKrew/Kart-Public!28
2019-01-26 13:19:41 -05:00
fickleheart
f5d491eda2
Merge remote-tracking branch 'remotes/internal/master' into movementchecks
...
# Conflicts:
# src/g_game.c
# src/p_user.c
2019-01-15 21:01:30 -06:00
Latapostrophe
c2aa6d4de6
Expose some more Kart functions, freeplay and rankings bumpers are now hud stuff you can toggle, + experimental playercmd hook
2019-01-13 14:40:48 +01:00
TehRealSalt
cff7d2795d
Expose S_ShowMusicCredit to Lua
2019-01-09 21:17:24 -05:00
SeventhSentinel
73542c008c
merge srb2 next
2019-01-05 15:59:23 -05:00
Latapostrophe
b7d7472a88
Merge branch 'next' into SRB2-CHAT
2018-12-23 22:53:24 +01:00
Latapostrophe
619dd9d08a
Fixed various issues: added some free()s, lua_optboolean, other things, and also made sure chat can't send empty messages.
2018-12-22 12:34:17 +01:00
mazmazz
e2b8ff26db
Fix lua_pop -> lua_remove use in G_SetCustomExitVars lua
2018-12-20 10:56:36 -05:00
Digiku
dd107724de
Merge branch 'lua-nextmapoverride' into 'next'
...
Lua: nextmapoverride & skipstats changing outside of G_ExitLevel
See merge request STJr/SRB2!396
2018-12-20 10:55:30 -05:00
TehRealSalt
42a9e66883
Let lib_gExitLevel call lib_gSetCustomExitVars, for reduced code duplication.
2018-12-18 15:03:54 -05:00
TehRealSalt
0e34e7f32f
G_SetCustomExitVars for setting nextmapoverride & skipstats
...
This is desparately needed for KIMOKAWAIII, since there's many instances I need to change nextlevel but still want to use the existing player exit stuff.
2018-12-18 14:48:04 -05:00
toaster
99e50250cf
Move some sidemove/forwardmove checks to playsim code rather than have them happen in ticcmd generation.
...
pGetPlayerControlDirection has to die since it was the only other usage of sidemove, and wasn't even relevant anymore anyways.
2018-12-18 18:05:11 +00:00
mazmazz
7a92c9d3d0
Mixed D&C fixes; replace a couple int's with INT32
2018-12-17 19:02:22 -05:00
Latapostrophe
45aba493c7
2.1.21 and all of the kart additions. Woo.
2018-12-17 20:43:59 +01:00
TehRealSalt
bef3bb23f8
Undo dc92bb49
2018-12-16 21:36:54 -05:00
TehRealSalt
97639848e1
Merge remote-tracking branch 'upstream/next' into kart-luatextures-backport
2018-12-16 21:22:06 -05:00
TehRealSalt
ec53e12294
Foolish
2018-12-16 18:19:53 -05:00
Alam Ed Arias
14e98df69b
Revert "Merge branch 'kart-luatextures-backport' into 'next'"
...
This reverts merge request !387
2018-12-16 22:57:39 +00:00
TehRealSalt
4ba23e1028
Expose R_TextureNumForName
...
Backport from SRB2Kart
2018-12-16 15:58:47 -05:00
Latapostrophe
25e6d5388c
merge conflict
2018-12-16 16:48:15 +01:00
TehRealSalt
0a00a0cebb
Revert "Add player taunt functions to Lua"
...
This reverts commit 09e9e2ba4d
2018-12-04 11:39:45 -05:00
TehRealSalt
09e9e2ba4d
Add player taunt functions to Lua
...
People have REALLY wanted these for their scripts
2018-12-03 20:28:07 -05:00
Monster Iestyn
33c1ac33f5
Merge branch 'next' into 21-version
...
# Conflicts:
# src/d_netcmd.c
2018-12-02 15:45:07 +00:00
TehRealSalt
5534017954
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
TehRealSalt
c70cf5908d
IsPlayerAdmin support, since admin was removed
...
# Conflicts:
# src/lua_baselib.c
2018-11-29 07:12:15 -06:00
Latapostrophe
5660e3fccd
Fixed conflict, swapped trapitem and inflictor, and moved the (void)inflictor;s
2018-11-28 19:41:01 +01:00
TehRealSalt
7b475d0f91
Fix exit music occasionally being wrong on race exit, add K_KartUpdatePosition to Lua
2018-11-28 00:45:33 -05:00
Latapostrophe
ed4477705d
Separated the damage hooks into multiple more precise hooks for players.
2018-11-27 18:27:43 +01:00
Latapostrophe
ec279da272
classic lat forgot whitespaces meme
2018-11-26 21:24:57 +01:00
Latapostrophe
0175e5b6a5
Possible fix for lack of mobjdamage and shoulddamage lua functionalities on players.
2018-11-26 21:23:41 +01: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
TehRealSalt
ad79b4b83b
Add S_StopSoundByID to Lua
...
It was brought up to me in another server that character creators might want to have unique engine sounds. While I don't want to support that ourselves, as we have consistent engines for gameplay reasons, this gives people the ability to script around it if they so choose.
Plus, it's just generally useful and I'm surprised vanilla hasn't added it, even though they have the function to stop ALL sounds on an object.
2018-11-14 15:35:16 -05:00
TehRealSalt
1e4d196e5e
Merge remote-tracking branch 'srb2public/next'
2018-11-08 17:37:05 -05:00
TehRealSalt
0feb1d557d
Foolish typo
2018-11-08 16:04:26 -05:00
TehRealSalt
df3c6051e8
Make K_FindJawzTarget and K_GetKartDriftSparkValue HUD safe
2018-11-08 15:11:22 -05:00
TehRealSalt
03bf72bf9e
This fake Lua function is probably no longer needed, now.
2018-11-08 15:02:19 -05:00
TehRealSalt
f5a45534fa
Make the texture stuff completely integer-based again, but expose R_TextureNumForName
...
Decided that being able to set a string and then have it return an integer when retrieving would ultimately be confusing, so let's just let the user handle the string functions.
2018-11-08 14:58:31 -05:00
TehRealSalt
aa3ad733af
Textures' string bits are now optional.
...
I thought about just exposing R_TextureNumForName and leaving it to the user, since that makes it obvious that this is still an integer field, but I also liked being able to just specify a string and be done with it. I'm not picky either way.
2018-11-07 22:01:57 -05:00
TehRealSalt
bc7e865e6b
Serious deep-cleaning to most of the kartstuff
...
More optional fields, more careful eye placed on return values and other checks
2018-11-07 21:04:57 -05:00
TehRealSalt
b9161871a1
typo
2018-11-07 18:24:44 -05:00
TehRealSalt
7ad0347ab0
Add missing K_ functions
2018-11-07 18:23:28 -05:00
TehRealSalt
868118d0cd
IsPlayerAdmin support, since admin was removed
2018-11-07 18:07:34 -05:00
TehRealSalt
7891a11fba
Battle points are visible
2018-11-01 00:57:38 -04:00
Latapostrophe
26093de2e9
Merge branch 'master' into chat-changes
2018-10-25 11:14:49 +02:00
toaster
791dc079ec
Merge branch 'master' into 'chat-changes'
...
# Conflicts:
# src/hu_stuff.c
2018-10-21 08:27:28 -04:00
Monster Iestyn
4edeeb6953
Add P_GetZAt to Lua
2018-10-20 21:08:59 +01:00
