mazmazz
a8ce3d3002
Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume other targets
...
(cherry picked from commit 9fb9386f84b3739fe765a78bcb9683eb7e98bc36)
2018-09-14 10:23:47 -04:00
mazmazz
1ca6ac1c67
Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume into one method
...
* In s_sound, they are merged to one method as well, but there are still two separate digvolume and seqvolume variables
* Simplified Dig/MidiMusicDisabled in s_sound
* Method reordering
(cherry picked from commit 701cc5a7dd1dfead87a42ec7558c9fa6a1deb193)
2018-09-14 10:23:37 -04:00
mazmazz
32ab93a012
Added I_GetMusicType and removed midimode variable: other targets
...
(cherry picked from commit 14b393ab16736bb44dab6fd4a90b7bdd8ff782e0)
2018-09-14 09:55:45 -04:00
mazmazz
ff91315cbc
Added I_GetMusicType and removed midimode variable
...
* Revised S_PlayMusic arguments
* Now music plays again!
(cherry picked from commit 55f3803e4b9f8104c90cc6c769d54121e5bac0b8)
2018-09-14 09:42:29 -04:00
mazmazz
5a4e6cf924
Loose ends other targets
...
(cherry picked from commit 9a5fc5f66a31baf713c6f32f7a696b933da6907b)
2018-09-14 09:41:08 -04:00
mazmazz
61a7e2bf2b
NiGHTS drone loop: Change flyangle comparison to fix detection from vertical angles
...
Use > 90 && < 270 instead of >= 90 && <= 270. Fixes a bug where if you fly directly up (flyangle 90) or directly down (flyangle 270), that registers as a backwards direction, so you trigger the loop detection by flying BACKWARDS, not FORWARDS. This edge case (only possible via JUMPTOAXIS) should default to FORWARDS looping.
(cherry picked from commit ce215195f89bf52e5c2e2ddd7d5444685edf835d)
2018-09-14 08:58:19 -04:00
mazmazz
64a0f83238
Fix NiGHTS drone loop detection by using pl->flyangle
...
(cherry picked from commit 67e438128435aca992e2d45aa1f35603c5501984)
2018-09-14 08:57:37 -04:00
mazmazz
1b2cbfa568
Merge remote-tracking branch 'public-gitlab/master' into public-op-nightsbumper-fix
2018-09-14 08:55:30 -04:00
mazmazz
b1993b87a9
P_SpawnMapThing: Ignore MTF_ flags if MT_NIGHTSBUMPER
...
(cherry picked from commit d85f108997bfeca3e0b1731c1aad70617456400b)
2018-09-14 08:52:10 -04:00
mazmazz
619c218702
MT_NIGHTSBUMPER Spawn: Don't reset mthing->options
...
(cherry picked from commit dc9fd6f02ed4b681ed4982d119672f07cc91e585)
2018-09-14 08:52:10 -04:00
mazmazz
5515fba00e
Merge branch 'lightfade-ticbased' into le-fadefof
2018-09-14 08:42:02 -04:00
mazmazz
6a2fb34912
420: Removed unnecessary include (gametic no longer needed)
2018-09-14 08:26:52 -04:00
TehRealSalt
91c6776cc4
Add to DeHackEd!
2018-09-14 00:29:39 -04:00
TehRealSalt
35bd542076
Bug fix
2018-09-13 23:49:24 -04:00
TehRealSalt
80177931c3
Rainbow sparks
2018-09-13 23:39:41 -04:00
TehRealSalt
1863fb953d
Ketchup, faster drift sparks
2018-09-13 23:29:14 -04:00
TehRealSalt
14ced23300
Speed lines
2018-09-13 20:26:43 -04:00
toaster
670b7d74fc
angel island drift strat plus ketchup
2018-09-14 00:19:23 +01:00
TehRealSalt
cf3b58f68d
Delay falling, longer exit timer
2018-09-13 19:13:43 -04:00
TehRealSalt
3b1c1e9dbd
This is a sign
...
Signpost with the face of the person in 1st falls down at a pre-determined location on race finish (or at the finishing player if none is found)
2018-09-13 17:42:34 -04:00
toaster
239be94fa8
Make these sparks fullbright (thanks, Ancient Tomb!)
2018-09-13 20:51:30 +01:00
toaster
e342315ca8
Fix a potential crash vector in the shadows code. (It DEFINITELY crashed when I was testing the thunder shield, for example.)
2018-09-13 20:41:37 +01:00
Monster Iestyn
d097bb7e9e
Merge branch 'thwomp-fixes' into 'next'
...
Thwomp fixes: Don't trigger on spectator; don't trigger on ~FF_EXISTS
See merge request STJr/SRB2!277
2018-09-13 14:47:40 -04:00
toaster
45455ca35b
Thunder shield stuff!
...
* Slightly bigger visual size!
* Light-shadow!
* Makes player fullbright if you have it!
* Visuals finally removed instantly on shield drop!
* Uses dark background for item icons!
* Goes behind the player on some frames, faking layering!
2018-09-13 19:01:36 +01:00
mazmazz
e24ea0cb4d
Block song position changes on GME because unstable
2018-09-13 13:27:42 -04:00
mazmazz
9c56f953a5
Merge branch 'master' into musicplus-core
2018-09-13 13:24:46 -04:00
mazmazz
b849693c96
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-13 12:19:28 -04:00
mazmazz
2e75be2d42
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-13 12:19:10 -04:00
mazmazz
3dc4a1d7da
Missed fog boolean -> integer
2018-09-13 12:18:53 -04:00
mazmazz
065638d029
455: Fog flag fix for fading
2018-09-13 12:18:10 -04:00
mazmazz
2bef671a5f
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-13 12:10:14 -04:00
mazmazz
375f48be27
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-13 12:08:56 -04:00
mazmazz
031bc8f4d7
Make extracolormap_t->fog UINT8; it's not boolean, but categorical
2018-09-13 12:08:46 -04:00
Digiku
8f59606199
Don't trigger thwomp on spectators
2018-09-13 11:32:40 -04:00
mazmazz
a7ec620ea4
Thwomp fix: Don't trigger (look for players) when ~FF_EXISTS
2018-09-13 11:32:38 -04:00
mazmazz
b58f765254
455: Set timing by either Back Y or Front Y, but not line length
2018-09-13 10:53:03 -04:00
mazmazz
8464a5ec8a
455: Don't override fadergba on default/no colormap init (~BOUNCY)
2018-09-13 10:43:41 -04:00
mazmazz
99c67decc1
455: Add speed increment timing (~EFFECT4) to FadeColormap
2018-09-13 10:43:32 -04:00
toaster
63f990e6f2
Bugfix sad chao jumping in their sad state
2018-09-13 14:40:50 +01:00
toaster
00438f4c41
Dark SPB background
2018-09-13 14:36:48 +01:00
toaster
18c0e607fa
Make the chao quieter (if it's still too loud, I can tone it down further, but not by much)
2018-09-13 14:35:20 +01:00
toaster
0dc963ffd2
Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
2018-09-13 14:23:36 +01:00
TehRealSalt
7532e58a8c
Tweak these blues
...
Try to make all the blues using this range look a little different, you know?
- Cyan is brighter, and has more contrast.
- Teal has 1 more shade of blue for slightly better anti-aliasing.
2018-09-13 03:04:01 -04:00
TehRealSalt
5708e49c95
Instead of doing productive things, I changed around skincolors again
...
- Renamed Ivory to White, removed Nickel and old White, and improved Silver and Grey.
- Improved Pink & Ruby.
- Added Ketchup, replaced Canary with Mustard.
- Removed Army.
2018-09-13 02:07:00 -04:00
mazmazz
c9f6c362ff
491, 492: Allow BLOCKMONSTERS raw translucency value in floorheight
2018-09-13 00:26:49 -04:00
mazmazz
509965d2c0
492 PolyObj Fade, 491 PolyObj Translucency, 490 PolyObj changes
...
* 490: Set proper render flags according to spawnflags
* 491: Add relative calc (EFFECT3) and Front X alpha param (DONTPEGTOP)
* 492:
* Tic-based (EFFECT4) and speed timing
* Add relative calc (EFFECT3) and Front X alpha param (DONTPEGTOP)
* Set proper render flags according to spawnflags
* Fix OpenGL >= NUMTRANSMAPS render bug
2018-09-13 00:06:11 -04:00
mazmazz
33c1109993
PolyObjFade: Apply RENDER, SOLID, and NOSPECIALS flags according to spawnflags
2018-09-13 00:06:08 -04:00
mazmazz
d0b2728ce1
490 PolyVisible: Set proper spawn render flags instead of RENDERALL
2018-09-13 00:06:06 -04:00
mazmazz
35e58d3c8c
420: A parenthesis
2018-09-12 21:49:03 -04:00
mazmazz
3b7f7cf305
Merge remote-tracking branch 'origin/lightfade-ticbased' into lightfade-ticbased
2018-09-12 21:35:46 -04:00