Skip to content

Commit 0360200

Browse files
authored
Merge pull request nibsbin#127 from SnpM/Develop
Currently stable on Unity 5.6
2 parents 1768f12 + 611f886 commit 0360200

File tree

245 files changed

+1724
-1149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

245 files changed

+1724
-1149
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "Database/Newtonsoft.Json"]
22
path = Database/Newtonsoft.Json
33
url = ../../JamesNK/Newtonsoft.Json.git
4+
[submodule "RTS-Fog"]
5+
path = RTS-Fog
6+
url = ../RTS-Fog.git

Core/Game/Abilities/Ability.cs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,30 @@ internal void Initialize()
114114
{
115115
VariableContainer.Reset();
116116
IsCasting = false;
117+
IsFirstFrame = true;
118+
117119
OnInitialize();
118120
}
119121

120122
protected virtual void OnInitialize()
121123
{
122124
}
123125

126+
bool IsFirstFrame = true;
127+
private void FirstFrame()
128+
{
129+
OnFirstFrame();
130+
}
131+
protected virtual void OnFirstFrame()
132+
{
133+
134+
}
124135
internal void Simulate()
125136
{
137+
if (IsFirstFrame)
138+
{
139+
FirstFrame();
140+
}
126141
TemplateSimulate ();
127142

128143
OnSimulate();

Core/Game/Abilities/AbilityManager.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using UnityEngine;
22
using Lockstep.Data;
33
using System.Collections.Generic;
4+
using FastCollections;
45
using System;
56
namespace Lockstep {
67
public class AbilityManager {

Core/Game/Abilities/BehaviourHelper/BehaviourHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using UnityEngine;
2-
using System.Collections;
2+
using System.Collections; using FastCollections;
33
using Lockstep;
44
using System.Collections.Generic;
55
using System;

Core/Game/Abilities/BehaviourHelper/BehaviourHelperManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using UnityEngine;
2-
using System.Collections;
2+
using System.Collections; using FastCollections;
33

44
namespace Lockstep {
55
public static class BehaviourHelperManager {

Core/Game/Abilities/BehaviourHelper/DefaultHelperSetup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using UnityEngine;
2-
using System.Collections;
2+
using System.Collections; using FastCollections;
33
using Lockstep.Data;
44
namespace Lockstep
55
{
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using UnityEngine;
2-
using System.Collections;
2+
using System.Collections; using FastCollections;
33

44
public interface IBehaviourHelper {
55
}

Core/Game/Abilities/DurationAbility.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using UnityEngine;
2-
using System.Collections;
2+
using System.Collections; using FastCollections;
33
namespace Lockstep
44
{
55
public class DurationAbility : ActiveAbility

Core/Game/Abilities/Essential/Health/AttackerInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using UnityEngine;
2-
using System.Collections;
2+
using System.Collections; using FastCollections;
33
namespace Lockstep
44
{
55
public class AttackerInfo

Core/Game/Abilities/Essential/HeightSet.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using UnityEngine;
2-
using System.Collections;
2+
using System.Collections; using FastCollections;
33

44
namespace Lockstep
55
{

0 commit comments

Comments
 (0)