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
..
Debug	Merge branch 'imgui' into test_branch	2024-01-27 15:11:11 +01:00
img	fresh start	2024-01-11 17:57:31 +01:00
models	Merge branch 'imgui' into test_branch	2024-01-27 15:11:11 +01:00
Release	fresh start	2024-01-11 17:57:31 +01:00
shaders	Merge branch 'imgui' into test_branch	2024-01-27 15:11:11 +01:00
src	Merge branch 'imgui' into test_branch	2024-01-27 15:11:11 +01:00
textures	update texture, static planets	2024-01-12 17:03:22 +01:00
tylko_jedne	fresh start	2024-01-11 17:57:31 +01:00
assimp-vc141-mt.dll	fresh start	2024-01-11 17:57:31 +01:00
assimp-vc141-mtd.dll	fresh start	2024-01-11 17:57:31 +01:00
freeglut.dll	fresh start	2024-01-11 17:57:31 +01:00
glew32.dll	fresh start	2024-01-11 17:57:31 +01:00
grk-cw6.vcxproj	Merge branch 'imgui' into test_branch	2024-01-27 15:11:11 +01:00
grk-cw6.vcxproj.filters	Import imgui	2024-01-22 11:20:11 +01:00
grk-cw6.vcxproj.user	fresh start	2024-01-11 17:57:31 +01:00
imgui.ini	Fix bug with flicker	2024-01-25 17:16:15 +01:00
packages.config	update texture, static planets	2024-01-12 17:03:22 +01:00
render.py	fresh start	2024-01-11 17:57:31 +01:00
style.css	fresh start	2024-01-11 17:57:31 +01:00
zadania 6.html	fresh start	2024-01-11 17:57:31 +01:00
zadania 6.md	fresh start	2024-01-11 17:57:31 +01:00
zlib.dll	fresh start	2024-01-11 17:57:31 +01:00
zlibd.dll	fresh start	2024-01-11 17:57:31 +01:00