Skip to content

Commit 4d72218

Browse files
committed
Merge branch 'dev/st-tween'
2 parents 4220b48 + a662615 commit 4d72218

File tree

95 files changed

+1383
-108
lines changed

Some content is hidden

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

95 files changed

+1383
-108
lines changed

complex.sln.DotSettings

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/EMPTY_BLOCK_STYLE/@EntryValue">TOGETHER_SAME_LINE</s:String>
7575
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">180</s:Int64>
7676
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=15b5b1f1_002D457c_002D4ca6_002Db278_002D5615aedc07d3/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static readonly fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb"&gt;&lt;ExtraRule Prefix="_" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;&lt;/Policy&gt;</s:String>
77+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=a0b4bc4d_002Dd13b_002D4a37_002Db37e_002Dc9c6864e4302/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Any" AccessRightKinds="Any" Description="Types and namespaces"&gt;&lt;ElementKinds&gt;&lt;Kind Name="NAMESPACE" /&gt;&lt;Kind Name="CLASS" /&gt;&lt;Kind Name="STRUCT" /&gt;&lt;Kind Name="ENUM" /&gt;&lt;Kind Name="DELEGATE" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb"&gt;&lt;ExtraRule Prefix="" Suffix="" Style="AaBb_AaBb" /&gt;&lt;/Policy&gt;&lt;/Policy&gt;</s:String>
7778
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
7879
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
7980
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
@@ -82,4 +83,7 @@
8283
<s:Boolean x:Key="/Default/UserDictionary/Words/=ghcr/@EntryIndexedValue">True</s:Boolean>
8384
<s:Boolean x:Key="/Default/UserDictionary/Words/=letsencrypt/@EntryIndexedValue">True</s:Boolean>
8485
<s:Boolean x:Key="/Default/UserDictionary/Words/=mech/@EntryIndexedValue">True</s:Boolean>
85-
<s:Boolean x:Key="/Default/UserDictionary/Words/=opencontainers/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
86+
<s:Boolean x:Key="/Default/UserDictionary/Words/=opencontainers/@EntryIndexedValue">True</s:Boolean>
87+
<s:Boolean x:Key="/Default/UserDictionary/Words/=tweener/@EntryIndexedValue">True</s:Boolean>
88+
<s:Boolean x:Key="/Default/UserDictionary/Words/=tweeners/@EntryIndexedValue">True</s:Boolean>
89+
<s:Boolean x:Key="/Default/UserDictionary/Words/=tweens/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

complex.slnx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<Folder Name="/App/">
33
<Project Path="src\App\Common\Data\Common.Data.csproj" Type="Classic C#" />
44
<Project Path="src\App\Common\Runtime\Common.csproj" Type="Classic C#" />
5+
<Project Path="src\App\Common\Tests\Common.Tests.csproj" Type="Classic C#" />
56
<Project Path="src\App\Server\Server.csproj" Type="Classic C#" />
67
</Folder>
78
<Folder Name="/Locator/">

src/App/Client/.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,7 @@
1212
# Ignore IDE generated
1313
/obj/
1414
/.idea/
15+
16+
17+
# Testing Framework in Play mode
18+
/Assets/InitTestScene*.*

src/App/Client/Assets/Scenes/ClientContext.asset

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,3 @@ MonoBehaviour:
1818
<LogEnabled>k__BackingField: 0
1919
<LogStartBytes>k__BackingField: 100
2020
<LogEndBytes>k__BackingField: 20
21-
dumpLinkStats:
22-
In:
23-
CountTotal: 0
24-
BytesTotal: 0
25-
CountRate: 0
26-
BytesRate: 0
27-
Out:
28-
CountTotal: 0
29-
BytesTotal: 0
30-
CountRate: 0
31-
BytesRate: 0

src/App/Client/Assets/Scenes/SampleScene.unity

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ GameObject:
130130
- component: {fileID: 33769753}
131131
- component: {fileID: 33769752}
132132
m_Layer: 0
133-
m_Name: Client Session
133+
m_Name: ClientSession
134134
m_TagString: Untagged
135135
m_Icon: {fileID: 0}
136136
m_NavMeshLayer: 0
@@ -151,7 +151,7 @@ MonoBehaviour:
151151
debugControl: {fileID: 7885380990598071222}
152152
infoControl: {fileID: 1726573594}
153153
player: {fileID: 6864250239705647329}
154-
peersView: {fileID: 1848551510}
154+
serverStateView: {fileID: 1848551510}
155155
context: {fileID: 11400000, guid: 001f744c9ee894ffa9a3e7b9fed24330, type: 2}
156156
--- !u!4 &33769753
157157
Transform:
@@ -661,7 +661,7 @@ GameObject:
661661
- component: {fileID: 1848551509}
662662
- component: {fileID: 1848551510}
663663
m_Layer: 0
664-
m_Name: Peers
664+
m_Name: ServerStateView
665665
m_TagString: Untagged
666666
m_Icon: {fileID: 0}
667667
m_NavMeshLayer: 0

src/App/Client/Assets/Scripts/Attributes.meta

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/App/Client/Assets/Scripts/UI/ReadOnlyAttribute.cs renamed to src/App/Client/Assets/Scripts/Attributes/ReadOnlyAttribute.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using UnityEngine;
22

3-
namespace Common.Editor
3+
namespace Client.Attributes
44
{
55
public class ReadOnlyAttribute : PropertyAttribute { }
66
}

src/App/Client/Assets/Scripts/UI/ReadOnlyAttribute.cs.meta renamed to src/App/Client/Assets/Scripts/Attributes/ReadOnlyAttribute.cs.meta

File renamed without changes.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// using UnityEngine;
2+
//
3+
// namespace Client.Attributes
4+
// {
5+
// public class ShowInInspectorAttribute : PropertyAttribute { }
6+
// }

src/App/Client/Assets/Scripts/Attributes/ShowInInspectorAttribute.cs.meta

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)