Merge branch 'develop' into 89-mehrere-fenster-abhangigkeiten-von-core-zu-fenster-swapchain-etc
# Conflicts: # projects/first_mesh/src/main.cpp # projects/first_scene/src/main.cpp # projects/first_triangle/src/main.cpp # projects/mesh_shader/src/main.cpp # projects/particle_simulation/src/main.cpp # projects/voxelization/src/main.cpp
No related branches found
No related tags found
Showing
- projects/first_scene/assets/Sponza/background.png 0 additions, 0 deletionsprojects/first_scene/assets/Sponza/background.png
- projects/first_scene/assets/Sponza/chain_texture.png 0 additions, 0 deletionsprojects/first_scene/assets/Sponza/chain_texture.png
- projects/first_scene/assets/Sponza/lion.png 0 additions, 0 deletionsprojects/first_scene/assets/Sponza/lion.png
- projects/first_scene/assets/Sponza/spnza_bricks_a_diff.png 0 additions, 0 deletionsprojects/first_scene/assets/Sponza/spnza_bricks_a_diff.png
- projects/first_scene/assets/Sponza/sponza_arch_diff.png 0 additions, 0 deletionsprojects/first_scene/assets/Sponza/sponza_arch_diff.png
- projects/first_scene/assets/Sponza/sponza_ceiling_a_diff.png 0 additions, 0 deletionsprojects/first_scene/assets/Sponza/sponza_ceiling_a_diff.png
- projects/first_scene/assets/Sponza/sponza_column_a_diff.png 0 additions, 0 deletionsprojects/first_scene/assets/Sponza/sponza_column_a_diff.png
- projects/first_scene/assets/Sponza/sponza_column_b_diff.png 0 additions, 0 deletionsprojects/first_scene/assets/Sponza/sponza_column_b_diff.png
- projects/first_scene/assets/Sponza/sponza_column_c_diff.png 0 additions, 0 deletionsprojects/first_scene/assets/Sponza/sponza_column_c_diff.png
- projects/first_scene/assets/Sponza/sponza_curtain_blue_diff.png 0 additions, 0 deletions...ts/first_scene/assets/Sponza/sponza_curtain_blue_diff.png
- projects/first_scene/assets/Sponza/sponza_curtain_diff.png 0 additions, 0 deletionsprojects/first_scene/assets/Sponza/sponza_curtain_diff.png
- projects/first_scene/assets/Sponza/sponza_curtain_green_diff.png 0 additions, 0 deletions...s/first_scene/assets/Sponza/sponza_curtain_green_diff.png
- projects/first_scene/assets/Sponza/sponza_details_diff.png 0 additions, 0 deletionsprojects/first_scene/assets/Sponza/sponza_details_diff.png
- projects/first_scene/assets/Sponza/sponza_fabric_blue_diff.png 0 additions, 0 deletions...cts/first_scene/assets/Sponza/sponza_fabric_blue_diff.png
- projects/first_scene/assets/Sponza/sponza_fabric_diff.png 0 additions, 0 deletionsprojects/first_scene/assets/Sponza/sponza_fabric_diff.png
- projects/first_scene/assets/Sponza/sponza_fabric_green_diff.png 0 additions, 0 deletions...ts/first_scene/assets/Sponza/sponza_fabric_green_diff.png
- projects/first_scene/assets/Sponza/sponza_flagpole_diff.png 0 additions, 0 deletionsprojects/first_scene/assets/Sponza/sponza_flagpole_diff.png
- projects/first_scene/assets/Sponza/sponza_floor_a_diff.png 0 additions, 0 deletionsprojects/first_scene/assets/Sponza/sponza_floor_a_diff.png
- projects/first_scene/assets/Sponza/sponza_roof_diff.png 0 additions, 0 deletionsprojects/first_scene/assets/Sponza/sponza_roof_diff.png
- projects/first_scene/assets/Sponza/sponza_thorn_diff.png 0 additions, 0 deletionsprojects/first_scene/assets/Sponza/sponza_thorn_diff.png
Loading
Please register or sign in to comment