s473621 c20788feaa Merge branch 'merge_with_textures' of https://git.wmi.amu.edu.pl/s473559/Grafika2023 into merge_with_textures ... # Conflicts: # PlanetCreator/cw 6/shaders/shader_5_1_tex.frag		2024-02-07 15:33:56 +01:00
..
img	fresh start	2024-01-11 17:57:31 +01:00
models	Merge branch 'importing_ply' into merge_with_textures	2024-02-07 13:50:55 +01:00
Release	test	2024-02-04 22:10:48 +01:00
shaders	Merge branch 'merge_with_textures' of https://git.wmi.amu.edu.pl/s473559/Grafika2023 into merge_with_textures	2024-02-07 15:33:56 +01:00
src	return texture to planet	2024-02-07 14:55:02 +01:00
textures	Some fixing	2024-01-31 10:12:40 +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	return texture to planet	2024-02-07 14:55:02 +01:00
grk-cw6.vcxproj.filters	adding texture to plants	2024-01-31 16:09:43 +01:00
grk-cw6.vcxproj.user	fresh start	2024-01-11 17:57:31 +01:00
imgui.ini	test	2024-02-04 22:10:48 +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