7060083db5
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
9248f12d55
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-10 23:01:10 -03:00
f02418e70c
Fix copy+paste goof
2019-12-06 15:21:41 -05:00
d415cd5c6d
Update copyright date on source files
2019-12-06 13:49:42 -05:00
2584241a44
Better ping implementation.
2019-11-17 20:22:47 -05:00
8057eeaaca
Merge remote-tracking branch 'jimita/renderswitch' into renderswitch
2019-09-10 18:12:01 -03:00
dc93cafda9
can i push this already?
2019-09-08 22:25:18 -03:00
c7e01a558e
initial stuff
2019-09-08 18:44:40 -03:00
2863ede7bf
initial stuff
2019-09-08 18:27:35 -03:00
384dc0674e
Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'""
...
This reverts commit 603d5805f7
2019-08-04 12:03:57 +01:00
603d5805f7
Revert "Merge branch 'musicplus-aug2019-b' into 'master'"
...
This reverts commit 56bfdb7113c29cfbef9b
2019-08-04 11:32:55 +01:00
fbaf5106fd
Revert djgppdos fade function inadvertent merge
2019-08-04 02:09:35 -04:00
5b0f7d2850
Merge branch 'master' into musicplus-sdlmixerx
2019-06-29 19:31:01 -04:00
9ec98c588f
Merge branch 'public_next'
2019-03-14 22:15:34 -04:00
075f28b7c8
WIP 20190101 merge
...
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
2019-01-02 01:09:15 -05:00
b7bb570f97
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-01 10:41:40 -05:00
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
8f87bf82cd
Merge branch 'master' into musicplus-core
2018-11-13 13:46:30 -05:00
b5c4b476a6
Merge branch 'public_next'
...
# Conflicts:
# src/d_main.c
# src/m_menu.c
# src/s_sound.c
# src/sdl/sdl_sound.c
2018-10-20 15:31:48 +01:00
a288b95458
Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup
2018-10-19 22:04:26 -04:00
d4e11762fa
Merge branch 'public_next'
...
# Conflicts:
# src/nds/i_sound.c
# src/r_data.c
# src/sdl12/mixer_sound.c
# src/sdl12/sdl_sound.c
# src/win32ce/win_snd.c
2018-10-19 22:46:19 +01:00
3886888b30
Fix missing commas and missed interface
2018-10-14 10:14:07 +01:00
6184f91dd3
Add an int to I_PlaySound to tell an interface which channel number SRB2 is using.
...
I've voided this out on other sound interfaces than SDL Mixer ones because I'm both not sure whether they need it, and not sure how to make them work with it if they do.
2018-10-13 23:01:11 +01:00
c5ea6b5efe
MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport
2018-09-18 10:22:17 -04:00
4d61f00b86
Refactor I_MusicType MusicPlaying and MusicPaused other targets
...
(cherry picked from commit 9e6eebeb8d
2018-09-14 10:45:39 -04:00
d535c14fc6
Refactoring and reordering other targets
...
(cherry picked from commit cf065e106f
2018-09-14 10:43:46 -04:00
17cf310b84
nodigimusic nomusic nosound refactor other targets
...
(cherry picked from commit 86f151db65
2018-09-14 10:35:56 -04:00
44557d9c9d
I_MusicPlaying, I_MusicPaused other targets
...
(cherry picked from commit d5ec388159
2018-09-14 10:28:35 -04:00
e58a8f4fe1
Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume other targets
...
(cherry picked from commit 9fb9386f84
2018-09-14 10:23:47 -04:00
46b53e8bae
Added I_GetMusicType and removed midimode variable: other targets
...
(cherry picked from commit 14b393ab16
2018-09-14 09:55:45 -04:00
b59aa27104
Loose ends other targets
...
(cherry picked from commit 9a5fc5f66a
2018-09-14 09:41:08 -04:00
4f075bfb5d
Update functions for other targets
2018-08-24 18:20:53 -04:00
a2d626384a
Merge branch 'music-cleanup' into musicplus-core
...
Pending rewrite of fade music changing
# Conflicts:
# src/android/i_sound.c
# src/djgppdos/i_sound.c
# src/i_sound.h
# src/s_sound.c
# src/s_sound.h
# src/sdl/mixer_sound.c
# src/sdl/sdl_sound.c
# src/win32/win_snd.c
2018-08-23 21:07:39 -04:00
cf065e106f
Refactoring and reordering other targets
2018-08-23 17:54:40 -04:00
86f151db65
nodigimusic nomusic nosound refactor other targets
2018-08-23 12:43:38 -04:00
d5ec388159
I_MusicPlaying, I_MusicPaused other targets
2018-08-23 12:31:01 -04:00
9fb9386f84
Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume other targets
2018-08-23 11:54:58 -04:00
14b393ab16
Added I_GetMusicType and removed midimode variable: other targets
2018-08-23 10:19:04 -04:00
9a5fc5f66a
Loose ends other targets
2018-08-23 09:37:02 -04:00
3ec1a122e0
Revert "Nix'd midimusicvolume other targets"
...
This reverts commit 58fbb4636f
2018-08-23 09:09:12 -04:00
75cbfab8c6
Playback routines other targets
2018-08-23 09:06:31 -04:00
0bc9576eb0
Revert "CHANGED MIND: Nix'd S_MIDIMusic, I_PlaySong, and I_RegisterSong"
...
This reverts commit 8b46bce155
2018-08-23 07:50:02 -04:00
8b46bce155
CHANGED MIND: Nix'd S_MIDIMusic, I_PlaySong, and I_RegisterSong
...
* music_lumpnum, music_data, music_handle are gone
* Relevant interfaces I_PlaySong are transferred to I_StartDigSong
2018-08-23 07:49:09 -04:00
58fbb4636f
Nix'd midimusicvolume other targets
2018-08-23 07:39:45 -04:00
87e37e21df
Merge branch 'public_next'
...
# Conflicts:
# src/sdl12/i_cdmus.c
# src/win32ce/win_cd.c
2018-08-21 15:40:54 +01:00
f6789a6eb7
I_FadeSongFromLevel -> I_FadeSongFromVolume refactor other targets
2018-08-21 08:54:04 -04:00
506db1e303
Interface name refactor: Music -> Song other targets
2018-08-21 06:22:42 -04:00
9410676737
I_FadeOutStopMusic, I_FadeInStartDigSong other targets
2018-08-19 22:05:55 -04:00
87b6fc613b
I_FadeMusicFromLevel/I_FadeMusic change for other targets
2018-08-19 17:02:27 -04:00
5117bdebfe
S_FadeMusic[FromLevel] and S_StopFadingMusic other targets
2018-08-19 16:19:55 -04:00
James R