WIP STUFF
This commit is contained in:
@@ -7,6 +7,10 @@
|
|||||||
<Gamma>1</Gamma>
|
<Gamma>1</Gamma>
|
||||||
<Exposure>0.82000017166137695</Exposure>
|
<Exposure>0.82000017166137695</Exposure>
|
||||||
</c:SceneLight>
|
</c:SceneLight>
|
||||||
|
<c:CapturePointGameMode>
|
||||||
|
<RespawnTime>0.32289272439493288</RespawnTime>
|
||||||
|
<MaxRespawnTime>0.5</MaxRespawnTime>
|
||||||
|
</c:CapturePointGameMode>
|
||||||
<c:Transform/>
|
<c:Transform/>
|
||||||
</Components>
|
</Components>
|
||||||
|
|
||||||
@@ -73,7 +77,9 @@
|
|||||||
</Entity>
|
</Entity>
|
||||||
<Entity name="Cam">
|
<Entity name="Cam">
|
||||||
<Components>
|
<Components>
|
||||||
<c:Camera/>
|
<c:Camera>
|
||||||
|
<FOV>47</FOV>
|
||||||
|
</c:Camera>
|
||||||
<c:Model>
|
<c:Model>
|
||||||
<Resource>Models/Core/UnitSphere.mesh</Resource>
|
<Resource>Models/Core/UnitSphere.mesh</Resource>
|
||||||
<Shadow>false</Shadow>
|
<Shadow>false</Shadow>
|
||||||
@@ -92,6 +98,11 @@
|
|||||||
</Entity>
|
</Entity>
|
||||||
<Entity name="Spawn">
|
<Entity name="Spawn">
|
||||||
<Components>
|
<Components>
|
||||||
|
<c:Team>
|
||||||
|
<Team>
|
||||||
|
<Blue/>
|
||||||
|
</Team>
|
||||||
|
</c:Team>
|
||||||
<c:PlayerSpawn>
|
<c:PlayerSpawn>
|
||||||
<AssaultFile>Schema/Entities/PlayerAssaultBlue.xml</AssaultFile>
|
<AssaultFile>Schema/Entities/PlayerAssaultBlue.xml</AssaultFile>
|
||||||
<DefenderFile>Schema/Entities/PlayerDefenderBlue.xml</DefenderFile>
|
<DefenderFile>Schema/Entities/PlayerDefenderBlue.xml</DefenderFile>
|
||||||
@@ -99,6 +110,7 @@
|
|||||||
</c:PlayerSpawn>
|
</c:PlayerSpawn>
|
||||||
<c:Model>
|
<c:Model>
|
||||||
<Resource>Models/Characters/Assault/AssaultBlue.mesh</Resource>
|
<Resource>Models/Characters/Assault/AssaultBlue.mesh</Resource>
|
||||||
|
<Visible>false</Visible>
|
||||||
</c:Model>
|
</c:Model>
|
||||||
<c:Spawner>
|
<c:Spawner>
|
||||||
<EntityFile></EntityFile>
|
<EntityFile></EntityFile>
|
||||||
@@ -109,6 +121,18 @@
|
|||||||
</Components>
|
</Components>
|
||||||
<Children/>
|
<Children/>
|
||||||
</Entity>
|
</Entity>
|
||||||
|
<Entity>
|
||||||
|
<Components>
|
||||||
|
<c:Model>
|
||||||
|
<Resource>Models/Highgrounds/Hg21.mesh</Resource>
|
||||||
|
</c:Model>
|
||||||
|
<c:Transform>
|
||||||
|
<Position X="0" Y="-1.75605178" Z="-20.9220009"/>
|
||||||
|
<Scale X="0.407000005" Y="0.407000005" Z="0.407000005"/>
|
||||||
|
</c:Transform>
|
||||||
|
</Components>
|
||||||
|
<Children/>
|
||||||
|
</Entity>
|
||||||
</Children>
|
</Children>
|
||||||
|
|
||||||
</Entity>
|
</Entity>
|
||||||
|
|||||||
+3065
File diff suppressed because it is too large
Load Diff
@@ -184,7 +184,7 @@ bool RenderSystem::isEntityVisible(EntityWrapper& entity)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Hide things parented to local player if they have the HiddenFromLocalPlayer component
|
// Hide things parented to local player if they have the HiddenFromLocalPlayer component
|
||||||
bool outOfBodyExperience = false; // ResourceManager::Load<ConfigFile>("Config.ini")->Get<bool>("Debug.OutOfBodyExperience", false);
|
bool outOfBodyExperience = ResourceManager::Load<ConfigFile>("Config.ini")->Get<bool>("Debug.OutOfBodyExperience", false);
|
||||||
if (
|
if (
|
||||||
(entity.HasComponent("HiddenForLocalPlayer") || entity.FirstParentWithComponent("HiddenForLocalPlayer").Valid())
|
(entity.HasComponent("HiddenForLocalPlayer") || entity.FirstParentWithComponent("HiddenForLocalPlayer").Valid())
|
||||||
&& (entity == m_LocalPlayer || entity.IsChildOf(m_LocalPlayer))
|
&& (entity == m_LocalPlayer || entity.IsChildOf(m_LocalPlayer))
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ void PlayerMovementSystem::Update(double dt)
|
|||||||
{
|
{
|
||||||
updateMovementControllers(dt);
|
updateMovementControllers(dt);
|
||||||
// Only do physics calculations on client and only for themselves.
|
// Only do physics calculations on client and only for themselves.
|
||||||
if (IsClient) {
|
if (IsClient || true) {
|
||||||
if (LocalPlayer.Valid()){
|
if (LocalPlayer.Valid()){
|
||||||
updateVelocity(LocalPlayer, dt);
|
updateVelocity(LocalPlayer, dt);
|
||||||
}
|
}
|
||||||
@@ -73,7 +73,7 @@ void PlayerMovementSystem::Update(double dt)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
for (auto cDash : *pool) {
|
for (auto cDash : *pool) {
|
||||||
if (cDash.EntityID != LocalPlayer.ID && (double)cDash["CoolDownMaxTimer"] - (double)cDash["CoolDownTimer"] < 0.5) {
|
if ((double)cDash["CoolDownMaxTimer"] - (double)cDash["CoolDownTimer"] < 0.5) {
|
||||||
// Spawn one afterimage for each player that Dashes.
|
// Spawn one afterimage for each player that Dashes.
|
||||||
EntityWrapper player(m_World, cDash.EntityID);
|
EntityWrapper player(m_World, cDash.EntityID);
|
||||||
auto playerModel = player.FirstChildByName("PlayerModel");
|
auto playerModel = player.FirstChildByName("PlayerModel");
|
||||||
|
|||||||
Reference in New Issue
Block a user