sem/SDBA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge Develop into main after sprint 1 #1

Merged
SemvdH merged 55 commits from develop into main 2021-06-02 09:02:27 +00:00
Conversation 6 Commits 55 Files Changed 637 +10 -10
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8f13fe4d90 - Show all commits

0
FpsCam.cpp → src/FpsCam.cpp
View File

0
FpsCam.h → src/FpsCam.h
View File

0
main.cpp → src/main.cpp
View File

0
tigl.cpp → src/tigl.cpp
View File

0
tigl.h → src/tigl.h
View File

10
wk2_fps.vcxproj
View File

@@ -156,13 +156,13 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="FpsCam.cpp" />
<ClCompile Include="main.cpp" />
<ClCompile Include="tigl.cpp" />
<ClCompile Include="src\FpsCam.cpp" />
<ClCompile Include="src\main.cpp" />
<ClCompile Include="src\tigl.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="FpsCam.h" />
<ClInclude Include="tigl.h" />
<ClInclude Include="src\FpsCam.h" />
<ClInclude Include="src\tigl.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

10
wk2_fps.vcxproj.filters
View File

@@ -15,21 +15,21 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="tigl.cpp">
<ClCompile Include="src\tigl.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="main.cpp">
<ClCompile Include="src\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="FpsCam.cpp">
<ClCompile Include="src\FpsCam.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="tigl.h">
<ClInclude Include="src\tigl.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="FpsCam.h">
<ClInclude Include="src\FpsCam.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>