BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into CapturePointTake

Browse Source 
# Conflicts:
#	src/Game/Game.cpp
#	src/Tests/ResourceManagerTest.cpp
This commit is contained in:
verysecrethero
2016-01-15 11:24:20 +01:00
parent c8fe6853c0 627108c6ee
commit 8f257b9a58
45 changed files with 822 additions and 779 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Components.xsd
+1
View File
@@ -6,6 +6,7 @@
<xs:include schemaLocation="Components/Test.xsd"/>
<xs:include schemaLocation="Components/RaptorCopter.xsd"/>
<xs:include schemaLocation="Components/Player.xsd"/>
<xs:include schemaLocation="Components/Camera.xsd"/>
<xs:include schemaLocation="Components/AABB.xsd"/>
<xs:include schemaLocation="Components/Trigger.xsd"/>
<xs:include schemaLocation="Components/Health.xsd"/>