Monster Iestyn
94ad0b880f
Merge branch 'next' into 21-version
...
# Conflicts:
# src/d_netcmd.c
2018-12-02 15:45:07 +00:00
TehRealSalt
4507ee18fd
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
TehRealSalt
a71644f230
IsPlayerAdmin support, since admin was removed
...
# Conflicts:
# src/lua_baselib.c
2018-11-29 07:12:15 -06:00
Latapostrophe
d240cfef86
Fixed conflict, swapped trapitem and inflictor, and moved the (void)inflictor;s
2018-11-28 19:41:01 +01:00
TehRealSalt
261a50fe68
Fix exit music occasionally being wrong on race exit, add K_KartUpdatePosition to Lua
2018-11-28 00:45:33 -05:00
Latapostrophe
a6bea8483f
Separated the damage hooks into multiple more precise hooks for players.
2018-11-27 18:27:43 +01:00
Latapostrophe
2fdf91adb7
classic lat forgot whitespaces meme
2018-11-26 21:24:57 +01:00
Latapostrophe
69b5efa71c
Possible fix for lack of mobjdamage and shoulddamage lua functionalities on players.
2018-11-26 21:23:41 +01: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
TehRealSalt
fbc4fbfd56
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
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
TehRealSalt
5b6efcba0c
Merge remote-tracking branch 'srb2public/next'
2018-11-08 17:37:05 -05:00
TehRealSalt
bf1b9d2042
Foolish typo
2018-11-08 16:04:26 -05:00
TehRealSalt
6017bf8064
Make K_FindJawzTarget and K_GetKartDriftSparkValue HUD safe
2018-11-08 15:11:22 -05:00
TehRealSalt
6a240e9c32
This fake Lua function is probably no longer needed, now.
2018-11-08 15:02:19 -05:00
TehRealSalt
f027f2038e
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
fa3bb9b317
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
a146024cfd
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
3009c22312
typo
2018-11-07 18:24:44 -05:00
TehRealSalt
f2598898cf
Add missing K_ functions
2018-11-07 18:23:28 -05:00
TehRealSalt
fc9bd81910
IsPlayerAdmin support, since admin was removed
2018-11-07 18:07:34 -05:00
TehRealSalt
e59102365f
Battle points are visible
2018-11-01 00:57:38 -04:00
Latapostrophe
612ff4059c
Merge branch 'master' into chat-changes
2018-10-25 11:14:49 +02:00
toaster
9ad5b9da80
Merge branch 'master' into 'chat-changes'
...
# Conflicts:
# src/hu_stuff.c
2018-10-21 08:27:28 -04:00
Monster Iestyn
685c8312cb
Add P_GetZAt to Lua
2018-10-20 21:08:59 +01:00
TehRealSalt
71452edda2
Merge branch 'master' into new-spb
2018-10-19 17:45:06 -04:00
TehRealSalt
d93f09ccf4
Merge branch 'master' into net-screen
2018-10-19 15:59:13 -04:00
TehRealSalt
f559487527
SPB knockback is more punishing
...
Hopefully to prevent instances like the Megablock video, where SPB double-dips just because the 1st one wasn't enough but another is overkill
2018-10-18 20:49:30 -04:00
Latapostrophe
4b2cb6b4e5
HU_AddChatText cleanup for future use + chat mode Window (Hidden) added.
2018-10-10 21:24:55 +02:00
TehRealSalt
b2a9193e3b
Merge branch 'master' into sweet-new-kicks
2018-10-10 13:43:05 -04:00
TehRealSalt
b6ff542803
Merge branch 'master' into net-screen
2018-10-09 14:41:59 -04:00
TehRealSalt
68a06a14c8
Rocket Sneakers appear beside you
2018-10-07 18:53:46 -04:00
Sryder
9e1584fbb0
Fix the mixed declaration and code warnings that only don't appear currently because of a tiny Makefile issue.
2018-10-07 15:35:54 +01:00
TehRealSalt
37b5a9327c
Merge branch 'master' into net-screen
2018-10-05 16:13:25 -04:00
TehRealSalt
9b245c7bef
Minor splitscreen+netgame fixes
...
Mainly related to drawing Battle arrows or Hyudoro
2018-09-30 01:23:59 -04:00
toaster
3b5f195973
Spring *panels* now use sfx_kc2f again (but pogo spring *items* still do sfx_kpogos, in case you were worried).
2018-09-27 18:32:07 +01:00
mazmazz
4c0635f94b
MP Lua: FadeMusic signed/unsigned comparison fix (buildbots)
2018-09-19 19:55:22 -04:00
mazmazz
0bcc8ff26a
MP Lua: MusicExists Mixed D+C fix (buildbots)
2018-09-19 19:29:38 -04:00
mazmazz
a3664c3083
Lua P_RestoreMusic else if fix
2018-09-18 15:11:37 -04:00
mazmazz
9581814219
musicplus-lua 2.2 -> 2.1 backport
2018-09-18 11:52:29 -04:00
mazmazz
9c89bf3fef
MusicPlus core: Lua separation fixes
2018-09-18 11:39:08 -04:00
mazmazz
c213c23af3
420: Don't interrupt existing light fade on duration timing except EFFECT5
...
(cherry picked from commit 3b957c32517a8f5148940c0067af7e88a51d1fee)
2018-09-18 11:08:33 -04:00
mazmazz
32c48af258
MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport
2018-09-18 10:22:17 -04:00
mazmazz
cbf692fc52
Revert "Snap light level to software values (32 levels)"
...
This reverts commit 8ec3e23ed5
2018-09-09 13:43:00 -04:00
mazmazz
8ec3e23ed5
Snap light level to software values (32 levels)
...
* New properties `exactlightlevel` and `lightlevel` in `lightlevel_t`
2018-09-08 23:01:35 -04:00
mazmazz
07c6705bdb
Implemented tic-based light fading
...
* ML_BLOCKMONSTERS specifies destvalue and speed by texture offsets
* ML_NOCLIMB toggles tic-based logic
* Added props `duration`, `interval`, and `firsttic` to `lightlevel_t`
2018-09-08 22:10:51 -04:00
Latapostrophe
fe0b6dc600
Fix old chat detection.
2018-08-19 11:12:21 +02:00
SeventhSentinel
8dcee904a5
eggman
...
broken
2018-08-11 20:19:09 -04:00
TehRealSalt
6cdbb7c896
Flashing tics length depends on speed stat
...
Change to speed-weight when the bump buff gets added
2018-08-11 00:12:41 -04:00
