From f393a220112c7c9a7b59328773025c9f09fa0b3c Mon Sep 17 00:00:00 2001 From: viktorljung Date: Sun, 13 Mar 2016 23:12:45 +0100 Subject: [PATCH 1/8] defender tracer fixed --- include/Engine/Input/FirstPersonInputController.h | 1 - resources/Schema/Entities/RayDefenderBlue.xml | 8 ++------ .../Schema/Entities/WeaponDefenderBlueView.xml | 2 ++ src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp | 13 ++++++++++--- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/include/Engine/Input/FirstPersonInputController.h b/include/Engine/Input/FirstPersonInputController.h index 67e7270e..777c0331 100644 --- a/include/Engine/Input/FirstPersonInputController.h +++ b/include/Engine/Input/FirstPersonInputController.h @@ -213,7 +213,6 @@ bool FirstPersonInputController::OnCommand(const Events::InputComm } } - EntityWrapper firstPersonModel = m_PlayerEntity.FirstChildByName("Hands"); if (firstPersonModel.Valid()) { if (val > 0) { // Walk/Run diff --git a/resources/Schema/Entities/RayDefenderBlue.xml b/resources/Schema/Entities/RayDefenderBlue.xml index 066f2fb1..1c6e7ff2 100644 --- a/resources/Schema/Entities/RayDefenderBlue.xml +++ b/resources/Schema/Entities/RayDefenderBlue.xml @@ -17,12 +17,10 @@ Textures/Effects/NewRay7.png true - true - - + @@ -35,12 +33,10 @@ Textures/Effects/NewRay7.png true - true - - + diff --git a/resources/Schema/Entities/WeaponDefenderBlueView.xml b/resources/Schema/Entities/WeaponDefenderBlueView.xml index 9e3d6a51..9ebe6831 100644 --- a/resources/Schema/Entities/WeaponDefenderBlueView.xml +++ b/resources/Schema/Entities/WeaponDefenderBlueView.xml @@ -8,6 +8,7 @@ Models/Characters/Defender/FirstPersonDefenderBlue.mesh + false @@ -244,6 +245,7 @@ Models/Weapons/Blue/DefenderWeaponBlue.mesh + false diff --git a/src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp b/src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp index 603f6991..7627c227 100644 --- a/src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp +++ b/src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp @@ -395,9 +395,12 @@ void DefenderWeaponBehaviour::spawnTracers(ComponentWrapper cWeapon, WeaponInfo& glm::vec3 muzzlePosition = TransformSystem::AbsolutePosition(muzzle); glm::quat muzzleOrientation = TransformSystem::AbsoluteOrientation(muzzle); - rayOrigin = muzzlePosition; glm::vec3 muzzleToHit = hitPosition - muzzlePosition; + + rayOrigin = muzzlePosition + (muzzleToHit/2.f); + + glm::vec3 lookVector = glm::normalize(-muzzleToHit); float pitch = std::asin(-lookVector.y); float yaw = std::atan2(lookVector.x, lookVector.z); @@ -477,7 +480,12 @@ void DefenderWeaponBehaviour::dealDamage(ComponentWrapper cWeapon, WeaponInfo& w // Check for friendly fire if ((ComponentInfo::EnumType)victim["Team"]["Team"] == (ComponentInfo::EnumType)wi.Player["Team"]["Team"]) { - // TODO: Ammo sharing + // Give boost + Events::PlayerDamage ePlayerDamage; + ePlayerDamage.Inflictor = wi.Player; + ePlayerDamage.Victim = victim; + ePlayerDamage.Damage = 0; + m_EventBroker->Publish(ePlayerDamage); continue; } @@ -493,7 +501,6 @@ void DefenderWeaponBehaviour::dealDamage(ComponentWrapper cWeapon, WeaponInfo& w ePlayerDamage.Victim = kv.first; ePlayerDamage.Damage = kv.second; m_EventBroker->Publish(ePlayerDamage); - LOG_DEBUG("Dealt %f damage to #%i", kv.second, kv.first.ID); } } From 4adf7dc5070a4f02e2b455eb5b708a720d577f8e Mon Sep 17 00:00:00 2001 From: viktorljung Date: Sun, 13 Mar 2016 23:29:50 +0100 Subject: [PATCH 2/8] Assault tracer fixed --- resources/Schema/Entities/WeaponAssaultBlueView.xml | 4 ++-- src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp | 3 ++- src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/resources/Schema/Entities/WeaponAssaultBlueView.xml b/resources/Schema/Entities/WeaponAssaultBlueView.xml index e1d6b852..74db0157 100644 --- a/resources/Schema/Entities/WeaponAssaultBlueView.xml +++ b/resources/Schema/Entities/WeaponAssaultBlueView.xml @@ -92,7 +92,7 @@ Models/Weapons/Blue/AssaultWeaponBlue.mesh - + @@ -131,7 +131,7 @@ Schema/Entities/RayAssaultBlue.xml - + diff --git a/src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp b/src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp index b58cf158..d6293bca 100644 --- a/src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp +++ b/src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp @@ -235,7 +235,8 @@ void AssaultWeaponBehaviour::fireBullet(ComponentWrapper cWeapon, WeaponInfo& wi float distance = traceRayDistance(origin, direction); EntityWrapper ray = SpawnerSystem::Spawn(tracerSpawner, tracerSpawner); if (ray.Valid()) { - ((Field)ray["Transform"]["Scale"]).z(distance); + ((Field)ray["Transform"]["Scale"]).x(distance); + ((Field)ray["Transform"]["Position"]).z(-distance/2.f); } } //MuzzleFlash diff --git a/src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp b/src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp index 7627c227..a0a8f14e 100644 --- a/src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp +++ b/src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp @@ -462,8 +462,8 @@ void DefenderWeaponBehaviour::dealDamage(ComponentWrapper cWeapon, WeaponInfo& w } // Temp hit decal - EntityWrapper hit = ResourceManager::Load("Schema/Entities/HitTest.xml")->MergeInto(m_World); - (Field)hit["Transform"]["Position"] = pick.Position; +// EntityWrapper hit = ResourceManager::Load("Schema/Entities/HitTest.xml")->MergeInto(m_World); +// (Field)hit["Transform"]["Position"] = pick.Position; // Don't let us shoot ourselves in the foot somehow if (victim == LocalPlayer) { @@ -490,7 +490,7 @@ void DefenderWeaponBehaviour::dealDamage(ComponentWrapper cWeapon, WeaponInfo& w } damageSum[victim] += pelletDamage; - ((Field)hit["Model"]["Color"]).z(1.f); + // ((Field)hit["Model"]["Color"]).z(1.f); } // Deal damage! From 1bf65d896ac45cf1a0fcd1bd2ac48005080d3c39 Mon Sep 17 00:00:00 2001 From: viktorljung Date: Sun, 13 Mar 2016 23:42:21 +0100 Subject: [PATCH 3/8] Sidearm tracer fixed --- resources/Schema/Entities/RayAssaultBlue.xml | 4 ---- resources/Schema/Entities/RaySideArmBlue.xml | 8 ++------ resources/Schema/Entities/WeaponAssaultBlueView.xml | 2 +- src/Game/Systems/Weapon/SidearmWeaponBehaviour.cpp | 7 ++++--- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/resources/Schema/Entities/RayAssaultBlue.xml b/resources/Schema/Entities/RayAssaultBlue.xml index c358a4d5..e36c4073 100644 --- a/resources/Schema/Entities/RayAssaultBlue.xml +++ b/resources/Schema/Entities/RayAssaultBlue.xml @@ -17,10 +17,8 @@ Textures/Effects/NewRay5.png true - true - @@ -35,10 +33,8 @@ Textures/Effects/NewRay5.png true - true - diff --git a/resources/Schema/Entities/RaySideArmBlue.xml b/resources/Schema/Entities/RaySideArmBlue.xml index 072f8e95..8a1648bc 100644 --- a/resources/Schema/Entities/RaySideArmBlue.xml +++ b/resources/Schema/Entities/RaySideArmBlue.xml @@ -3,10 +3,10 @@ - 0.08 + 0.080000000000000002 - 0.08 + 0.080000000000000002 @@ -20,10 +20,8 @@ Textures/Effects/NewRay5.png true - true - @@ -38,10 +36,8 @@ Textures/Effects/NewRay5.png true - true - diff --git a/resources/Schema/Entities/WeaponAssaultBlueView.xml b/resources/Schema/Entities/WeaponAssaultBlueView.xml index 74db0157..6fe36095 100644 --- a/resources/Schema/Entities/WeaponAssaultBlueView.xml +++ b/resources/Schema/Entities/WeaponAssaultBlueView.xml @@ -131,7 +131,7 @@ Schema/Entities/RayAssaultBlue.xml - + diff --git a/src/Game/Systems/Weapon/SidearmWeaponBehaviour.cpp b/src/Game/Systems/Weapon/SidearmWeaponBehaviour.cpp index 97144b60..85f1303f 100644 --- a/src/Game/Systems/Weapon/SidearmWeaponBehaviour.cpp +++ b/src/Game/Systems/Weapon/SidearmWeaponBehaviour.cpp @@ -189,15 +189,16 @@ void SidearmWeaponBehaviour::fireBullet(ComponentWrapper cWeapon, WeaponInfo& wi return; } - //Tracer + // Tracer EntityWrapper tracerSpawner = weaponModelEntity.FirstChildByName("WeaponMuzzleRay"); if (tracerSpawner.Valid()) { glm::vec3 origin = TransformSystem::AbsolutePosition(tracerSpawner); - glm::vec3 direction = TransformSystem::AbsoluteOrientation(tracerSpawner) * glm::vec3(0, 0, -1); + glm::vec3 direction = glm::quat(TransformSystem::AbsoluteOrientationEuler(tracerSpawner)) * glm::vec3(0, 0, -1); float distance = traceRayDistance(origin, direction); EntityWrapper ray = SpawnerSystem::Spawn(tracerSpawner, tracerSpawner); if (ray.Valid()) { - ((Field)ray["Transform"]["Scale"]).z(distance); + ((Field)ray["Transform"]["Scale"]).x(distance); + ((Field)ray["Transform"]["Position"]).z(-distance/2.f); } } From 5207248a4971cdb41069b77af6352ac42aa3d3f0 Mon Sep 17 00:00:00 2001 From: viktorljung Date: Mon, 14 Mar 2016 00:04:51 +0100 Subject: [PATCH 4/8] 3rd person tracers fixed --- .../Schema/Entities/SidearmWeaponView.xml | 55 +++++++++++++------ .../Entities/WeaponAssaultBlueWorld.xml | 43 +++++++++++---- .../Entities/WeaponDefenderBlueWorld.xml | 43 +++++++++++---- 3 files changed, 102 insertions(+), 39 deletions(-) diff --git a/resources/Schema/Entities/SidearmWeaponView.xml b/resources/Schema/Entities/SidearmWeaponView.xml index d3dcda66..11e049d4 100644 --- a/resources/Schema/Entities/SidearmWeaponView.xml +++ b/resources/Schema/Entities/SidearmWeaponView.xml @@ -11,17 +11,6 @@ - - - - Schema/Entities/Ray2Red.xml - - - - - - - @@ -38,8 +27,9 @@ - Textures/Core/UnitHexagon.png + Models/Core/UnitQuad.mesh + Textures/Core/UnitHexagon.png @@ -56,16 +46,16 @@ - - Player - SidearmWeapon - MagazineAmmo - 16 Fonts/DroidSans.ttf,64 + + Player + SidearmWeapon + MagazineAmmo + @@ -92,6 +82,37 @@ + + + + + + + + + + + Schema/Entities/RaySideArmBlue.xml + + + + + + + + + + + Schema/Entities/MuzzleFlashSideArmBlue.xml + + + + + + + + + diff --git a/resources/Schema/Entities/WeaponAssaultBlueWorld.xml b/resources/Schema/Entities/WeaponAssaultBlueWorld.xml index cb1acae6..cb1d8292 100644 --- a/resources/Schema/Entities/WeaponAssaultBlueWorld.xml +++ b/resources/Schema/Entities/WeaponAssaultBlueWorld.xml @@ -9,17 +9,6 @@ - - - - Schema/Entities/RayBlue.xml - - - - - - - @@ -29,6 +18,38 @@ + + + + + + + + + + + + Schema/Entities/MuzzleFlashBlue.xml + + + + + + + + + + + Schema/Entities/RayAssaultBlue.xml + + + + + + + + + diff --git a/resources/Schema/Entities/WeaponDefenderBlueWorld.xml b/resources/Schema/Entities/WeaponDefenderBlueWorld.xml index bf87a789..40bd0a40 100644 --- a/resources/Schema/Entities/WeaponDefenderBlueWorld.xml +++ b/resources/Schema/Entities/WeaponDefenderBlueWorld.xml @@ -9,17 +9,6 @@ - - - - Schema/Entities/DefenderRayBlue.xml - - - - - - - @@ -29,6 +18,38 @@ + + + + + + + + + + + Schema/Entities/RayDefenderBlue.xml + + + + + + + + + + + Schema/Entities/MuzzleFlashBlue.xml + + + + + + + + + + From f5343251c5de67a2cf165ac652f574e8694ec4b9 Mon Sep 17 00:00:00 2001 From: viktorljung Date: Mon, 14 Mar 2016 00:28:30 +0100 Subject: [PATCH 5/8] fixed for real now? --- resources/Schema/Entities/RayAssaultBlue.xml | 1 + resources/Schema/Entities/RayDefenderBlue.xml | 1 + resources/Schema/Entities/RaySideArmBlue.xml | 1 + .../Entities/SidearmWeaponBlueWorld.xml | 33 ++- .../Entities/WeaponAssaultBlueWorld.xml | 2 +- .../Entities/WeaponDefenderBlueWorld.xml | 230 +++++++++++++++++- .../Entities/WeaponSidearmAssaultBlueView.xml | 6 +- .../WeaponSidearmDefenderBlueView.xml | 28 +-- 8 files changed, 274 insertions(+), 28 deletions(-) diff --git a/resources/Schema/Entities/RayAssaultBlue.xml b/resources/Schema/Entities/RayAssaultBlue.xml index e36c4073..b474ff2c 100644 --- a/resources/Schema/Entities/RayAssaultBlue.xml +++ b/resources/Schema/Entities/RayAssaultBlue.xml @@ -5,6 +5,7 @@ 0.079999998211860657 + diff --git a/resources/Schema/Entities/RayDefenderBlue.xml b/resources/Schema/Entities/RayDefenderBlue.xml index 1c6e7ff2..56a416ce 100644 --- a/resources/Schema/Entities/RayDefenderBlue.xml +++ b/resources/Schema/Entities/RayDefenderBlue.xml @@ -5,6 +5,7 @@ 0.079999998211860657 + diff --git a/resources/Schema/Entities/RaySideArmBlue.xml b/resources/Schema/Entities/RaySideArmBlue.xml index 8a1648bc..f48a8fc3 100644 --- a/resources/Schema/Entities/RaySideArmBlue.xml +++ b/resources/Schema/Entities/RaySideArmBlue.xml @@ -8,6 +8,7 @@ 0.080000000000000002 + diff --git a/resources/Schema/Entities/SidearmWeaponBlueWorld.xml b/resources/Schema/Entities/SidearmWeaponBlueWorld.xml index d497e955..2b81d63b 100644 --- a/resources/Schema/Entities/SidearmWeaponBlueWorld.xml +++ b/resources/Schema/Entities/SidearmWeaponBlueWorld.xml @@ -9,16 +9,37 @@ - + - - Schema/Entities/RayBlue.xml - - + - + + + + + Schema/Entities/RaySideArmBlue.xml + + + + + + + + + + + Schema/Entities/MuzzleFlashSideArmBlue.xml + + + + + + + + + diff --git a/resources/Schema/Entities/WeaponAssaultBlueWorld.xml b/resources/Schema/Entities/WeaponAssaultBlueWorld.xml index cb1d8292..efb2d1a4 100644 --- a/resources/Schema/Entities/WeaponAssaultBlueWorld.xml +++ b/resources/Schema/Entities/WeaponAssaultBlueWorld.xml @@ -32,7 +32,7 @@ Schema/Entities/MuzzleFlashBlue.xml - + diff --git a/resources/Schema/Entities/WeaponDefenderBlueWorld.xml b/resources/Schema/Entities/WeaponDefenderBlueWorld.xml index 40bd0a40..8c7de4ed 100644 --- a/resources/Schema/Entities/WeaponDefenderBlueWorld.xml +++ b/resources/Schema/Entities/WeaponDefenderBlueWorld.xml @@ -21,7 +21,7 @@ - + @@ -31,7 +31,7 @@ Schema/Entities/RayDefenderBlue.xml - + @@ -46,7 +46,231 @@ - + + + + + 0.080000000000000002 + + + + + + + + + + + + + 0.080000000000000002 + true + + + 2 + Models/Effects/MuzzleFlash/Blue/Cone1Outside.mesh + false + true + + + + + + + + + 0.080000000000000002 + true + + + 2 + Models/Effects/MuzzleFlash/Blue/Cone1Inside.mesh + false + true + + + + + + + + + + + + + + + + + + 0.080000000000000002 + true + + + 2 + Models/Effects/MuzzleFlash/Blue/Cone2Inside.mesh + false + true + + + + + + + + + 0.080000000000000002 + true + + + 2 + Models/Effects/MuzzleFlash/Blue/Cone2Outside.mesh + false + true + + + + + + + + + + + + + + + + + + 0.080000000000000002 + true + + + 2 + Models/Effects/MuzzleFlash/Blue/PlaneLeft.mesh + false + true + + + + + + + + + 0.080000000000000002 + true + + + 2 + Models/Effects/MuzzleFlash/Blue/PlaneRight.mesh + false + true + + + + + + + + + 0.080000000000000002 + true + + + 2 + Models/Effects/MuzzleFlash/Blue/PlaneUp.mesh + false + true + + + + + + + + + 0.080000000000000002 + true + + + 2 + Models/Effects/MuzzleFlash/Blue/PlaneDown.mesh + false + true + + + + + + + + + + + + + + + + Models/Core/UnitSphere.mesh + false + false + + + + + + + + + + + + + + + Models/Core/UnitSphere.mesh + + false + false + + + + 0.40000000596046448 + + + + + + + + + + + + Models/Core/UnitSphere.mesh + false + false + + + + + + + + + + + + + + + + diff --git a/resources/Schema/Entities/WeaponSidearmAssaultBlueView.xml b/resources/Schema/Entities/WeaponSidearmAssaultBlueView.xml index e48cffba..3778cc80 100644 --- a/resources/Schema/Entities/WeaponSidearmAssaultBlueView.xml +++ b/resources/Schema/Entities/WeaponSidearmAssaultBlueView.xml @@ -204,7 +204,7 @@ - + @@ -213,9 +213,7 @@ Schema/Entities/RaySideArmBlue.xml - - - + diff --git a/resources/Schema/Entities/WeaponSidearmDefenderBlueView.xml b/resources/Schema/Entities/WeaponSidearmDefenderBlueView.xml index 129082ed..0d647ba7 100644 --- a/resources/Schema/Entities/WeaponSidearmDefenderBlueView.xml +++ b/resources/Schema/Entities/WeaponSidearmDefenderBlueView.xml @@ -8,6 +8,7 @@ Models/Characters/Defender/FirstPersonDefenderBlue.mesh + false @@ -86,7 +87,7 @@ R_Ammo_Joint - + @@ -183,9 +184,10 @@ 1.5 Models/Weapons/Blue/SecondaryWeaponBlue.mesh + false - + @@ -204,10 +206,19 @@ - + + + + + Schema/Entities/RaySideArmBlue.xml + + + + + @@ -219,17 +230,6 @@ - - - - Schema/Entities/RaySideArmBlue.xml - - - - - - - From 1bba40449fd858a8c52affc2d3c8d0719b2cf1b8 Mon Sep 17 00:00:00 2001 From: viktorljung Date: Mon, 14 Mar 2016 00:38:36 +0100 Subject: [PATCH 6/8] Tracers done --- .../Entities/WeaponDefenderBlueView.xml | 10 +- .../Entities/WeaponDefenderBlueWorld.xml | 228 +----------------- 2 files changed, 7 insertions(+), 231 deletions(-) diff --git a/resources/Schema/Entities/WeaponDefenderBlueView.xml b/resources/Schema/Entities/WeaponDefenderBlueView.xml index 9ebe6831..65475dc2 100644 --- a/resources/Schema/Entities/WeaponDefenderBlueView.xml +++ b/resources/Schema/Entities/WeaponDefenderBlueView.xml @@ -155,7 +155,7 @@ true - + @@ -248,7 +248,7 @@ false - + @@ -267,7 +267,7 @@ - + @@ -277,7 +277,7 @@ Schema/Entities/RayDefenderBlue.xml - + @@ -288,7 +288,7 @@ Schema/Entities/MuzzleFlashBlue.xml - + diff --git a/resources/Schema/Entities/WeaponDefenderBlueWorld.xml b/resources/Schema/Entities/WeaponDefenderBlueWorld.xml index 8c7de4ed..abdb0e2b 100644 --- a/resources/Schema/Entities/WeaponDefenderBlueWorld.xml +++ b/resources/Schema/Entities/WeaponDefenderBlueWorld.xml @@ -31,7 +31,7 @@ Schema/Entities/RayDefenderBlue.xml - + @@ -46,231 +46,7 @@ - - - - - 0.080000000000000002 - - - - - - - - - - - - - 0.080000000000000002 - true - - - 2 - Models/Effects/MuzzleFlash/Blue/Cone1Outside.mesh - false - true - - - - - - - - - 0.080000000000000002 - true - - - 2 - Models/Effects/MuzzleFlash/Blue/Cone1Inside.mesh - false - true - - - - - - - - - - - - - - - - - - 0.080000000000000002 - true - - - 2 - Models/Effects/MuzzleFlash/Blue/Cone2Inside.mesh - false - true - - - - - - - - - 0.080000000000000002 - true - - - 2 - Models/Effects/MuzzleFlash/Blue/Cone2Outside.mesh - false - true - - - - - - - - - - - - - - - - - - 0.080000000000000002 - true - - - 2 - Models/Effects/MuzzleFlash/Blue/PlaneLeft.mesh - false - true - - - - - - - - - 0.080000000000000002 - true - - - 2 - Models/Effects/MuzzleFlash/Blue/PlaneRight.mesh - false - true - - - - - - - - - 0.080000000000000002 - true - - - 2 - Models/Effects/MuzzleFlash/Blue/PlaneUp.mesh - false - true - - - - - - - - - 0.080000000000000002 - true - - - 2 - Models/Effects/MuzzleFlash/Blue/PlaneDown.mesh - false - true - - - - - - - - - - - - - - - - Models/Core/UnitSphere.mesh - false - false - - - - - - - - - - - - - - - Models/Core/UnitSphere.mesh - - false - false - - - - 0.40000000596046448 - - - - - - - - - - - - Models/Core/UnitSphere.mesh - false - false - - - - - - - - - - - - - - - - + From 424dffd1e0f99f92fafc17f88c241d563d270997 Mon Sep 17 00:00:00 2001 From: viktorljung Date: Mon, 14 Mar 2016 00:47:21 +0100 Subject: [PATCH 7/8] removed shadows on 1st person hands and weapons added shielded component on 3rd person weapons --- resources/Schema/Entities/SidearmWeaponBlueWorld.xml | 1 + resources/Schema/Entities/WeaponAssaultBlueView.xml | 2 ++ resources/Schema/Entities/WeaponAssaultBlueWorld.xml | 1 + resources/Schema/Entities/WeaponDefenderBlueWorld.xml | 1 + resources/Schema/Entities/WeaponSidearmAssaultBlueView.xml | 2 ++ 5 files changed, 7 insertions(+) diff --git a/resources/Schema/Entities/SidearmWeaponBlueWorld.xml b/resources/Schema/Entities/SidearmWeaponBlueWorld.xml index 2b81d63b..d32c0dee 100644 --- a/resources/Schema/Entities/SidearmWeaponBlueWorld.xml +++ b/resources/Schema/Entities/SidearmWeaponBlueWorld.xml @@ -2,6 +2,7 @@ + Models/Weapons/Blue/SecondaryWeaponBlue.mesh diff --git a/resources/Schema/Entities/WeaponAssaultBlueView.xml b/resources/Schema/Entities/WeaponAssaultBlueView.xml index 6fe36095..1c1e9cf7 100644 --- a/resources/Schema/Entities/WeaponAssaultBlueView.xml +++ b/resources/Schema/Entities/WeaponAssaultBlueView.xml @@ -8,6 +8,7 @@ Models/Characters/Assault/FirstPersonAssaultBlue.mesh + false @@ -90,6 +91,7 @@ 1.5 Models/Weapons/Blue/AssaultWeaponBlue.mesh + false diff --git a/resources/Schema/Entities/WeaponAssaultBlueWorld.xml b/resources/Schema/Entities/WeaponAssaultBlueWorld.xml index efb2d1a4..aa844329 100644 --- a/resources/Schema/Entities/WeaponAssaultBlueWorld.xml +++ b/resources/Schema/Entities/WeaponAssaultBlueWorld.xml @@ -2,6 +2,7 @@ + Models/Weapons/Blue/AssaultWeaponBlue.mesh diff --git a/resources/Schema/Entities/WeaponDefenderBlueWorld.xml b/resources/Schema/Entities/WeaponDefenderBlueWorld.xml index abdb0e2b..18cf28da 100644 --- a/resources/Schema/Entities/WeaponDefenderBlueWorld.xml +++ b/resources/Schema/Entities/WeaponDefenderBlueWorld.xml @@ -2,6 +2,7 @@ + Models/Weapons/Blue/DefenderWeaponBlue.mesh diff --git a/resources/Schema/Entities/WeaponSidearmAssaultBlueView.xml b/resources/Schema/Entities/WeaponSidearmAssaultBlueView.xml index 3778cc80..d0a98be5 100644 --- a/resources/Schema/Entities/WeaponSidearmAssaultBlueView.xml +++ b/resources/Schema/Entities/WeaponSidearmAssaultBlueView.xml @@ -8,6 +8,7 @@ Models/Characters/Assault/FirstPersonAssaultBlue.mesh + false @@ -183,6 +184,7 @@ 1.2999999523162842 Models/Weapons/Blue/SecondaryWeaponBlue.mesh + false From a65d8c86d1d35de63e13cbb53b4c4caf6e0ed114 Mon Sep 17 00:00:00 2001 From: viktorljung Date: Mon, 14 Mar 2016 01:48:48 +0100 Subject: [PATCH 8/8] 3rd person reload effect --- resources/Schema/Entities/ReloadEffectWorld.xml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/resources/Schema/Entities/ReloadEffectWorld.xml b/resources/Schema/Entities/ReloadEffectWorld.xml index ae6d3a3e..a5ffb087 100644 --- a/resources/Schema/Entities/ReloadEffectWorld.xml +++ b/resources/Schema/Entities/ReloadEffectWorld.xml @@ -6,12 +6,14 @@ 2 - true - - - true - + + + + 1.3399996757507324 true + true + true + 5.0899982452392578 Models/Weapons/Blue/AssaultWeaponBlue.mesh