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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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