Commit graph

23092 commits

Author SHA1 Message Date
mazmazz
3c5406ee04 Checkpoint 2018-08-19 16:25:12 -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
307450f8b3 S_FadeMusic[FromLevel] and S_StopFadingMusic other targets 2018-08-19 16:19:55 -04:00
mazmazz
df1463b378 S_FadeMusic[FromLevel] and S_StopFadingMusic implementation 2018-08-19 16:19:48 -04:00
mazmazz
f845a7fcfd I_SetInternalMusicVolume lua 2018-08-19 09:39:32 -04:00
mazmazz
c092f6724b I_SetInternalMusicVolume other targets 2018-08-19 09:39:11 -04:00
mazmazz
9e4d60e7ce I_SetInternalMusicVolume implementation 2018-08-19 09:38:57 -04:00
mazmazz
0df729f630 Framework for internal_volume; more fade code 2018-08-19 09:16:52 -04:00
mazmazz
ba523a5300 Merge branch 'musicplus-core' into musicplus-fade-sdltimer 2018-08-19 08:35:56 -04:00
mazmazz
33ac960cf9 Enable midi_volume, it actually works 2018-08-19 08:34:03 -04:00
mazmazz
67c8b6661e Fade checkpoint 2018-08-19 08:32:12 -04:00
mazmazz
4c730138f3 Add LIBGME ifdefs 2018-08-19 06:43:57 -04:00
Latapostrophe
a00b03b765 Fix capslock being wonky. 2018-08-19 11:25:20 +02:00
Latapostrophe
fe0b6dc600 Fix old chat detection. 2018-08-19 11:12:21 +02:00
Latapostrophe
da3fb0913b Changed chat position,
Added chat back tint
Fixed word wrapping glitches
2018-08-19 10:58:29 +02:00
mazmazz
68cc439347 Minor cleanup 2018-08-18 23:26:58 -04:00
mazmazz
c29d3ec3d7 Merge branch 'musicplus-core' into musicplus-fade-sdltimer
# Conflicts:
#	src/sdl/mixer_sound.c
2018-08-18 23:12:58 -04:00
mazmazz
2f7bdd4aa3 Fixed loop point counter bug 2018-08-18 21:29:18 -04:00
mazmazz
0a0537d486 Fix S_SetMusicLoopPoint wrong method; trigger only on is_looping 2018-08-18 20:54:56 -04:00
mazmazz
1869c21b6d Consolidate variable cleanup in mixer_sound
* Fix I_SetSongTrack MOD tracking returns the expected result
* Make music_loop hook stop digital song properly if not looping
2018-08-18 20:44:32 -04:00
mazmazz
6c2fd14b85 Loop point modulo by length 2018-08-18 20:29:19 -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
9d835614a9 I_GetMusicLoopPoint and I_SetMusicLoopPoint for other targets 2018-08-18 20:19:54 -04:00
mazmazz
1629a8cfd0 I_GetMusicLoopPoint and I_SetMusicLoopPoint implementation
* Stub pause for MIDI
* Fix MP3 tag wide char search
* Reset songpaused bool where appropriate
2018-08-18 20:19:44 -04:00
mazmazz
24270b4998 Lua merge fixes 2018-08-18 18:57:53 -04:00
Monster Iestyn
04b4e1d93b Fix glitches with flats visible when looking up/down in 1st person 2018-08-18 23:31:20 +01:00
mazmazz
e68187edfe Remove I_MIDIPlaying from Lua 2018-08-18 17:46:14 -04:00
mazmazz
4659bc241a Remove I_MIDIPlaying from other targets 2018-08-18 17:46:06 -04:00
mazmazz
22b2ef44b9 Remove I_MIDIPlaying 2018-08-18 17:45:57 -04:00
mazmazz
ec2b368c6d Lua for MusicType 2018-08-18 17:18:22 -04:00
mazmazz
14336ea1ae Other interfaces for I_MusicType 2018-08-18 17:18:13 -04:00
mazmazz
c9c1b24ad6 S_MusicType implementation; MOD support for Get/SetMusicPosition and MusicLength
* Misc MOD fixes
2018-08-18 17:17:53 -04:00
mazmazz
7080c93576 Added GME for GetMusicLength, SetMusicPosition, GetMusicPosition
* Misc fixes
2018-08-18 16:21:28 -04:00
mazmazz
8db0d04cb8 Support wide chars when searching for music tags (MP3) 2018-08-18 15:26:31 -04:00
mazmazz
2319a2ba53 Lua for I_GetMusicLength 2018-08-18 14:18:58 -04:00
mazmazz
7328f47b53 I_GetMusicLength declarations for other interfaces 2018-08-18 14:18:49 -04:00
mazmazz
e7a4f6d78f I_GetMusicLength implementation 2018-08-18 14:18:29 -04:00
mazmazz
0f3351d6a3 Merge branch 'musicplus-core' into musicplus-fade-sdltimer 2018-08-18 09:34:49 -04:00
mazmazz
0c7e4a05aa HAVE_LUA_MUSICPLUS for testing 2018-08-18 09:33:37 -04:00
mazmazz
3488501b03 Add "finalize" flag to Type 453 Stop Fade 2018-08-18 06:04:11 -04:00
mazmazz
de559a4e30 Merge branch 'le-fadefof' of https://git.magicalgirl.moe/STJr/SRB2Internal into le-fadefof 2018-08-18 05:35:55 -04:00
mazmazz
95a6299ff6 P_ResetFakeFloorFader: Unclamp rover->alpha from software levels 2018-08-18 05:31:41 -04:00
mazmazz
1307508314 Merge branch 'le-fadefof-ffloorthinker' into le-fadefof
# Conflicts:
#	src/p_saveg.c
#	src/p_spec.c
2018-08-17 17:12:49 -04:00
mazmazz
ccf5a0a810 Add alpha clamping so OpenGL conforms to Software's translucent levels 2018-08-17 17:07:07 -04:00
mazmazz
81d7039f8e Cleanup fade fake floor code 2018-08-17 15:59:34 -04:00
mazmazz
5a3499f833 Refactor function and variable names; change defaults for fake floor fader line flags 2018-08-17 15:25:25 -04:00
mazmazz
9b88c25fda Revised and re-organized P_DoFakeFloorAlpha fading procedure
* dosolid routine now refers to spawnflags
2018-08-17 14:49:33 -04:00
Digiku
20bb759ff6 Remove unnecessary totalring deduction condition
Because it would be triggered by !(maptol & TOL_NIGHTS) in the old code anyway
2018-08-17 09:11:59 -04:00
Digiku
9b0e9a58fe Revert "Checkpoint (unfinished): player->totalsphere"
This reverts commit 4aade072ef
2018-08-17 09:09:10 -04:00
mazmazz
1f51c8e076 Move fading thinker to ffloor_t.fadingdata 2018-08-17 02:28:52 -04:00