Updated submodule remotes to something more manageable and accessible.

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "assets"]
 	path = assets
-	url = tacticalz@1.drake.imon.nu:TacticalZ-assets
+	url = https://imon.nu/git/BTH/Axyz-assets.git
 [submodule "deps"]
 	path = deps
-	url = tacticalz@1.drake.imon.nu:TacticalZ-deps
+	url = https://imon.nu/git/BTH/Axyz-deps.git

resources/Schema/Entities/DefenderShield.xml

@@ -31,13 +31,22 @@
           <Components>
             <c:Animation>
               <AnimationName>ActivateShieldU</AnimationName>
-              <Play>true</Play>
               <Loop>false</Loop>
             </c:Animation>
             <c:Transform/>
           </Components>
           <Children/>
         </Entity>
+        <Entity name="Idle">
+          <Components>
+            <c:Animation>
+              <AnimationName>ShieldFrontU</AnimationName>
+              <Play>true</Play>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
       </Children>
     </Entity>
     <Entity name="Front">
@@ -65,7 +74,16 @@
           <Components>
             <c:Animation>
               <AnimationName>ActivateShieldU</AnimationName>
-              <Play>true</Play>
+              <Loop>false</Loop>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Idle">
+          <Components>
+            <c:Animation>
+              <AnimationName>ShieldFrontU</AnimationName>
               <Loop>false</Loop>
             </c:Animation>
             <c:Transform/>

resources/Shaders/ForwardPlus.frag.glsl

@@ -321,7 +321,8 @@ void main()
 	float shadowFactor = 0.0;
 
 	for(int i = start; i < start + amount; i++) {
-
+		vec3 shadowColor = vec3(1.0);
+		
 		int l = int(LightIndex[i]);
 		LightSource light = LightSources.List[l];
 
@@ -333,13 +334,11 @@ void main()
 			int DepthMapIndex = getShadowIndex(FarDistance);
 			light_result = CalcDirectionalLightSource(V * light.Direction, light.Color, light.Intensity, viewVec, normal);
 			shadowFactor = CalcShadowValue(Input.PositionLightSpace[DepthMapIndex], Input.Normal, vec3(light.Direction), DepthMap, DepthMapIndex);
+			shadowColor = min(vec3(shadowFactor), vec3(1.0));
 		}
-		totalLighting.Diffuse += vec4(light_result.Diffuse.rgb * ao, light_result.Diffuse.a);
+		totalLighting.Diffuse += vec4(light_result.Diffuse.rgb * ao * shadowColor, light_result.Diffuse.a);
-		totalLighting.Specular += vec4(light_result.Specular.rgb * ao, light_result.Specular.a);
+		totalLighting.Specular += vec4(light_result.Specular.rgb * ao * shadowColor, light_result.Specular.a);
 	}
-	
-	totalLighting.Diffuse *= vec4(min(vec3(shadowFactor) + AmbientColor.xyz, vec3(1.0)), 1.0);
-	totalLighting.Specular *= vec4(min(vec3(shadowFactor) + AmbientColor.xyz, vec3(1.0)), 1.0);
 
 	vec4 color_result = mix((Color * diffuseTexel * DiffuseColor), Input.ExplosionColor, Input.ExplosionPercentageElapsed);
 	color_result = color_result * (totalLighting.Diffuse + (totalLighting.Specular * specularTexel));

src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp

@@ -160,9 +160,9 @@ bool DefenderWeaponBehaviour::OnInputCommand(ComponentWrapper cWeapon, WeaponInf
                     }
                 }
 
-                SpawnerSystem::Spawn(attachment, attachment);
+                if (IsServer) {
-                
+                    SpawnerSystem::Spawn(attachment, attachment);
-/*
+                }
 
                 EntityWrapper backAttachment = attachment.FirstChildByName("Back");
                 if (backAttachment.Valid()) {
@@ -172,11 +172,7 @@ bool DefenderWeaponBehaviour::OnInputCommand(ComponentWrapper cWeapon, WeaponInf
                     eDeployShieldAttachement.Restart = true;
                     eDeployShieldAttachement.Start = true;
                     m_EventBroker->Publish(eDeployShieldAttachement);
-                } else {
-                    LOG_ERROR("back shield invalid");
                 }
-
-
                 EntityWrapper frontAttachment = attachment.FirstChildByName("Front");
                 if (frontAttachment.Valid()) {
                     Events::AutoAnimationBlend eDeployShieldAttachement;
@@ -186,10 +182,7 @@ bool DefenderWeaponBehaviour::OnInputCommand(ComponentWrapper cWeapon, WeaponInf
                     eDeployShieldAttachement.Start = true;
                     m_EventBroker->Publish(eDeployShieldAttachement);
 
-                } else {
-                    LOG_ERROR("front shield invalid");
                 }
-*/
 
                 if (IsClient) {
                     EntityWrapper root = wi.FirstPersonEntity;