stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-27 13:10:43 +00:00
Code Issues Projects Releases Packages Wiki Activity
6784 commits 173 branches 41 tags 307 MiB
Commit graph

6784 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz
c5d4ff5712 Merge branch 'musicplus-core' into musicplus-feature-postboss 2018-09-16 23:32:18 -04:00
mazmazz
48445c7733 Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-09-16 23:18:11 -04:00
mazmazz
d7f4c9be84 S_ChangeMusicAdvanced -> S_ChangeMusicEx 2018-09-16 23:10:23 -04:00
mazmazz
917dea7070 Separate Lua from musicplus-core 2018-09-16 23:09:37 -04:00
mazmazz
60ba0f5911 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-16 22:42:57 -04:00
mazmazz
4b55415add New colormap netsync fixes 2018-09-16 22:42:36 -04:00
mazmazz
0a998fec02 New colormap netsync fixes 2018-09-16 22:41:08 -04:00
mazmazz
d4a18fd456 455: Fade colormap netsync use new colormap saving 2018-09-16 20:27:24 -04:00
mazmazz
545602d94d Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-16 20:25:59 -04:00
mazmazz
4cdbc7249f Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector 2018-09-16 20:25:46 -04:00
mazmazz
e9b3cba300 Improve MIDI console parameters 
* Allow multiple SF2 for midisoundfont
* Correctly branch when toggling midiplayer or midisoundfont
 2018-09-16 16:02:26 -04:00
mazmazz
afe4276efe Build notes for SDL Mixer X 2018-09-16 16:02:24 -04:00
mazmazz
ec1eef2bf4 Add SDL Mixer X external DLL dependencies 2018-09-16 16:02:23 -04:00
Monster Iestyn
1b7b1f3f79 Fix order of operations messups by adding brackets 2018-09-16 20:25:07 +01:00
mazmazz
45a7d36524 Improve MIDI console parameters 
* Allow multiple SF2 for midisoundfont
* Correctly branch when toggling midiplayer or midisoundfont
 2018-09-16 11:51:39 -04:00
Digiku
7aedb8d035 Merge branch 'lightfade-ticbased' into 'master' 
Linedef Exec 420: Fade Lighting add duration timing

See merge request STJr/SRB2Internal!186
 2018-09-16 08:24:09 -04:00
mazmazz
7c8fa151c4 Merge branch 'lightfade-ticbased' into le-fadefof 2018-09-16 08:20:57 -04:00
mazmazz
d49f0be4ee 420: Strip test comments 2018-09-16 08:20:14 -04:00
mazmazz
80f9e31153 Build notes for SDL Mixer X 2018-09-15 22:20:04 -04:00
mazmazz
76fe4fdb74 Add SDL Mixer X external DLL dependencies 2018-09-15 21:47:03 -04:00
mazmazz
1321ab9d92 453: Extra parameter for Add_ColormapFader 2018-09-15 20:40:17 -04:00
mazmazz
17e23f55eb 492: Merge speed and duration logic for fade polyobject 2018-09-15 20:00:37 -04:00
Monster Iestyn
22ee740fa8 Merge branch 'mario-block-sync' into 'next' 
Fix for Mario block FOF texture synchronisation in netgames

See merge request STJr/SRB2!279
 2018-09-15 10:15:47 -04:00
Nev3r
350cd1435b The thinker is entirely unified now, and there is no difference in the light levels between the "old" behavior and this one now. 2018-09-15 12:21:25 +02:00
mazmazz
d939e597a5 420: Unncessary include 2018-09-15 20:03:43 -04:00
mazmazz
ab4a825385 420: Combine speed and duration logic for fade lighting 2018-09-15 19:01:21 -04:00
mazmazz
809646e7fe 453: Try ResetFakeFloorFader if condition again 2018-09-15 02:24:44 -04:00
mazmazz
a85953a903 453: P_ResetFakeFloorFader stray & address if condition 2018-09-15 02:16:54 -04:00
mazmazz
efe0af960d Colormap overhaul: Wrap R_CheckNumForNameList under ifdef EXTRACOLORMAPLUMPS 2018-09-15 02:10:55 -04:00
mazmazz
efacf356b0 Merge remote-tracking branch 'origin/master' into music-cleanup 2018-09-15 01:52:48 -04:00
mazmazz
79484de4ea Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade 2018-09-15 01:51:06 -04:00
mazmazz
5e55f6f311 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-15 01:50:53 -04:00
mazmazz
6844ed37c5 Colormap overhaul: %d format size_t -> UINT32 fix 2018-09-15 01:50:33 -04:00
mazmazz
001dbcceea Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-09-15 01:17:33 -04:00
mazmazz
45dbadbbc2 Mixer: Add missing tag declarations in I_LoadSong 2018-09-15 01:14:24 -04:00
mazmazz
5585edf459 453: Mixed D+C fixes; unused param cast in P_FadeFakeFloor 2018-09-15 01:05:21 -04:00
mazmazz
ca4a94eca5 492: Mixed D+C fix 2018-09-15 00:56:46 -04:00
mazmazz
1db8aee539 455: Mixed D+C fix 2018-09-15 00:53:21 -04:00
mazmazz
be6acdb019 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-15 00:52:45 -04:00
mazmazz
57959522e2 Colormap overhaul r_data: Mixed D+C fix 2018-09-15 00:49:03 -04:00
mazmazz
9eb39fb025 Merge branch 'music-cleanup' into musicplus-core 2018-09-15 00:46:02 -04:00
mazmazz
e695cf91fe Merge branch 'music-cleanup' into music-sdlmixerx 2018-09-15 00:36:16 -04:00
mazmazz
40a8c9c1ee Mixer: HAVE_LIBGME ifdef in I_LoadSong 2018-09-15 00:35:24 -04:00
mazmazz
30b8408c10 Mixer: HAVE_LIBGME ifdef in I_LoadSong 2018-09-15 00:34:55 -04:00
mazmazz
3c755a85df Merge branch 'music-cleanup' into music-sdlmixerx 2018-09-15 00:28:38 -04:00
mazmazz
2e2acdd16a Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade 2018-09-14 22:36:09 -04:00
mazmazz
5f2df0f453 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-14 22:35:51 -04:00
mazmazz
2f995f4cbe Remove possibly wrong comment about extracolormap_t->fog 2018-09-14 22:35:30 -04:00
mazmazz
f85d1da54f Lua support for floorrover/ceilingrover 2018-09-14 21:43:43 -04:00
mazmazz
20bde0d21c Fix Windows buildbot for MP3_MAD/MODPLUG define (the header we use is 2.0.2) 
(cherry picked from commit 9a5eb02459)
 2018-09-14 17:48:12 -04:00