zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-03-11 03:41:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixing the last commit...

Browse source
This commit is contained in:
Jonathan Russell 2018-01-04 23:13:14 +00:00
parent 254501d3e8
commit acf83c2a74
2 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
wadsrc/static/mapinfo/common.txt
View file

@ -114,9 +114,6 @@ DoomEdNums
9842 = SpotLightFlicker 9842 = SpotLightFlicker
9843 = SectorSpotLight 9843 = SectorSpotLight
9844 = SpotLightFlickerRandom 9844 = SpotLightFlickerRandom
<<<<<<< Updated upstream
=======
<<<<<<< HEAD
9850 = SpotLightAdditive 9850 = SpotLightAdditive
9851 = SpotLightPulseAdditive 9851 = SpotLightPulseAdditive
9852 = SpotLightFlickerAdditive 9852 = SpotLightFlickerAdditive
@ -132,9 +129,6 @@ DoomEdNums
9872 = SpotLightFlickerAttenuated 9872 = SpotLightFlickerAttenuated
9873 = SectorSpotLightAttenuated 9873 = SectorSpotLightAttenuated
9874 = SpotLightFlickerRandomAttenuated 9874 = SpotLightFlickerRandomAttenuated
=======
>>>>>>> 7f7c720883e6841ced9c5e66cdae5e6b531872ad
>>>>>>> Stashed changes
9982 = SecActEyesAboveC 9982 = SecActEyesAboveC
9983 = SecActEyesBelowC 9983 = SecActEyesBelowC
9988 = CustomSprite 9988 = CustomSprite

6
wadsrc/static/zscript/shared/dynlights.txt
View file

@ -245,9 +245,6 @@ class SpotLightFlickerRandom : SpotLight
DynamicLight.Type "RandomFlicker"; DynamicLight.Type "RandomFlicker";
} }
} }
<<<<<<< Updated upstream
=======
<<<<<<< HEAD
class SpotLightAdditive : SpotLight class SpotLightAdditive : SpotLight
{ {
@ -368,9 +365,6 @@ class SpotLightFlickerRandomAttenuated : SpotLightFlickerRandom
+DYNAMICLIGHT.ATTENUATE +DYNAMICLIGHT.ATTENUATE
} }
} }
=======
>>>>>>> 7f7c720883e6841ced9c5e66cdae5e6b531872ad
>>>>>>> Stashed changes
class VavoomLight : DynamicLight class VavoomLight : DynamicLight
{ {