Skip to content

Commit

Permalink
Fixed Catch Button placement. Units now correctly rotate on all clients
Browse files Browse the repository at this point in the history
  • Loading branch information
mariuskilian committed May 6, 2020
1 parent 8b9b4d1 commit 6a3402e
Show file tree
Hide file tree
Showing 173 changed files with 25,408 additions and 99 deletions.
Binary file added .DS_Store
Binary file not shown.
Binary file added Assets/.DS_Store
Binary file not shown.
31 changes: 31 additions & 0 deletions Assets/Data/Arena Layout/CLASSIC.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cafeac20b3647714e9e4efb419ab8497, type: 3}
m_Name: CLASSIC
m_EditorClassIdentifier:
board:
array2D:
- row: 0101010101010101
- row: 0101010101010101
- row: 0101010101010101
- row: 0101010101010101
- row: 0101010101010101
- row: 0101010101010101
- row: 0101010101010101
- row: 0101010101010101
BenchSizeTiles: 9
EqualDimensions: 1
PointSymmetric: 1
YSymmetric: 1
BenchCentered: 1
DefaultYOffset: 1
fillMode: 0

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Assets/Data/Game Modes/Classic.asset
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 61d58f53045ec6b4d9f09148f39c99fa, type: 3}
m_Name: CLASSIC
m_Name: Classic
m_EditorClassIdentifier:
arenaLayout:
array2D:
Expand Down
2 changes: 1 addition & 1 deletion Assets/Data/Game Settings/Default.asset
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9ee364d372d0be046a202fa63ad3594d, type: 3}
m_Name: DEFAULT
m_Name: Default
m_EditorClassIdentifier:
PoolSize: 2d0000001e000000190000000f0000000a00000001000000
DropChance:
Expand Down
Binary file modified Assets/Photon/PhotonBolt/assemblies/bolt.user.dll
Binary file not shown.
3 changes: 1 addition & 2 deletions Assets/Photon/PhotonBolt/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@
{
"Name": "Rotation",
"Enabled": true,
"Expanded": true,
"ReplicationMode": 2,
"ReplicationMode": 1,
"Priority": 1,
"PropertyType": {
"$type": "Bolt.Compiler.PropertyTypeQuaternion, bolt.compiler",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ MonoBehaviour:
showDebugInfo: 1
overrideTimeScale: 1
logUncaughtExceptions: 0
debugEditorMode: 2
debugEditorMode: 1
consoleToggleKey: 9
consoleVisibleByDefault: 0
compilationWarnLevel: 4
Expand Down
Loading

0 comments on commit 6a3402e

Please sign in to comment.