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

misc

Browse Source
This commit is contained in:
verysecrethero
2016-03-01 16:11:55 +01:00
parent 842f26d8fc
commit 63e8fb4bc8
5 changed files with 6039 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets
+1 -1
Submodule assets updated: 10a611659d...022890f8f5
resources/Schema/Entities/NewMap2version3x.xml
-10
View File
@@ -2941,11 +2941,6 @@
<Children> <Children>
<Entity> <Entity>
<Components> <Components>
<c:FloatingEffect>
<Axis X="0" Y="0.200000003" Z="0"/>
<Time>3368.5217764001222</Time>
<Period>2</Period>
</c:FloatingEffect>
<c:Transform> <c:Transform>
<Position X="0" Y="0.199529812" Z="0"/> <Position X="0" Y="0.199529812" Z="0"/>
</c:Transform> </c:Transform>
@@ -3072,11 +3067,6 @@
<Children> <Children>
<Entity> <Entity>
<Components> <Components>
<c:FloatingEffect>
<Axis X="0" Y="0.200000003" Z="0"/>
<Time>3257.3077853363998</Time>
<Period>2</Period>
</c:FloatingEffect>
<c:Transform> <c:Transform>
<Position X="-0" Y="-0.164693162" Z="-0"/> <Position X="-0" Y="-0.164693162" Z="-0"/>
</c:Transform> </c:Transform>
resources/Schema/Entities/NewMap2version3x2.xml
+2956
View File
File diff suppressed because it is too large Load Diff
resources/Schema/Entities/NewMap2version3x3.xml
+3082
View File
File diff suppressed because it is too large Load Diff
src/Game/Systems/DamageIndicatorSystem.cpp
-3
View File
@@ -19,9 +19,6 @@ void DamageIndicatorSystem::Update(double dt) {
updateDamageIndicatorVector.erase(iter); updateDamageIndicatorVector.erase(iter);
break; break;
} }
if (!EntityWrapper(m_World,m_World->GetParent(LocalPlayer.ID)).Valid()) {
return;
}
auto angleBetweenVectors = CalculateAngle(LocalPlayer, iter->enemyPosition); auto angleBetweenVectors = CalculateAngle(LocalPlayer, iter->enemyPosition);
//simply set the rotation z-wise to the angleBetweenVectors //simply set the rotation z-wise to the angleBetweenVectors
iter->spriteEntity["Transform"]["Orientation"] = glm::vec3(0, 0, angleBetweenVectors); iter->spriteEntity["Transform"]["Orientation"] = glm::vec3(0, 0, angleBetweenVectors);