95e7e59179
Remove stupid dumbfuck #ifdefs
...
WHY THE FUCK DID THESE BREAK IT AAAAAAAAAAAAAAAAAAA
2020-04-07 05:24:38 -05:00
d4c69f137a
Fix unterminated #ifdef
2020-04-07 04:25:11 -05:00
bcfffefe43
Merge remote-tracking branch 'remotes/digiku/public-musicplus-lua' into awful-mix
...
Reimplements removed MusicPlus functions.
# Conflicts:
# src/lua_baselib.c
# src/lua_hook.h
# src/lua_hooklib.c
# src/lua_script.h
2020-04-07 03:41:26 -05:00
59df0c1187
Revert the removal of S_MusicExists
2020-04-07 02:56:45 -05:00
37c733b8c2
More explicit var names for countdown and countdown2
2020-03-11 07:37:33 +01:00
2e5608d33b
Push race countdowns and functions to set them
2020-03-10 12:57:30 +01:00
f61f7f4411
Merge remote-tracking branch 'remotes/pub/next' into v1
...
# Conflicts:
# src/d_netcmd.c
# src/r_main.c
# src/v_video.c
2019-05-12 03:40:02 -05:00
2c363c4e1e
Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next
...
# Conflicts:
# src/d_netcmd.c
# src/doomdef.h
# src/doomstat.h
# src/f_finale.c
# src/g_game.c
# src/hu_stuff.c
# src/m_menu.c
# src/p_spec.c
# src/p_user.c
# src/r_main.c
# src/r_things.c
# src/s_sound.c
# src/v_video.c
# src/y_inter.c
2019-05-06 22:40:12 -05:00
f720dd3ddb
Merge v1
2019-05-06 21:23:29 -04:00
4d967bcc8e
Finish this
...
Now that I was told that the spinout slowdown bug was caused by this I was 100% convinced that we need to remove all of this bullshit ASAP
2019-05-02 09:20:49 -04:00
9e15486926
Fix warnings
...
Remove entries from dehacked, remove P_DoJump, remove debug stuff
2019-05-02 02:51:13 -04:00
201466b1c1
Merge v1
2019-05-02 01:36:19 -04:00
f8fec8e625
Lua: fix K_PlayPowerGloatSound mistype
2019-04-06 21:59:58 -04:00
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
2b66daf12d
Remove P_CanRunOnWater
2019-03-11 00:28:30 -05:00
ca401aac8a
Try to keep the RNG seed in sync
2019-02-16 14:24:00 -06:00
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
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
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
cff7d2795d
Expose S_ShowMusicCredit to Lua
2019-01-09 21:17:24 -05:00
73542c008c
merge srb2 next
2019-01-05 15:59:23 -05:00
2bd794c006
Remove S_MusicExists lua
2019-01-02 06:26:18 -05:00
e2e345988a
Add safe lua music functions
...
S_MusicExists
S_SetInternalMusicVolume
S_StopFadingMusic
S_FadeMusic
S_FadeOutStopMusic
2019-01-02 04:58:03 -05:00
831752dc0a
Merge branch 'public-musicplus-core' into public-musicplus-lua
2019-01-02 04:25:30 -05:00
b7bb570f97
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-01 10:41:40 -05:00
b7d7472a88
Merge branch 'next' into SRB2-CHAT
2018-12-23 22:53:24 +01:00
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
e2b8ff26db
Fix lua_pop -> lua_remove use in G_SetCustomExitVars lua
2018-12-20 10:56:36 -05:00
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
42a9e66883
Let lib_gExitLevel call lib_gSetCustomExitVars, for reduced code duplication.
2018-12-18 15:03:54 -05:00
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
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
7a92c9d3d0
Mixed D&C fixes; replace a couple int's with INT32
2018-12-17 19:02:22 -05:00
45aba493c7
2.1.21 and all of the kart additions. Woo.
2018-12-17 20:43:59 +01:00
bef3bb23f8
Undo dc92bb49
2018-12-16 21:36:54 -05:00
97639848e1
Merge remote-tracking branch 'upstream/next' into kart-luatextures-backport
2018-12-16 21:22:06 -05:00
ec53e12294
Foolish
2018-12-16 18:19:53 -05:00
14e98df69b
Revert "Merge branch 'kart-luatextures-backport' into 'next'"
...
This reverts merge request !387
2018-12-16 22:57:39 +00:00
4ba23e1028
Expose R_TextureNumForName
...
Backport from SRB2Kart
2018-12-16 15:58:47 -05:00
25e6d5388c
merge conflict
2018-12-16 16:48:15 +01:00
0a00a0cebb
Revert "Add player taunt functions to Lua"
...
This reverts commit 09e9e2ba4d
2018-12-04 11:39:45 -05:00
09e9e2ba4d
Add player taunt functions to Lua
...
People have REALLY wanted these for their scripts
2018-12-03 20:28:07 -05:00
33c1ac33f5
Merge branch 'next' into 21-version
...
# Conflicts:
# src/d_netcmd.c
2018-12-02 15:45:07 +00:00
5534017954
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
c70cf5908d
IsPlayerAdmin support, since admin was removed
...
# Conflicts:
# src/lua_baselib.c
2018-11-29 07:12:15 -06:00
5660e3fccd
Fixed conflict, swapped trapitem and inflictor, and moved the (void)inflictor;s
2018-11-28 19:41:01 +01:00
7b475d0f91
Fix exit music occasionally being wrong on race exit, add K_KartUpdatePosition to Lua
2018-11-28 00:45:33 -05:00
ed4477705d
Separated the damage hooks into multiple more precise hooks for players.
2018-11-27 18:27:43 +01:00
ec279da272
classic lat forgot whitespaces meme
2018-11-26 21:24:57 +01:00
0175e5b6a5
Possible fix for lack of mobjdamage and shoulddamage lua functionalities on players.
2018-11-26 21:23:41 +01:00
Wolfy