Deni bdfff74d08 Merge branch 'imgui' into test_branch ... # Conflicts: # PlanetCreator/Debug/grk-cw6.exe # PlanetCreator/Debug/grk-cw6.pdb # PlanetCreator/cw 6/Debug/Box.obj # PlanetCreator/cw 6/Debug/Camera.obj # PlanetCreator/cw 6/Debug/Render_Utils.obj # PlanetCreator/cw 6/Debug/SOIL.obj # PlanetCreator/cw 6/Debug/Shader_Loader.obj # PlanetCreator/cw 6/Debug/Texture.obj # PlanetCreator/cw 6/Debug/grk-cw6.Build.CppClean.log # PlanetCreator/cw 6/Debug/grk-cw6.log # PlanetCreator/cw 6/Debug/grk-cw6.tlog/CL.command.1.tlog # PlanetCreator/cw 6/Debug/grk-cw6.tlog/CL.read.1.tlog # PlanetCreator/cw 6/Debug/grk-cw6.tlog/CL.write.1.tlog # PlanetCreator/cw 6/Debug/grk-cw6.tlog/link.command.1.tlog # PlanetCreator/cw 6/Debug/grk-cw6.tlog/link.read.1.tlog # PlanetCreator/cw 6/Debug/grk-cw6.tlog/link.write.1.tlog # PlanetCreator/cw 6/Debug/image_DXT.obj # PlanetCreator/cw 6/Debug/image_helper.obj # PlanetCreator/cw 6/Debug/main.obj # PlanetCreator/cw 6/Debug/stb_image_aug.obj # PlanetCreator/cw 6/Debug/vc142.idb # PlanetCreator/cw 6/Debug/vc142.pdb # PlanetCreator/cw 6/Debug/vc143.idb # PlanetCreator/cw 6/Debug/vc143.pdb # PlanetCreator/cw 6/grk-cw6.vcxproj.filters # PlanetCreator/cw 6/src/ex_6_1.hpp		2024-01-27 15:11:11 +01:00
..
shader_5_1_tex.frag	fresh start	2024-01-11 17:57:31 +01:00
shader_5_1_tex.vert	fresh start	2024-01-11 17:57:31 +01:00
shader_5_1.frag	fresh start	2024-01-11 17:57:31 +01:00
shader_5_1.vert	fresh start	2024-01-11 17:57:31 +01:00
shader_5_sun.frag	update texture, static planets	2024-01-12 17:03:22 +01:00
shader_5_sun.vert	fresh start	2024-01-11 17:57:31 +01:00
shader_biomes.frag	?	2024-01-11 23:37:20 +01:00
shader_biomes.vert	?	2024-01-11 23:37:20 +01:00