Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
3b069c0
Fix tower capture not being completed for clients
tcgj Apr 16, 2020
573b33d
Add host button timeout
tcgj Apr 16, 2020
5b7e6fc
Fix monsters not synchronising movement and spawning multiple damage
tcgj Apr 16, 2020
25223df
Fixed plant death anim
heze8 Apr 17, 2020
697352f
Make monster retreat when player is too far away
heze8 Apr 17, 2020
a8df53e
Update semicolon
heze8 Apr 17, 2020
a175c6b
Kill all monster instances if it dies in any client
tcgj Apr 17, 2020
9f9b303
Change trigger target to nearest player
heze8 Apr 17, 2020
aa2ee67
Fix float
heze8 Apr 17, 2020
7372227
Fix skill handler picking up network player skills
tcgj Apr 17, 2020
211b6f0
Fix not moving
heze8 Apr 17, 2020
20722fb
Fix ui skill handler not removing correct skill
tcgj Apr 17, 2020
81808be
Fix monster attack animation not triggering
tcgj Apr 17, 2020
3435db9
increase capsule collider on monster
fatclarence Apr 17, 2020
79d5f42
increase capsule collider on all monsters again
fatclarence Apr 17, 2020
88fde3c
Fix network player attempting to access player movement
tcgj Apr 17, 2020
414e2de
Made the player detection update onTriggerstay as well
heze8 Apr 17, 2020
cb6fda9
Check for reference of nearest player in couroutine update
heze8 Apr 17, 2020
2a8a0f6
increase height of mushroom capsule collider
fatclarence Apr 17, 2020
27c0dca
Add last monster to scene
heze8 Apr 17, 2020
d865164
edit capsule colliders of in-scene monsters
fatclarence Apr 17, 2020
010e476
Minor game fixes
tcgj Apr 17, 2020
13c3b6f
Add character controller null check
tcgj Apr 17, 2020
ab56036
fix mushroom colliders to improve damage detection
fatclarence Apr 17, 2020
88e4017
fix shuriken colliding with player and move mushroom monster
fatclarence Apr 17, 2020
3cbd260
Set player without display name as Guest
tcgj Apr 17, 2020
04c8c3f
Check for null
heze8 Apr 17, 2020
56f9a85
Make tower fill gauge relative to fraction of players in zone
tcgj Apr 17, 2020
390f0a4
Remove buggy hairstyle from customisation
tcgj Apr 17, 2020
9e9f9fb
Playtest Fixes e6.2.1
Eclmist Apr 19, 2020
5184660
Removed junk from master
Eclmist Apr 19, 2020
b3e2ffe
Change tower capture message
tcgj Apr 19, 2020
43e4f6a
Fix terrain hole texture sampling
Eclmist Apr 20, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions Assets/AI/AiAgentPrefab/AI_Mushroom_Monster.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Material: {fileID: 2100000, guid: cd24d48ba62a7a142aae6140cecde38a, type: 2}
m_Color: {r: 1, g: 0.3619151, b: 0.18431371, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
Expand Down Expand Up @@ -394,7 +394,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Material: {fileID: 2100000, guid: cd24d48ba62a7a142aae6140cecde38a, type: 2}
m_Color: {r: 1, g: 0.3619151, b: 0.18431371, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
Expand Down Expand Up @@ -662,7 +662,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1934064025}
m_LocalRotation: {x: -0.16986646, y: -0.000000229943, z: -0.0000013339967, w: 0.98546714}
m_LocalRotation: {x: 0.16237117, y: 0.17217204, z: -0.028785804, w: 0.97116625}
m_LocalPosition: {x: 0, y: 0, z: 0.173}
m_LocalScale: {x: 0.02, y: 0.02, z: 0.02}
m_Children:
Expand Down Expand Up @@ -741,8 +741,8 @@ CapsuleCollider:
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Radius: 0.3834559
m_Height: 2.0990224
m_Radius: 1.26
m_Height: 5.79
m_Direction: 1
m_Center: {x: 0, y: 1.1234368, z: -0.11654409}
--- !u!82 &5564611184860406008
Expand Down Expand Up @@ -1011,9 +1011,6 @@ MonoBehaviour:
m_MonsterAnimation: {fileID: 5564611184860405959}
m_AttackSource:
- {fileID: 5564611184946383485}
m_DamageAmount: 0
m_DamageRadius: 10
m_DamageDuration: 0.2
DEBUG_DEATH: 0
DEBUG_GOTHIT: 0
--- !u!114 &1056623341
Expand Down
13 changes: 5 additions & 8 deletions Assets/AI/AiAgentPrefab/Ai_Plant_Monster.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -4966,7 +4966,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Material: {fileID: 2100000, guid: cd24d48ba62a7a142aae6140cecde38a, type: 2}
m_Color: {r: 1, g: 0.3619151, b: 0.18431371, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
Expand Down Expand Up @@ -5127,9 +5127,6 @@ MonoBehaviour:
m_MonsterAnimation: {fileID: 630678169}
m_AttackSource:
- {fileID: 3539631059896273994}
m_DamageAmount: 10
m_DamageRadius: 5
m_DamageDuration: 0.2
DEBUG_DEATH: 0
DEBUG_GOTHIT: 0
--- !u!114 &437460316
Expand Down Expand Up @@ -13303,8 +13300,8 @@ CapsuleCollider:
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Radius: 0.364135
m_Height: 1.8817577
m_Radius: 0.9
m_Height: 2.93
m_Direction: 1
m_Center: {x: 0, y: 0.67656684, z: 0}
--- !u!82 &3539631059896054121
Expand Down Expand Up @@ -13710,7 +13707,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Material: {fileID: 2100000, guid: cd24d48ba62a7a142aae6140cecde38a, type: 2}
m_Color: {r: 1, g: 0.3619151, b: 0.18431371, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
Expand Down Expand Up @@ -13786,7 +13783,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8037042474528051421}
m_LocalRotation: {x: -0.16986646, y: -0.00000022956618, z: -0.0000013318106, w: 0.98546714}
m_LocalRotation: {x: 0.1623665, y: 0.1723407, z: -0.028813971, w: 0.9711363}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.0150000015, y: 0.015, z: 0.015000001}
m_Children:
Expand Down
37 changes: 17 additions & 20 deletions Assets/AI/AiAgentPrefab/Ai_Rock_Monster.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,6 @@ MonoBehaviour:
m_AttackSource:
- {fileID: 5408238715244963012}
- {fileID: 5408238715244963050}
m_DamageAmount: 43
m_DamageRadius: 5
m_DamageDuration: 0.2
DEBUG_DEATH: 0
DEBUG_GOTHIT: 0
--- !u!54 &1512153434069106058
Expand Down Expand Up @@ -285,7 +282,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2467831435125450895}
m_LocalRotation: {x: -0.16986646, y: -0.00000023043428, z: -0.0000013368467, w: 0.98546714}
m_LocalRotation: {x: 0.16236645, y: 0.17234069, z: -0.028813953, w: 0.9711363}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.02, y: 0.02, z: 0.020000001}
m_Children:
Expand Down Expand Up @@ -456,6 +453,20 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HealthHandler: {fileID: 976267581945267424}
m_HealthText: {fileID: 3280727833737103834}
--- !u!136 &6933503074449039424
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5408238715245394276}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Radius: 1.5
m_Height: 5.42
m_Direction: 1
m_Center: {x: 0, y: 1.37, z: -0.22103237}
--- !u!82 &5408238716692284943
AudioSource:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -603,20 +614,6 @@ MonoBehaviour:
- {fileID: 8300000, guid: 300d5d9d945e64209b9d33fca34b6c8c, type: 3}
- {fileID: 8300000, guid: 00d8ab826913e468ab6bd192a488a459, type: 3}
- {fileID: 8300000, guid: 475f60c10e97a4e17a124839ed1bcfd0, type: 3}
--- !u!136 &6933503074449039424
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5408238715245394276}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Radius: 0.47392333
m_Height: 1.9430742
m_Direction: 1
m_Center: {x: 0, y: 1.9667757, z: -0.22103237}
--- !u!1 &5919646215690083939
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -676,7 +673,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Material: {fileID: 2100000, guid: cd24d48ba62a7a142aae6140cecde38a, type: 2}
m_Color: {r: 1, g: 0.3619151, b: 0.18431371, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
Expand Down Expand Up @@ -5606,7 +5603,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Material: {fileID: 2100000, guid: cd24d48ba62a7a142aae6140cecde38a, type: 2}
m_Color: {r: 1, g: 0.3619151, b: 0.18431371, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
Expand Down
21 changes: 14 additions & 7 deletions Assets/AI/AiAgentPrefab/Ai_Worm_Monster.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,6 @@ MonoBehaviour:
m_AttackSource:
- {fileID: 459701034421040414}
- {fileID: 459701034421040286}
m_DamageAmount: 30
m_DamageRadius: 10
m_DamageDuration: 0.2
DEBUG_DEATH: 0
DEBUG_GOTHIT: 0
--- !u!54 &9086353944631980033
Expand Down Expand Up @@ -381,22 +378,22 @@ PrefabInstance:
- target: {fileID: 5336226993382622162, guid: e6767c3a81bab064683f3098157a9db7,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.16986646
value: 0.16236632
objectReference: {fileID: 0}
- target: {fileID: 5336226993382622162, guid: e6767c3a81bab064683f3098157a9db7,
type: 3}
propertyPath: m_LocalRotation.y
value: -0.00000022794286
value: 0.17234075
objectReference: {fileID: 0}
- target: {fileID: 5336226993382622162, guid: e6767c3a81bab064683f3098157a9db7,
type: 3}
propertyPath: m_LocalRotation.z
value: -0.0000013223931
value: -0.02881392
objectReference: {fileID: 0}
- target: {fileID: 5336226993382622162, guid: e6767c3a81bab064683f3098157a9db7,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.98546714
value: 0.9711363
objectReference: {fileID: 0}
- target: {fileID: 5336226993382622162, guid: e6767c3a81bab064683f3098157a9db7,
type: 3}
Expand Down Expand Up @@ -473,6 +470,16 @@ PrefabInstance:
propertyPath: m_Layer
value: 16
objectReference: {fileID: 0}
- target: {fileID: 5768307698036309928, guid: e6767c3a81bab064683f3098157a9db7,
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 2100000, guid: cd24d48ba62a7a142aae6140cecde38a, type: 2}
- target: {fileID: 7648100751666491294, guid: e6767c3a81bab064683f3098157a9db7,
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 2100000, guid: cd24d48ba62a7a142aae6140cecde38a, type: 2}
- target: {fileID: 8401654686376924893, guid: e6767c3a81bab064683f3098157a9db7,
type: 3}
propertyPath: m_Layer
Expand Down
6 changes: 3 additions & 3 deletions Assets/AI/FiniteStateMachine/Plant_Monster_FSM.controller
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
Expand Down Expand Up @@ -361,8 +361,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_AttackInterval: 1
m_AttackRange: 3.9
m_stateDuration: 15
m_MaxDistanceFromSpawn: 30
m_stateDuration: 10
m_MaxDistanceFromSpawn: 20
--- !u!114 &6366386016447996097
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@

namespace BeardedManStudios.Forge.Networking.Generated
{
[GeneratedRPC("{\"types\":[]")]
[GeneratedRPCVariableNames("{\"types\":[]")]
[GeneratedRPC("{\"types\":[[\"string\"]]")]
[GeneratedRPCVariableNames("{\"types\":[[\"attackName\"]]")]
public abstract partial class MonsterObjectBehavior : NetworkBehavior
{
public const byte RPC_TRIGGER_ATTACK_ANIM = 0 + 5;

public MonsterObjectNetworkObject networkObject = null;

Expand All @@ -21,6 +22,7 @@ public override void Initialize(NetworkObject obj)
networkObject.AttachedBehavior = this;

base.SetupHelperRpcs(networkObject);
networkObject.RegisterRpc("TriggerAttackAnim", TriggerAttackAnim, typeof(string));

networkObject.onDestroy += DestroyGameObject;

Expand Down Expand Up @@ -94,6 +96,11 @@ protected override void InitializedTransform()
networkObject.SnapInterpolations();
}

/// <summary>
/// Arguments:
/// string attackName
/// </summary>
public abstract void TriggerAttackAnim(RpcArgs args);

// DO NOT TOUCH, THIS GETS GENERATED PLEASE EXTEND THIS CLASS IF YOU WISH TO HAVE CUSTOM CODE ADDITIONS
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace BeardedManStudios.Forge.Networking.Generated
{
[GeneratedInterpol("{\"inter\":[0.15]")]
[GeneratedInterpol("{\"inter\":[0]")]
public partial class TowerNetworkObject : NetworkObject
{
public const int IDENTITY = 16;
Expand All @@ -18,7 +18,7 @@ public partial class TowerNetworkObject : NetworkObject
[ForgeGeneratedField]
private float _captureGauge;
public event FieldEvent<float> captureGaugeChanged;
public InterpolateFloat captureGaugeInterpolation = new InterpolateFloat() { LerpT = 0.15f, Enabled = true };
public InterpolateFloat captureGaugeInterpolation = new InterpolateFloat() { LerpT = 0f, Enabled = false };
public float captureGauge
{
get { return _captureGauge; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,15 @@ public void ConnectToMatchmaking()

public void Host()
{
if (waitForTimeout)
{
if (Time.time < nextAvailableConnect)
return;
}

waitForTimeout = true;
nextAvailableConnect = Time.time + timeoutDuration + 2.0f;

if (useTCP)
{
server = new TCPServer(maxPlayers);
Expand Down
Loading