Merge branch 'miami' into lcs

Browse Source

# Conflicts:
#	premake5.lua

...

This commit is contained in:

Sergeanur

2021-07-18 00:05:51 +03:00

parent ec5a07b049 c937bdbfea

commit 7a034142c9

77 changed files with 10 additions and 10 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

src/render/2dEffect.h → src/renderer/2dEffect.h

0

src/render/Antennas.cpp → src/renderer/Antennas.cpp

0

src/render/Antennas.h → src/renderer/Antennas.h

0

src/render/Clouds.cpp → src/renderer/Clouds.cpp

0

src/render/Clouds.h → src/renderer/Clouds.h

0

src/render/Console.cpp → src/renderer/Console.cpp

0

src/render/Console.h → src/renderer/Console.h

0

src/render/Coronas.cpp → src/renderer/Coronas.cpp

0

src/render/Coronas.h → src/renderer/Coronas.h

0

src/render/Credits.cpp → src/renderer/Credits.cpp

0

src/render/Credits.h → src/renderer/Credits.h

0

src/render/CutsceneShadow.cpp → src/renderer/CutsceneShadow.cpp

0

src/render/CutsceneShadow.h → src/renderer/CutsceneShadow.h

0

src/render/Draw.cpp → src/renderer/Draw.cpp

0

src/render/Draw.h → src/renderer/Draw.h

0

src/render/Fluff.cpp → src/renderer/Fluff.cpp

0

src/render/Fluff.h → src/renderer/Fluff.h

0

src/render/Font.cpp → src/renderer/Font.cpp

0

src/render/Font.h → src/renderer/Font.h

0

src/render/Glass.cpp → src/renderer/Glass.cpp

0

src/render/Glass.h → src/renderer/Glass.h

0

src/render/Hud.cpp → src/renderer/Hud.cpp

0

src/render/Hud.h → src/renderer/Hud.h

0

src/render/Instance.cpp → src/renderer/Instance.cpp

0

src/render/Instance.h → src/renderer/Instance.h

0

src/render/Lines.cpp → src/renderer/Lines.cpp

0

src/render/Lines.h → src/renderer/Lines.h

0

src/render/MBlur.cpp → src/renderer/MBlur.cpp

0

src/render/MBlur.h → src/renderer/MBlur.h

0

src/render/Occlusion.cpp → src/renderer/Occlusion.cpp

0

src/render/Occlusion.h → src/renderer/Occlusion.h

0

src/render/Particle.cpp → src/renderer/Particle.cpp

0

src/render/Particle.h → src/renderer/Particle.h

0

src/render/ParticleMgr.cpp → src/renderer/ParticleMgr.cpp

0

src/render/ParticleMgr.h → src/renderer/ParticleMgr.h

0

src/render/ParticleType.h → src/renderer/ParticleType.h

0

src/render/PlayerSkin.cpp → src/renderer/PlayerSkin.cpp

0

src/render/PlayerSkin.h → src/renderer/PlayerSkin.h

0

src/render/PointLights.cpp → src/renderer/PointLights.cpp

0

src/render/PointLights.h → src/renderer/PointLights.h

0

src/render/RenderBuffer.cpp → src/renderer/RenderBuffer.cpp

0

src/render/RenderBuffer.h → src/renderer/RenderBuffer.h

0

src/render/Renderer.cpp → src/renderer/Renderer.cpp

0

src/render/Renderer.h → src/renderer/Renderer.h

0

src/render/Rubbish.cpp → src/renderer/Rubbish.cpp

0

src/render/Rubbish.h → src/renderer/Rubbish.h

0

src/render/ShadowCamera.cpp → src/renderer/ShadowCamera.cpp

0

src/render/ShadowCamera.h → src/renderer/ShadowCamera.h

0

src/render/Shadows.cpp → src/renderer/Shadows.cpp

0

src/render/Shadows.h → src/renderer/Shadows.h

0

src/render/Skidmarks.cpp → src/renderer/Skidmarks.cpp

0

src/render/Skidmarks.h → src/renderer/Skidmarks.h

0

src/render/SpecialFX.cpp → src/renderer/SpecialFX.cpp

0

src/render/SpecialFX.h → src/renderer/SpecialFX.h

0

src/render/Sprite.cpp → src/renderer/Sprite.cpp

0

src/render/Sprite.h → src/renderer/Sprite.h

0

src/render/Sprite2d.cpp → src/renderer/Sprite2d.cpp

0

src/render/Sprite2d.h → src/renderer/Sprite2d.h

0

src/render/TexList.cpp → src/renderer/TexList.cpp

0

src/render/TexList.h → src/renderer/TexList.h

0

src/render/Timecycle.cpp → src/renderer/Timecycle.cpp

0

src/render/Timecycle.h → src/renderer/Timecycle.h

0

src/render/VarConsole.cpp → src/renderer/VarConsole.cpp

0

src/render/VarConsole.h → src/renderer/VarConsole.h

0

src/render/WaterCannon.cpp → src/renderer/WaterCannon.cpp

0

src/render/WaterCannon.h → src/renderer/WaterCannon.h

0

src/render/WaterCreatures.cpp → src/renderer/WaterCreatures.cpp

0

src/render/WaterCreatures.h → src/renderer/WaterCreatures.h

0

src/render/WaterLevel.cpp → src/renderer/WaterLevel.cpp

0

src/render/WaterLevel.h → src/renderer/WaterLevel.h

0

src/render/Weather.cpp → src/renderer/Weather.cpp

0

src/render/Weather.h → src/renderer/Weather.h

0

src/render/WindModifiers.cpp → src/renderer/WindModifiers.cpp

0

src/render/WindModifiers.h → src/renderer/WindModifiers.h