Skip to content

Sikelia #29

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

Open
worldsmithdev wants to merge 36 commits into
base: master
Choose a base branch
from
Open

Sikelia #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
24cc0a4
first import
worldsmithdev May 4, 2019
e7902af
test
worldsmithdev May 4, 2019
5d29ed9
Merge branch 'master' into sikelia
worldsmithdev May 4, 2019
8767764
Merge branch 'master' into sikelia
worldsmithdev May 4, 2019
b7a5b63
Maps import
worldsmithdev May 4, 2019
43db6ef
placing cities
worldsmithdev May 5, 2019
87a0667
fixes
worldsmithdev May 7, 2019
4ea1aab
Merge branch 'master' into sikelia
worldsmithdev May 8, 2019
524e9fd
Fix Builders
worldsmithdev May 8, 2019
1960fe2
builder adds
worldsmithdev May 8, 2019
6f24b42
Merge branch 'master' into sikelia
worldsmithdev May 8, 2019
07b2466
builder additions
worldsmithdev May 8, 2019
88d0bb5
Merge branch 'master' into sikelia
worldsmithdev May 8, 2019
9c012a1
Update Main.unity
worldsmithdev May 9, 2019
c6e9da6
Merge branch 'master' into sikelia
worldsmithdev May 9, 2019
6283168
fix simulation import
worldsmithdev May 9, 2019
3e565a8
simulation content
worldsmithdev May 9, 2019
43dcb78
Generation
worldsmithdev May 10, 2019
6153e7f
Proceed simulation
worldsmithdev May 21, 2019
59ec853
Generation step
worldsmithdev May 21, 2019
3e74131
localpolitics step
worldsmithdev May 21, 2019
cfc709d
Generation,Industry,Politics
worldsmithdev May 22, 2019
b269daf
Simulation continued. Explore UI
worldsmithdev May 23, 2019
929e55a
Texts
worldsmithdev Jun 5, 2019
c8c9b8a
Market fixing
worldsmithdev Jun 7, 2019
e3cba25
Version update .6
worldsmithdev Jun 11, 2019
b17e863
pc import fixes
worldsmithdev Jun 11, 2019
7db0881
locmarket 2
worldsmithdev Jun 23, 2019
3383187
local exchanges
worldsmithdev Jun 28, 2019
2da0ff1
localexchanges - silver payment
worldsmithdev Jun 28, 2019
80e7dc8
loc markets done
worldsmithdev Jul 1, 2019
e98e2a9
regional exchange
worldsmithdev Jul 8, 2019
2447318
exchanges
worldsmithdev Jul 10, 2019
1c72533
exchanges
worldsmithdev Jul 13, 2019
fbee085
exchanges fixes
worldsmithdev Jul 14, 2019
3fc8f28
exchange fixes
worldsmithdev Jul 14, 2019
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
88 changes: 0 additions & 88 deletions WorldsmithUnityProject/Assets/Images/Locations/Icons/Harbor1.png.meta
View file
Open in desktop

This file was deleted.

88 changes: 0 additions & 88 deletions WorldsmithUnityProject/Assets/Images/Locations/Icons/Harbor2.png.meta
View file
Open in desktop

This file was deleted.

88 changes: 0 additions & 88 deletions WorldsmithUnityProject/Assets/Images/Locations/Icons/Harbor4.png.meta
View file
Open in desktop

This file was deleted.

88 changes: 0 additions & 88 deletions WorldsmithUnityProject/Assets/Images/Locations/Icons/Harbor5.png.meta
View file
Open in desktop

This file was deleted.

Binary file renamed ...Assets/Images/Locations/Icons/Harbor2.png → ...ct/Assets/Images/Locations/Icons/Hub1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 7 additions & 5 deletions ...Images/Locations/Icons/Economic5.png.meta → ...sets/Images/Locations/Icons/Hub1.png.meta
View file
Open in desktop

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

Binary file renamed ...Assets/Images/Locations/Icons/Harbor5.png → ...ct/Assets/Images/Locations/Icons/Hub2.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading