thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-03-27 05:21:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
9132 commits 2 branches 14 tags 206 MiB
Commit graph

9132 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz
baa4c30e99 Also center non-NiGHTS players on NiGHTS bumpers 2018-08-15 19:09:54 -04:00
mazmazz
6010822c84 Use more efficient position setting. For Z, also adjust for bumper mobj scale. 2018-08-15 18:50:28 -04:00
mazmazz
1381ffc3e6 Fix NiGHTS Bumper player positioning 2018-08-15 18:42:20 -04:00
mazmazz
22e95a58da Recalc capsule timing when leaving the capsule during destruct sequence (somehow) 
* Would be nice to have more sophisticated behavior, e.g., resume the old timing; or drop out the capsule entirely. But how often is this case really going to happen?
 2018-08-15 13:59:27 -04:00
mazmazz
8a348794a3 Fix issue where capsule immediately re-triggers if player gains rings during destruct 2018-08-15 13:49:03 -04:00
mazmazz
c072b15e4f Fixed capsule timing logic 
* Force a total time, stretch out sphere deduction within that time
* Make it more readable
 2018-08-15 13:38:15 -04:00
mazmazz
3288b73ad0 Make camera further if on-foot and destroying the Egg Capsule 2018-08-15 12:29:06 -04:00
mazmazz
513a0a54ec Counter fix 2018-08-15 12:22:46 -04:00
mazmazz
79ebbdc360 Merge branch 'nights-onfootcapsulefix' into nights-fastercapsule 2018-08-15 12:09:46 -04:00
mazmazz
10f8337347 Checkpoint: Basic functions 2018-08-15 12:07:08 -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
b24efc7439 Fix #6 #7 SDL looping and counter bugs when looping=false 
# Conflicts:
#	src/sdl12/mixer_sound.c
 2018-08-15 02:15:05 -04:00
mazmazz
afa71ec7cd SDL: Fix looping bug when looping=false; reset bytes counter when non-looping 
# Conflicts:
#	src/sdl12/mixer_sound.c
 2018-08-15 02:11:17 -04:00
mazmazz
074f43f377 Undoing malloc for S_MusicName, pass music_name instead. 
I don't think there's a reason for copying to a new var.
 2018-08-15 02:11:01 -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
45581b263b S_MusicName copy music_name to new buffer (is this ok?) 2018-08-15 02:07:51 -04:00
mazmazz
3da9a9c4d0 Support mflags and looping in MusicChange hook 
# Conflicts:
#	src/lua_hook.h
 2018-08-15 02:07:33 -04:00
mazmazz
183f94091b Implemented MusicChange lua hook 
# Conflicts:
#	src/lua_hook.h
#	src/lua_hooklib.c
 2018-08-15 02:06:43 -04:00
mazmazz
7eabad83a1 Another loop fix to resolve music_bytes not resetting on non-looppoint tracks 
# Conflicts:
#	src/sdl12/mixer_sound.c
 2018-08-15 02:03:04 -04:00
mazmazz
58727a3bba SDL mixer: Fix no looping bug when changing song position 
# Conflicts:
#	src/sdl12/mixer_sound.c
 2018-08-15 02:02:33 -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
10f989f906 Implement I_MIDIPlaying, I_MusicPlaying, I_MusicPaused in other targets 
# Conflicts:
#	src/nds/i_sound.c
#	src/sdl12/sdl_sound.c
#	src/win32ce/win_snd.c
 2018-08-15 01:59:01 -04:00
mazmazz
6841f90562 Use Mix_PausedMusic instead of our own music_paused flag in SDL2/SDL1.2 I_MusicPaused 
# Conflicts:
#	src/sdl12/mixer_sound.c
 2018-08-15 01:55:49 -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
0f5a7e43a1 Fix SDL music counter pause issue 2018-08-15 01:54:17 -04:00
mazmazz
01eeefded7 Remove MUSICPOS command, can be done in lua 2018-08-15 01:53:59 -04:00
mazmazz
53c176e922 Add S_MidiPlaying and S_MusicPlaying via I_MIDIPlaying and I_MusicPlaying 
# Conflicts:
#	src/sdl12/mixer_sound.c
 2018-08-15 01:53:45 -04:00
mazmazz
9604fe2e22 MUSICPOS console command 2018-08-15 01:52:35 -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
mazmazz
44c3928d82 Add S_MidiPlaying and S_MusicPlaying via I_MIDIPlaying and I_MusicPlaying 
# Conflicts:
#	src/sdl12/mixer_sound.c
 2018-08-15 01:43:51 -04:00
mazmazz
d23d77754e Fix SDL music position getting; dummy out position methods for MIDI 
# Conflicts:
#	src/sdl/mixer_sound.c
#	src/sdl12/mixer_sound.c
 2018-08-15 01:42:15 -04:00
mazmazz
6d82e03710 SDL fix for I_SetSongPosition 
# Conflicts:
#	src/sdl12/mixer_sound.c
 2018-08-15 01:40:54 -04:00
mazmazz
55ef2d1d20 Change get/set music position to UINT32 parameter, milliseconds 
# Conflicts:
#	src/d_netcmd.c
#	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 01:40:20 -04:00
mazmazz
f8f71422ca Initial attempt for get/set song position 
* Declared I_SetSongPosition, I_GetSongPosition
* Implemented S_PositionMusic and S_GetPositionMusic
* Exposed in console TUNES and lua
* Implemented set position in SDL, SDL12, WIN32
* Implemented get position in WIN32

# Conflicts:
#	src/nds/i_sound.c
#	src/sdl12/mixer_sound.c
#	src/sdl12/sdl_sound.c
#	src/win32ce/win_snd.c
 2018-08-15 01:38:06 -04:00
mazmazz
6ec3aa337c Checkpoint: Force Egg Capsule time at 60 tics 2018-08-15 00:59:29 -04:00
mazmazz
fd725050d0 Attempt 1: Guesstimate sphere pop rate and use that as the Capsule handling duration 2018-08-15 00:32:48 -04:00
mazmazz
9371441008 Nights capsule faster attract timing 2018-08-14 19:48:18 -04:00