|
|
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 |
|
|
|
dea910ca2c
|
Fix bug with flicker
|
2024-01-25 17:16:15 +01:00 |
|
|
|
3f62438460
|
Import imgui
|
2024-01-22 11:20:11 +01:00 |
|
|
|
0d4cfed3be
|
importing ply objects
|
2024-01-15 00:59:09 +01:00 |
|
|
|
0beb51445f
|
update texture, static planets
|
2024-01-12 17:03:22 +01:00 |
|
|
|
a7af8150db
|
?
|
2024-01-11 23:37:20 +01:00 |
|
|
|
66915f4ff7
|
deleted old .vs
|
2024-01-11 18:03:00 +01:00 |
|
|
|
03ab368c52
|
fresh start
|
2024-01-11 17:57:31 +01:00 |
|
|
|
39fda15c3a
|
adding planets
|
2024-01-10 01:33:43 +01:00 |
|
|
|
d98f296c4c
|
dependencies
|
2023-12-18 17:00:22 +01:00 |
|
|
|
f4aee89194
|
initial3
|
2023-12-18 16:22:58 +01:00 |
|
