|
|
1a8b4cd64e
|
merge
|
2024-02-08 03:27:49 +01:00 |
|
|
|
3f1644dbdb
|
WIP placeObject uses material depending on plant
|
2024-02-08 00:40:47 +01:00 |
|
|
|
de646292bd
|
Revert "Revert "WIP objects appear as dots""
This reverts commit bde2409b59.
|
2024-02-07 18:32:04 +01:00 |
|
|
|
bde2409b59
|
Revert "WIP objects appear as dots"
This reverts commit 968295dc3d.
|
2024-02-07 18:29:06 +01:00 |
|
|
|
968295dc3d
|
WIP objects appear as dots
|
2024-02-07 18:28:36 +01:00 |
|
|
|
66a4f36be1
|
return texture to planet
|
2024-02-07 14:55:02 +01:00 |
|
|
|
66d6374d53
|
Merge branch 'importing_ply' into merge_with_textures
# Conflicts:
# PlanetCreator/cw 6/grk-cw6.vcxproj.filters
# PlanetCreator/cw 6/imgui.ini
# PlanetCreator/cw 6/src/ex_6_1.hpp
|
2024-02-07 13:50:55 +01:00 |
|
|
|
d28c6eecb9
|
adding texture to plants
|
2024-01-31 16:09:43 +01:00 |
|
|
|
06362ba989
|
changes
|
2024-01-29 12:12:16 +01:00 |
|
|
|
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 |
|
|
|
3f62438460
|
Import imgui
|
2024-01-22 11:20:11 +01:00 |
|
|
|
0beb51445f
|
update texture, static planets
|
2024-01-12 17:03:22 +01:00 |
|
|
|
a7af8150db
|
?
|
2024-01-11 23:37:20 +01:00 |
|
|
|
03ab368c52
|
fresh start
|
2024-01-11 17:57:31 +01:00 |
|
