Commit graph

23092 commits

Author SHA1 Message Date
TehRealSalt
fc194b63e8 Changed MD2 coloring again
Squares the colors to get nicer looking results (https://www.youtube.com/watch?v=LKnqECcg6Gw), as well as only blending a small chunk of the skincolor to prevent desaturation from the brightest/darkest values.
2018-09-16 23:39:18 -04:00
mazmazz
5f5ea5eec6 Merge branch 'musicplus-core' into musicplus-feature-postboss 2018-09-16 23:32:18 -04:00
TehRealSalt
60c5eb372b New color brightness formula
Gets more accurate looking results
2018-09-16 23:28:10 -04:00
mazmazz
08efe2aa24 Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-09-16 23:18:11 -04:00
mazmazz
ce37b8f121 S_ChangeMusicAdvanced -> S_ChangeMusicEx 2018-09-16 23:10:23 -04:00
mazmazz
8315170069 Separate Lua from musicplus-core 2018-09-16 23:09:37 -04:00
mazmazz
c36f189da3 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-16 22:42:57 -04:00
mazmazz
e5d533edc2 New colormap netsync fixes 2018-09-16 22:42:36 -04:00
mazmazz
3bfdcad4cc New colormap netsync fixes 2018-09-16 22:41:08 -04:00
mazmazz
82ebf0c64a 455: Fade colormap netsync use new colormap saving 2018-09-16 20:27:24 -04:00
mazmazz
1103503dee Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-16 20:25:59 -04:00
mazmazz
5923e85c5a Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector 2018-09-16 20:25:46 -04:00
TehRealSalt
05ad8937b3 Alternate TC_RAINBOW
Leaving behind a commented out define for now because I dunno if I like it yet
2018-09-16 18:10:29 -04:00
mazmazz
d21467eeaa 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
0c307ea528 Build notes for SDL Mixer X 2018-09-16 16:02:24 -04:00
mazmazz
56e697ba90 Add SDL Mixer X external DLL dependencies 2018-09-16 16:02:23 -04:00
Monster Iestyn
9481e7d358 Fix order of operations messups by adding brackets 2018-09-16 20:25:07 +01:00
mazmazz
e58cfe9ced 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
7b65f36d43 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
20537f1310 Merge branch 'lightfade-ticbased' into le-fadefof 2018-09-16 08:20:57 -04:00
mazmazz
33bc560f15 420: Strip test comments 2018-09-16 08:20:14 -04:00
Latapostrophe
026a13060e Radius is now a define 2018-09-16 11:16:30 +02:00
Latapostrophe
05456a4a0f Fixed crash when replacing first character. 2018-09-16 11:01:00 +02:00
Latapostrophe
a487ab1913 Thunder Shield effect hardcode. 2018-09-16 10:31:24 +02:00
mazmazz
18abae47ce Build notes for SDL Mixer X 2018-09-15 22:20:04 -04:00
mazmazz
48f82b4aa8 Add SDL Mixer X external DLL dependencies 2018-09-15 21:47:03 -04:00
mazmazz
3ce5362a1d 453: Extra parameter for Add_ColormapFader 2018-09-15 20:40:17 -04:00
TehRealSalt
30c37ee440 Revert this now that we have ESC functionality
(I mean. I still think this feels nicer than pressing the menu button, but...)
2018-09-15 20:13:29 -04:00
mazmazz
d8b57f32e7 492: Merge speed and duration logic for fade polyobject 2018-09-15 20:00:37 -04:00
TehRealSalt
7f92aaba66 Buff rainbow sparks 2018-09-15 19:59:39 -04:00
Monster Iestyn
94b02c8e44 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
2009c93ddd 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
13e910f6ff 420: Unncessary include 2018-09-15 20:03:43 -04:00
mazmazz
e2e1ca0ac6 420: Combine speed and duration logic for fade lighting 2018-09-15 19:01:21 -04:00
mazmazz
e01fd1f3a3 453: Try ResetFakeFloorFader if condition again 2018-09-15 02:24:44 -04:00
mazmazz
a19c44d21f 453: P_ResetFakeFloorFader stray & address if condition 2018-09-15 02:16:54 -04:00
mazmazz
09338f77a7 Colormap overhaul: Wrap R_CheckNumForNameList under ifdef EXTRACOLORMAPLUMPS 2018-09-15 02:10:55 -04:00
mazmazz
b9c5d2177c Merge remote-tracking branch 'origin/master' into music-cleanup 2018-09-15 01:52:48 -04:00
mazmazz
17ea15a050 Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade 2018-09-15 01:51:06 -04:00
mazmazz
400dbe0118 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-15 01:50:53 -04:00
mazmazz
20eb98b89f Colormap overhaul: %d format size_t -> UINT32 fix 2018-09-15 01:50:33 -04:00
TehRealSalt
17660379de Grow/Shrink fixed min speed 2018-09-15 01:29:38 -04:00
TehRealSalt
078fa29247 Updated speed lines 2018-09-15 01:24:29 -04:00
mazmazz
707d649d67 Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-09-15 01:17:33 -04:00
mazmazz
a8c4912810 Mixer: Add missing tag declarations in I_LoadSong 2018-09-15 01:14:24 -04:00
mazmazz
95aeb78550 453: Mixed D+C fixes; unused param cast in P_FadeFakeFloor 2018-09-15 01:05:21 -04:00
mazmazz
413f25f323 492: Mixed D+C fix 2018-09-15 00:56:46 -04:00
mazmazz
73a907f52f 455: Mixed D+C fix 2018-09-15 00:53:21 -04:00
mazmazz
2d032082a8 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-15 00:52:45 -04:00
mazmazz
23de95dce2 Colormap overhaul r_data: Mixed D+C fix 2018-09-15 00:49:03 -04:00