s473559/Grafika2023
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
17 Commits 8 Branches 1 Tag 1 GiB
C++ 40.2%
HTML 39.2%
C 18.7%
JavaScript 0.8%
CSS 0.7%
Other 0.3%
bdfff74d08
Go to file
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
PlanetCreator Merge branch 'imgui' into test_branch 2024-01-27 15:11:11 +01:00
.gitignore Fix bug with flicker 2024-01-25 17:16:15 +01:00
README.md Initial commit 2023-12-18 16:07:46 +01:00

README.md

Grafika2023