thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-03 06:33:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4667 commits 2 branches 14 tags 206 MiB
Commit graph

141 commits

Author SHA1 Message Date
mazmazz
7aee66592f Lua P_RestoreMusic else if fix 2018-09-18 15:12:09 -04:00
mazmazz
9457fe15bf Merge branch 'master' into musicplus-core 2018-09-18 12:20:56 -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
95ea520ad1 MusicPlus core: Lua separation fixes 2018-09-18 10:32:38 -04:00
mazmazz
ce37b8f121 S_ChangeMusicAdvanced -> S_ChangeMusicEx 2018-09-16 23:10:23 -04:00
mazmazz
8315170069 Separate Lua from musicplus-core 2018-09-16 23:09:37 -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
mazmazz
cc6c9d878d Lua add S_MusicName 2018-08-25 08:08:30 -04:00
mazmazz
e1a8319013 Lua S_MusicInfo fix and FMOD GME fix: play song in I_PlaySong, not I_LoadSong 2018-08-24 13:12:14 -04:00
mazmazz
5188dcfd87 Lua method reordering for Musicplus 
* Change to S_MusicName to S_MusicInfo for API
 2018-08-23 21:23:55 -04:00
mazmazz
dbd7cce52c Lua FadeMusicFromVolume, GetMusicName refactor 2018-08-21 08:54:23 -04:00
mazmazz
32a7bee02c Lua comment 2018-08-20 01:14:16 -04:00
mazmazz
8ea82a98d7 Lua player argument fixes, GetMusicLength and FadeMusic 2018-08-20 00:21:35 -04:00
mazmazz
0a41485b60 I_FadeOutStopMusic, I_FadeInStartDigSong, S_ChangeMusic lua 2018-08-19 22:06:09 -04:00
mazmazz
ac9167b654 S_FadeMusic[FromLevel] and S_StopFadingMusic Lua 
* Fixed some arg position weirdness with other music lua funcs
 2018-08-19 16:20:14 -04:00
mazmazz
f845a7fcfd I_SetInternalMusicVolume lua 2018-08-19 09:39:32 -04:00
mazmazz
c64686d8c6 I_GetMusicLoopPoint and I_SetMusicLoopPoint for Lua 
* Fix S_GetMusicLength for player compatibility
 2018-08-18 20:20:18 -04:00
mazmazz
24270b4998 Lua merge fixes 2018-08-18 18:57:53 -04:00
mazmazz
e68187edfe Remove I_MIDIPlaying from Lua 2018-08-18 17:46:14 -04:00
mazmazz
ec2b368c6d Lua for MusicType 2018-08-18 17:18:22 -04:00
mazmazz
2319a2ba53 Lua for I_GetMusicLength 2018-08-18 14:18:58 -04:00
mazmazz
49c392334e Hide MusicPlus lua behind an #ifdef HAVE_LUA_MUSICPLUS 
# Conflicts:
#	src/lua_hook.h
#	src/lua_hooklib.c
#	src/p_user.c
 2018-08-15 03:37:11 -04:00
mazmazz
da5fd51feb Fix merge errors 2018-08-15 02:42:50 -04:00
mazmazz
c912fab1da Lua: Make P_RestoreMusic follow the non-local player nil output convention 2018-08-15 02:29:26 -04:00
mazmazz
456652021e Lua: Fix music functions not returning proper values 
# Conflicts:
#	src/lua_baselib.c
 2018-08-15 02:29:04 -04:00
mazmazz
2e3837e656 Lua: Make S_SpeedMusic and S_ChangeMusic return nil for invalid players 2018-08-15 02:23:18 -04:00
mazmazz
8e087a04b4 Music lua: Return nil for invalid players and non-nil for valid players 
# Conflicts:
#	src/lua_baselib.c
 2018-08-15 02:22:52 -04:00
mazmazz
9b50322924 Make S_StopMusic return nil for invalid player, true otherwise 2018-08-15 02:21:18 -04:00
mazmazz
21ec9d49fe Lua S_GetMusicPosition: Remove erroneous position input line 
# Conflicts:
#	src/lua_baselib.c
 2018-08-15 02:20:56 -04:00
