diff --git a/Code/OysterGraphics/ClassDiagram.cd b/Code/OysterGraphics/ClassDiagram.cd
deleted file mode 100644
index 7b894197..00000000
--- a/Code/OysterGraphics/ClassDiagram.cd
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/Code/OysterGraphics/OysterGraphics.vcxproj.filters.orig b/Code/OysterGraphics/OysterGraphics.vcxproj.filters.orig
deleted file mode 100644
index 94814340..00000000
--- a/Code/OysterGraphics/OysterGraphics.vcxproj.filters.orig
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
-
- {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
- cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
-
-
- {93995380-89BD-4b04-88EB-625FBE52EBFB}
- h;hpp;hxx;hm;inl;inc;xsd
-
-
- {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
- rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
-
-
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-<<<<<<< HEAD
-
-=======
-
->>>>>>> f08e9491ed00b00aedba0eabf1caed33830fc0e2
- Source Files
-
-
- Source Files
-
-<<<<<<< HEAD
-
-=======
-
- Source Files
-
-
->>>>>>> f08e9491ed00b00aedba0eabf1caed33830fc0e2
- Source Files
-
-
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Code/OysterGraphics/OysterGraphics.vcxproj.orig b/Code/OysterGraphics/OysterGraphics.vcxproj.orig
deleted file mode 100644
index 8a0e9221..00000000
--- a/Code/OysterGraphics/OysterGraphics.vcxproj.orig
+++ /dev/null
@@ -1,214 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- {0EC83E64-230E-48EF-B08C-6AC9651B4F82}
- OysterGraphics
-
-
-
- StaticLibrary
- true
- v110
- MultiByte
-
-
- StaticLibrary
- true
- v110
- MultiByte
-
-
- StaticLibrary
- false
- v110
- true
- MultiByte
-
-
- StaticLibrary
- false
- v110
- true
- MultiByte
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $(SolutionDir)..\External\Lib\$(ProjectName)\
- $(SolutionDir)..\Obj\$(ProjectName)\$(PlatformShortName)\$(Configuration)\
- $(ProjectName)_$(PlatformShortName)D
-
-
- $(SolutionDir)..\External\Lib\$(ProjectName)\
- $(SolutionDir)..\Obj\$(ProjectName)\$(PlatformShortName)\$(Configuration)\
- $(ProjectName)_$(PlatformShortName)
-
-
- $(SolutionDir)..\External\Lib\$(ProjectName)\
- $(SolutionDir)..\Obj\$(ProjectName)\$(PlatformShortName)\$(Configuration)\
- $(ProjectName)_$(PlatformShortName)D
-
-
- $(SolutionDir)..\External\Lib\$(ProjectName)\
- $(SolutionDir)..\Obj\$(ProjectName)\$(PlatformShortName)\$(Configuration)\
- $(ProjectName)_$(PlatformShortName)
-
-
-
- Level3
- Disabled
- true
- $(SolutionDir)OysterMath;$(SolutionDir)Misc;%(AdditionalIncludeDirectories)
-
-
- true
-
-
- true
-
-
-
-
- Level3
- Disabled
- true
- ..\OysterPhysic3D\Collision;..\OysterPhysics3D;..\OysterMath;..\Misc;%(AdditionalIncludeDirectories)
-
-
- true
-
-
-
-
- Level3
- MaxSpeed
- true
- true
- true
- ..\OysterPhysics3D;..\OysterMath;..\Misc;%(AdditionalIncludeDirectories)
-
-
- true
- true
- true
-
-
-
-
- Level3
- MaxSpeed
- true
- true
- true
- ..\OysterPhysics3D;..\OysterMath;..\Misc;%(AdditionalIncludeDirectories)
-
-
- true
- true
- true
-
-
-
-
-
-
-
-<<<<<<< HEAD
-
-
-
-=======
-
-
-
-
->>>>>>> f08e9491ed00b00aedba0eabf1caed33830fc0e2
-
-
-
-
-
-<<<<<<< HEAD
-=======
-
-
->>>>>>> f08e9491ed00b00aedba0eabf1caed33830fc0e2
-
-
-
-
-
-
-
-
-
- {2ec4dded-8f75-4c86-a10b-e1e8eb29f3ee}
-
-
- {f10cbc03-9809-4cba-95d8-327c287b18ee}
-
-
-
-
- Vertex
- Vertex
- Vertex
- Vertex
-
-
- Pixel
- Pixel
- Pixel
- Pixel
- true
- 5.0
- main
-
-
- Vertex
- Vertex
- Vertex
- Vertex
- true
- 5.0
- main
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Code/OysterGraphics/Render/DefaultRenderer.cpp b/Code/OysterGraphics/Render/DefaultRenderer.cpp
index 2ad8646b..a92c54d6 100644
--- a/Code/OysterGraphics/Render/DefaultRenderer.cpp
+++ b/Code/OysterGraphics/Render/DefaultRenderer.cpp
@@ -82,7 +82,7 @@ namespace Oyster
}
int b = 0;
Model::Animation A = *models[i].Animation.AnimationPlaying;
- while(models[i].Animation.AnimationTime>A.duration)
+ while(models[i].Animation.AnimationTime>A.duration && models[i].Animation.LoopAnimation)
models[i].Animation.AnimationTime -= (float)A.duration;
float position = models[i].Animation.AnimationTime;
diff --git a/Code/Tester/MainTest.cpp b/Code/Tester/MainTest.cpp
index f545e42d..4462f060 100644
--- a/Code/Tester/MainTest.cpp
+++ b/Code/Tester/MainTest.cpp
@@ -176,7 +176,7 @@ HRESULT InitDirect3D()
m->WorldMatrix.m[2][2] = 0.00000005f;
m2 = Oyster::Graphics::API::CreateModel(L"char_temporary.dan");
m2->WorldMatrix = Oyster::Math3D::OrientationMatrix(Oyster::Math::Float3::null,Oyster::Math::Float3(4,0,0),Oyster::Math::Float3::null);
- Oyster::Graphics::API::PlayAnimation(m2, L"movement",true);
+ Oyster::Graphics::API::PlayAnimation(m2, L"movement",false);
t = Oyster::Graphics::API::CreateTexture(L"structure_corp_mdg.png");
t2 = Oyster::Graphics::API::CreateTexture(L"whiteGui.png");