stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-22 02:30:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
4004 commits 172 branches 41 tags 280 MiB
Commit graph

4004 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz
9a5800d2bb 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
95e4d0d423 Add player parameter to S_GetMusicPosition lua 
# Conflicts:
#	src/lua_baselib.c
 2018-08-15 02:18:46 -04:00
mazmazz
e0ab8c1ed0 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
11c6148d4b 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
a9776f7b25 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
44c7410a41 Add S_DigitalPlaying 2018-08-15 02:10:53 -04:00
mazmazz
47423a69ed 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
0ea40321ca S_MusicName copy music_name to new buffer (is this ok?) 2018-08-15 02:07:51 -04:00
mazmazz
34ea90600a Support mflags and looping in MusicChange hook 
# Conflicts:
#	src/lua_hook.h
 2018-08-15 02:07:33 -04:00
mazmazz
d14eedd700 Implemented MusicChange lua hook 
# Conflicts:
#	src/lua_hook.h
#	src/lua_hooklib.c
 2018-08-15 02:06:43 -04:00
mazmazz
79531b9683 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
2e9dba352a 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
662c366830 S_MusicName, S_MusicExists, S_PauseMusic lua, S_ResumeMusic lua 
# Conflicts:
#	src/lua_baselib.c
 2018-08-15 02:01:34 -04:00
mazmazz
eb52a14433 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
d39f804662 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
2483c11cc4 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
e4a6cb87d1 Fix SDL music counter pause issue 2018-08-15 01:54:17 -04:00
mazmazz
29904a21b2 Remove MUSICPOS command, can be done in lua 2018-08-15 01:53:59 -04:00
mazmazz
297a8d537a 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
25880643d4 MUSICPOS console command 2018-08-15 01:52:35 -04:00
mazmazz
a8d379a6da Lua PositionMusic switch to UINT32 2018-08-15 01:52:20 -04:00
mazmazz
eab4d6b989 Lua PositionMusic/GetPositionMusic and console TUNES position 2018-08-15 01:50:19 -04:00
mazmazz
c6f63d9e9b Lua funcs MidiPlaying/MusicPlaying 2018-08-15 01:44:11 -04:00
mazmazz
d47d18998b 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
2cf364ab8b 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
aed388976c SDL fix for I_SetSongPosition 
# Conflicts:
#	src/sdl12/mixer_sound.c
 2018-08-15 01:40:54 -04:00
mazmazz
8981ef2cdc 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
a4f7b17389 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
Nev3r
f19b7bfacf Merge branch 'horizon-line-hom-fix' into 'master' 
Horizon line HOM fix

See merge request STJr/SRB2Internal!152
 2018-08-12 03:48:20 -04:00
Monster Iestyn
30e4d2cd51 Merge branch 'polyobj-sky-plane-crash-fix' into 'master' 
Polyobject sky plane crash fix

See merge request STJr/SRB2Internal!146
 2018-08-10 15:40:43 -04:00
Monster Iestyn
299337f578 Merge branch 'leveltitle-tinkering' into 'master' 
Leveltitle tinkering

See merge request STJr/SRB2Internal!134
 2018-08-10 15:30:26 -04:00
Monster Iestyn
a5510cab5d Merge branch 'master' into polyobj-sky-plane-crash-fix 2018-08-10 20:06:12 +01:00
Monster Iestyn
d7830dfff4 Merge branch 'master' into horizon-line-hom-fix 2018-08-10 20:04:39 +01:00
Monster Iestyn
55fd60b29b Merge branch 'master' into leveltitle-tinkering 
# Conflicts:
#	src/hu_stuff.h
 2018-08-10 20:03:59 +01:00
Monster Iestyn
fa382c0233 Merge branch 'public_next' 2018-08-10 19:36:51 +01:00
Monster Iestyn
7ee9c5b0f4 Merge branch 'master' into next 2018-08-10 19:31:15 +01:00
Monster Iestyn
653fd3038d Merge branch 'woops!_all_trans' into 'master' 
Woops! All trans

See merge request STJr/SRB2!265
 2018-08-10 14:27:45 -04:00
Digiku
a439dce584 Merge branch 'hardcoding-nights-spheredamage' into 'master' 
NiGHTS: Handle sphere damage correctly upon timeout
* Spill spheres/chips, implement MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP
* Handle player->spheres and player->rings consistently

See merge request STJr/SRB2Internal!157
 2018-08-10 13:50:57 -04:00
Digiku
ed99f3a425 Merge branch 'nights-invertloopfix' into 'master' 
NiGHTS fix lap detection on inverted axis

See merge request STJr/SRB2Internal!138
 2018-08-10 13:49:42 -04:00
mazmazz
672e196aa4 Pandora's Box support for player->spheres 
Opting to handle this transparently via the Rings menu option. Doesn't seem worth making a separate entry for Spheres.
 2018-08-10 13:15:54 -04:00
MascaraSnake
04063ba3a2 Merge branch 'hardcoding-time-again' into 'master' 
Hardcoding time again

See merge request STJr/SRB2Internal!130
 2018-08-10 13:14:53 -04:00
mazmazz
4cb7036f51 SETSPHERES console command for debugging/cheating 
Fixed sphere spill bug where no spheres spill if player->rings is 0
 2018-08-10 13:06:53 -04:00
mazmazz
bd8316f49b Track player's previous mare rings with player->finishedrings. 
There may not be a point to this, other than to be consistent with how spheres are tracked. If non-special stage NiGHTS should tally a ring bonus, this may be useful.
 2018-08-10 04:05:20 -04:00
mazmazz
b05960431d Reset player->rings on denightserize and on new mare 2018-08-10 04:01:33 -04:00
mazmazz
14c17cf012 Tag damage fix error 2018-08-10 02:34:21 -04:00
mazmazz
62e288a664 Correct player->spheres deduction upon losing spheres 
player->rings appears to be used for ring/star pickups. Player never loses stars, so it seems player->rings should not be deducted in-level.

Therefore, just deduct player->spheres.
 2018-08-10 02:18:34 -04:00
mazmazz
e0f6dee8be MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP implementation 2018-08-10 02:18:24 -04:00
mazmazz
fe61678437 MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP entries 2018-08-10 02:18:20 -04:00
toaster
145c050e14 ...and R_DrawTranslucentSplat_8, even though it isn't used! 2018-08-09 17:08:20 +01:00
toaster
5daeaf529f Apply the double-colormap ordering fix to R_DrawTiltedTranslucentSpan_8 as well. 2018-08-09 16:56:43 +01:00