mazmazz
5b504509c0 Lua: Make S_GetMusicPosition and S_SetMusicPosition return nil when non-local player is passed 2018-08-15 02:19:12 -04:00
mazmazz
2c4af751d2 Lua: Added player_t input to S_DigitalPlaying, S_MidiPlaying, S_MusicPlaying, S_MusicPaused, S_MusicName 2018-08-15 02:19:06 -04:00
mazmazz
8d1b4ec54e Add player parameter to S_GetMusicPosition lua 
# Conflicts:
#	src/lua_baselib.c
 2018-08-15 02:18:46 -04:00
mazmazz
5e3e23c779 Add S_DigitalPlaying 2018-08-15 02:10:53 -04:00
mazmazz
5197f69c6f Refactor to SetMusicPosition, GetMusicPosition 
# Conflicts:
#	src/lua_baselib.c
#	src/nds/i_sound.c
#	src/sdl12/mixer_sound.c
#	src/sdl12/sdl_sound.c
#	src/win32ce/win_snd.c
 2018-08-15 02:10:46 -04:00
mazmazz
ca3ceb30b9 S_MusicName, S_MusicExists, S_PauseMusic lua, S_ResumeMusic lua 
# Conflicts:
#	src/lua_baselib.c
 2018-08-15 02:01:34 -04:00
mazmazz
de4d4e87e1 Implement I_MusicPaused in SDL2, SDL1.2, and FMOD; console and lua commands 
# Conflicts:
#	src/sdl12/mixer_sound.c
 2018-08-15 01:55:03 -04:00
mazmazz
e2c40e63cf Lua PositionMusic switch to UINT32 2018-08-15 01:52:20 -04:00
mazmazz
ffa2bfcd22 Lua PositionMusic/GetPositionMusic and console TUNES position 2018-08-15 01:50:19 -04:00
mazmazz
ed83e09616 Lua funcs MidiPlaying/MusicPlaying 2018-08-15 01:44:11 -04:00
toasterbabe
e158a405f3 * Add new damagetype flag (DMG_CANHURTSELF) that allows a player to hurt themselves indirectly. 
* Add damagetype to P_RadiusAttack (optinteger in lua, A_Explode var1).
* Removed the prevention of MF_BOSS objects from getting P_RadiusAttacked. This was a holdover from DooM (I checked) - a way to prevent the Cyberdemon from gibbing itself when firing point blank into a wall, and also a way to make it and the Spider Mastermind harder.
* Enemies are solid to other enemies movement-wise now.
* (Fun little aside - if you remove MF_SOLID from a monitor, it now behaves like they did in Sonic Adventure (poppable by colliding with, not just attacking).
* Fixed Metal Sonic battle conflict in MF_PAIN/mass not picked up earlier.
* Miscellaneous tiny code tweaks.
 2018-05-08 23:26:36 +01:00
toasterbabe
504f162b59 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into delag_maces 
# Conflicts:
#	src/p_mobj.c
 2018-04-07 01:54:43 +01:00
toasterbabe
1ac48b08d0 Mace optimisation! 
* Handle all chain objects as a hnext/hprev chain.
* When removing mobjs with hnext/hprev, "repair the chain" (make the h links meet).
* Fix hidden slings, which I accidentially broke when I revamped maces the first time.
* Kill MF2_MACEROTATE. Not needed for anything anymore.
* P_MaceRotate now available to Lua to make up for it.
* Related: Made modifying hnext/hprev using Lua safer, so it keeps the reference counts in play.
 2018-04-01 20:54:19 +01:00
toasterbabe
c959806e23 * M_Random function access to v! (so v.RandomFixed(), etc...) 
* Remove deprecated P_Random() from Lua.
 2018-03-20 15:00:27 +00:00
toaster
82a868ec8f Merge branch 'lua-sector-find-funcs' into 'master' 
Lua sector find funcs

See merge request STJr/SRB2Internal!127
 2017-11-02 16:46:16 -04:00
toaster
c84d4261d1 Merge branch 'unca_scrooge' into 'master' 
The hardcoded part of ACZ3 so far

See merge request STJr/SRB2Internal!124
 2017-11-02 16:43:11 -04:00
Monster Iestyn
2cccb81d7f Merge branch 'master' into lua-sector-find-funcs 2017-11-01 19:14:44 +00:00
Monster Iestyn
440ada120d Merge branch 'master' into lua-action-userdata 2017-10-30 21:33:40 +00:00
Monster Iestyn
1d11797b47 Added six new functions from p_spec.c/h to Lua 2017-10-30 20:09:41 +00:00