Skip to content

Commit 77e3e49

Browse files
authored
Merge pull request #1 from DiegoRuizGil/develop
Develop
2 parents c57fb1d + 2131079 commit 77e3e49

File tree

274 files changed

+16221
-1717
lines changed

Some content is hidden

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

274 files changed

+16221
-1717
lines changed

.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,14 @@
2121

2222
# Visual Studio cache directory
2323
.vs/
24+
*.suo
25+
*.user
26+
*.sln.docstates
27+
28+
# Rider
29+
.idea/
30+
*.sln.DotSettings.user
31+
*.sln.DotSettings
2432

2533
# Gradle cache directory
2634
.gradle/

Assets/Scripts/GameEvents/Custom Types.meta renamed to Assets/Fonts.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Fonts/kenvector_future SDF.asset

Lines changed: 691 additions & 0 deletions
Large diffs are not rendered by default.

Assets/PointsUpdateGameEvent.asset.meta renamed to Assets/Fonts/kenvector_future SDF.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Fonts/kenvector_future.ttf

33.3 KB
Binary file not shown.

Assets/Fonts/kenvector_future.ttf.meta

Lines changed: 21 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)