Skip to content

AI Clan Rework --> AI Rework #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Slinta merged 14 commits into from
Nov 4, 2017
Merged

AI Clan Rework --> AI Rework #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2a7e5ca
WIP clan redo. Implementing interfaces.
Slinta Oct 16, 2017
c2fa110
Now erroless at start but some player script errors happen
Slinta Oct 17, 2017
918dbd1
More changes to AI
Michal-MK Oct 23, 2017
368cb52
Small changes and images
Michal-MK Oct 25, 2017
0cd16c8
Hotfix of simple error, remake in the works
Slinta Oct 25, 2017
adae112
Merge branch 'AI_Rework_ClanRedo' of https://github.com/Michal-MK/Dot…
Michal-MK Oct 25, 2017
0329cc1
added fixes but still errors
Slinta Oct 27, 2017
7e4b712
Bugfix
Slinta Oct 27, 2017
48a6ab3
Clear Neutrals after game
Michal-MK Oct 27, 2017
561f1f8
Merge branch 'AI_Rework_ClanRedo' of https://github.com/Michal-MK/Dot…
Michal-MK Oct 27, 2017
0401bc3
Bugfixes
Slinta Oct 27, 2017
a4e6c24
AI stuff
Michal-MK Nov 1, 2017
3b80729
Player Teams
Michal-MK Nov 2, 2017
442293e
Neutral cell bugfix
Slinta Nov 4, 2017
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
12 changes: 6 additions & 6 deletions Dots-RTS-Development/Assets/Scenes/Post_Game.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,10 +336,10 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 80
m_fontSize: 72
m_fontSizeBase: 80
m_fontWeight: 400
m_enableAutoSizing: 0
m_enableAutoSizing: 1
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
Expand Down Expand Up @@ -1159,10 +1159,10 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 32
m_fontSize: 30.15
m_fontSizeBase: 32
m_fontWeight: 400
m_enableAutoSizing: 0
m_enableAutoSizing: 1
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
Expand Down Expand Up @@ -1466,10 +1466,10 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 36
m_fontSize: 35.2
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 0
m_enableAutoSizing: 1
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
Expand Down
74 changes: 44 additions & 30 deletions Dots-RTS-Development/Assets/Scenes/Upgrade_Store.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,12 +527,12 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 24
m_fontSize: 32
m_fontSizeBase: 24
m_fontWeight: 400
m_enableAutoSizing: 0
m_enableAutoSizing: 1
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontSizeMax: 32
m_fontStyle: 0
m_textAlignment: 258
m_isAlignmentEnumConverted: 1
Expand Down Expand Up @@ -1330,12 +1330,12 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 30
m_fontSize: 22.05
m_fontSizeBase: 30
m_fontWeight: 400
m_enableAutoSizing: 0
m_enableAutoSizing: 1
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontSizeMax: 42
m_fontStyle: 0
m_textAlignment: 514
m_isAlignmentEnumConverted: 1
Expand Down Expand Up @@ -2898,7 +2898,13 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: U T I L
m_text: 'U

T

I

L'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: a3d0691d7d9b4d846b49ce03cef7aae8, type: 2}
m_sharedMaterial: {fileID: 21524089645596496, guid: a3d0691d7d9b4d846b49ce03cef7aae8,
Expand Down Expand Up @@ -2926,10 +2932,10 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 38
m_fontSize: 24.95
m_fontSizeBase: 38
m_fontWeight: 400
m_enableAutoSizing: 0
m_enableAutoSizing: 1
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
Expand Down Expand Up @@ -6134,7 +6140,7 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 33.3
m_fontSize: 21.1
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
Expand Down Expand Up @@ -6624,7 +6630,7 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 45.95
m_fontSize: 29.95
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
Expand Down Expand Up @@ -8231,7 +8237,11 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: D E F
m_text: 'D

E

F'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: a3d0691d7d9b4d846b49ce03cef7aae8, type: 2}
m_sharedMaterial: {fileID: 21524089645596496, guid: a3d0691d7d9b4d846b49ce03cef7aae8,
Expand Down Expand Up @@ -8259,10 +8269,10 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 38
m_fontSize: 31.8
m_fontSizeBase: 38
m_fontWeight: 400
m_enableAutoSizing: 0
m_enableAutoSizing: 1
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
Expand Down Expand Up @@ -8459,7 +8469,7 @@ MonoBehaviour:
spaceCount: 12
wordCount: 12
linkCount: 0
lineCount: 3
lineCount: 6
pageCount: 1
materialCount: 1
m_havePropertiesChanged: 0
Expand Down Expand Up @@ -8774,12 +8784,12 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 32.31
m_fontSize: 22.05
m_fontSizeBase: 32.31
m_fontWeight: 400
m_enableAutoSizing: 0
m_enableAutoSizing: 1
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontSizeMax: 42
m_fontStyle: 0
m_textAlignment: 514
m_isAlignmentEnumConverted: 1
Expand Down Expand Up @@ -9809,12 +9819,12 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 24
m_fontSize: 29.2
m_fontSizeBase: 24
m_fontWeight: 400
m_enableAutoSizing: 0
m_enableAutoSizing: 1
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontSizeMax: 32
m_fontStyle: 0
m_textAlignment: 258
m_isAlignmentEnumConverted: 1
Expand Down Expand Up @@ -9854,7 +9864,7 @@ MonoBehaviour:
spaceCount: 1
wordCount: 2
linkCount: 0
lineCount: 1
lineCount: 2
pageCount: 1
materialCount: 1
m_havePropertiesChanged: 0
Expand Down Expand Up @@ -10811,7 +10821,7 @@ MonoBehaviour:
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_firstOverflowCharacterIndex: -1
m_firstOverflowCharacterIndex: 8
m_linkedTextComponent: {fileID: 0}
m_isLinkedTextComponent: 0
m_enableKerning: 1
Expand All @@ -10838,7 +10848,7 @@ MonoBehaviour:
spaceCount: 4
wordCount: 5
linkCount: 0
lineCount: 3
lineCount: 5
pageCount: 1
materialCount: 1
m_havePropertiesChanged: 0
Expand Down Expand Up @@ -11182,7 +11192,11 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: A T K
m_text: 'A

T

K'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: a3d0691d7d9b4d846b49ce03cef7aae8, type: 2}
m_sharedMaterial: {fileID: 21524089645596496, guid: a3d0691d7d9b4d846b49ce03cef7aae8,
Expand Down Expand Up @@ -11210,10 +11224,10 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 38
m_fontSize: 29.2
m_fontSizeBase: 38
m_fontWeight: 400
m_enableAutoSizing: 0
m_enableAutoSizing: 1
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
Expand Down Expand Up @@ -11654,7 +11668,7 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 33.75
m_fontSize: 18
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
Expand All @@ -11672,7 +11686,7 @@ MonoBehaviour:
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_firstOverflowCharacterIndex: -1
m_firstOverflowCharacterIndex: 8
m_linkedTextComponent: {fileID: 0}
m_isLinkedTextComponent: 0
m_enableKerning: 1
Expand Down Expand Up @@ -12431,7 +12445,7 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 45.95
m_fontSize: 29.95
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
Expand Down
Loading