Skip to content

Commit 2c4c639

Browse files
Dvega0xEDvega0xE
authored
Merge pull request #50 from Traitor-Jones/chai-dev
Fixed All Issues from Merges + Dump Scene
2 parents 896bb52 + 5575fc5 commit 2c4c639

24 files changed

+1411
-2786
lines changed

‎Assets/Logo.meta‎

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

‎Assets/Logo/DTF-CHAI.jpg‎

178 KB
Loading

‎Assets/Logo/DTF-CHAI.jpg.meta‎

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

‎Assets/Logo/DTF-CHAI.png‎

51.1 KB
Loading

‎Assets/Logo/DTF-CHAI.png.meta‎

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

‎Assets/Scenes/Credits.unity‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,10 +307,10 @@ MonoBehaviour:
307307
m_GameObject: {fileID: 1215353964}
308308
m_Enabled: 1
309309
m_EditorHideFlags: 0
310-
m_Script: {fileID: 11500000, guid: 4d7fcc4ebdadf994eba13108513e29c4, type: 3}
310+
m_Script: {fileID: 11500000, guid: 9ee955791c079c34a8cf76b028dace66, type: 3}
311311
m_Name:
312312
m_EditorClassIdentifier:
313-
scrollSpeed: 21
313+
scrollSpeed: 18
314314
--- !u!212 &1215353966
315315
SpriteRenderer:
316316
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)