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

Merge remote-tracking branch 'origin/particles' into havok

Browse Source 
Conflicts:
	src/Components/Vehicle.h
This commit is contained in:
ViktorLjung
2014-05-13 01:57:28 +02:00
parent b9231e4d46 df13663ca8
commit 74d3269e35
35 changed files with 571 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vs11/Returngeance/Returngeance.vcxproj
+3
View File
@@ -112,6 +112,7 @@
<ClCompile Include="..\..\src\Systems\DebugSystem.cpp" />
<ClCompile Include="..\..\src\Systems\FreeSteeringSystem.cpp" />
<ClCompile Include="..\..\src\Systems\InputSystem.cpp" />
<ClCompile Include="..\..\src\Systems\ParticleSystem.cpp" />
<ClCompile Include="..\..\src\Systems\PhysicsSystem.cpp" />
<ClCompile Include="..\..\src\Systems\RenderSystem.cpp" />
<ClCompile Include="..\..\src\Systems\SoundSystem.cpp" />
@@ -134,6 +135,7 @@
<ClInclude Include="..\..\src\Components\Input.h" />
<ClInclude Include="..\..\src\Components\MeshShape.h" />
<ClInclude Include="..\..\src\Components\Model.h" />
<ClInclude Include="..\..\src\Components\Particle.h" />
<ClInclude Include="..\..\src\Components\ParticleEmitter.h" />
<ClInclude Include="..\..\src\Components\Physics.h" />
<ClInclude Include="..\..\src\Components\PointLight.h" />
@@ -183,6 +185,7 @@
<ClInclude Include="..\..\src\Systems\DebugSystem.h" />
<ClInclude Include="..\..\src\Systems\FreeSteeringSystem.h" />
<ClInclude Include="..\..\src\Systems\InputSystem.h" />
<ClInclude Include="..\..\src\Systems\ParticleSystem.h" />
<ClInclude Include="..\..\src\Systems\PhysicsSystem.h" />
<ClInclude Include="..\..\src\Systems\RenderSystem.h" />
<ClInclude Include="..\..\src\Systems\SoundSystem.h" />
vs11/Returngeance/Returngeance.vcxproj.filters
+9
View File
@@ -50,6 +50,9 @@
</ClCompile>
<ClCompile Include="..\..\src\ResourceManager.cpp" />
<ClCompile Include="..\..\src\Sound.cpp" />
<ClCompile Include="..\..\src\Systems\ParticleSystem.cpp">
<Filter>Particle System\Systems</Filter>
</ClCompile>
<ClCompile Include="..\..\src\EventBroker.cpp" />
<ClCompile Include="..\..\src\Physics\VehicleSetup.cpp">
<Filter>Physics</Filter>
@@ -264,6 +267,12 @@
<ClInclude Include="..\..\src\Components\WheelPair.h">
<Filter>Physics\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Systems\ParticleSystem.h">
<Filter>Particle System\Systems</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Particle.h">
<Filter>Particle System\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\GUI\Frame.h">
<Filter>GUI</Filter>
</ClInclude>