Skip to content

Sebastian's new branch #491

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
Glimmerfrost wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Sebastian's new branch #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
721d06d
Update to DerailedTrain
Glimmerfrost Apr 22, 2026
a2b24ec
Merge branch 'main' into Sebastian's-New-Branch
Glimmerfrost Apr 22, 2026
14c3c8b
Merge branch 'main' into Sebastian's-New-Branch
Glimmerfrost Apr 29, 2026
88f51bf
Timer Changes
Glimmerfrost Apr 29, 2026
50371d3
Merge branch 'main' into Sebastian's-New-Branch
Glimmerfrost May 4, 2026
695c56d
Credits Update
Glimmerfrost May 4, 2026
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
4 changes: 4 additions & 0 deletions Fire Escape Unity/Assets/Scenes/2FloorCollapsedSecond.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3409,6 +3409,10 @@ PrefabInstance:
propertyPath: m_LocalPosition.x
value: 4.444458
objectReference: {fileID: 0}
- target: {fileID: 5315797614747640729, guid: 336e797cb57630446a065ba6caa41fb4, type: 3}
propertyPath: currentTime
value: 240
objectReference: {fileID: 0}
- target: {fileID: 6941517145120327073, guid: 336e797cb57630446a065ba6caa41fb4, type: 3}
propertyPath: m_LocalPosition.x
value: 10.95786
Expand Down
2 changes: 1 addition & 1 deletion Fire Escape Unity/Assets/Scenes/DerailedTrain.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10274,9 +10274,9 @@ SceneRoots:
- {fileID: 1574291670}
- {fileID: 584771284}
- {fileID: 434053691}
- {fileID: 190540346}
- {fileID: 1844269725}
- {fileID: 418267000}
- {fileID: 696848587}
- {fileID: 1746986820}
- {fileID: 389332626}
- {fileID: 190540346}
4 changes: 4 additions & 0 deletions Fire Escape Unity/Assets/Scenes/DuplexLevel.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43926,6 +43926,10 @@ PrefabInstance:
propertyPath: m_LocalPosition.x
value: 4.444458
objectReference: {fileID: 0}
- target: {fileID: 5315797614747640729, guid: 336e797cb57630446a065ba6caa41fb4, type: 3}
propertyPath: currentTime
value: 180
objectReference: {fileID: 0}
- target: {fileID: 6941517145120327073, guid: 336e797cb57630446a065ba6caa41fb4, type: 3}
propertyPath: m_LocalPosition.x
value: 2.77328
Expand Down
17 changes: 9 additions & 8 deletions Fire Escape Unity/Assets/Scenes/House Demo 1.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1504412268417953496, guid: 336e797cb57630446a065ba6caa41fb4, type: 3}
propertyPath: m_LocalPosition.x
value: -4.8927
value: -4.444458
objectReference: {fileID: 0}
- target: {fileID: 1611209801277222244, guid: 336e797cb57630446a065ba6caa41fb4, type: 3}
propertyPath: m_IsActive
Expand All @@ -211,11 +211,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4721415007335752225, guid: 336e797cb57630446a065ba6caa41fb4, type: 3}
propertyPath: m_LocalPosition.x
value: 4.8927
value: 4.444458
objectReference: {fileID: 0}
- target: {fileID: 4990627565815587818, guid: 336e797cb57630446a065ba6caa41fb4, type: 3}
propertyPath: m_LocalPosition.x
value: 4.8927
value: 4.444458
objectReference: {fileID: 0}
- target: {fileID: 5315797614747640729, guid: 336e797cb57630446a065ba6caa41fb4, type: 3}
propertyPath: currentTime
value: 135
objectReference: {fileID: 0}
- target: {fileID: 6941517145120327073, guid: 336e797cb57630446a065ba6caa41fb4, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -283,7 +287,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8380467148698342142, guid: 336e797cb57630446a065ba6caa41fb4, type: 3}
propertyPath: m_LocalPosition.x
value: -4.8927
value: -4.444458
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
Expand Down Expand Up @@ -5702,10 +5706,7 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 3475917127361184879, guid: 13748942d34a54c448b515c4f7cd4ab7, type: 3}
insertIndex: -1
addedObject: {fileID: 0}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 13748942d34a54c448b515c4f7cd4ab7, type: 3}
--- !u!1001 &256348868
PrefabInstance:
Expand Down
45 changes: 10 additions & 35 deletions Fire Escape Unity/Assets/Scenes/MainMenu.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1048,7 +1048,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -1.4131, y: -291}
m_AnchoredPosition: {x: -1.4131, y: -441}
m_SizeDelta: {x: 180, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &135932063
Expand Down Expand Up @@ -2466,7 +2466,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 332, y: 58}
m_AnchoredPosition: {x: 332, y: 159}
m_SizeDelta: {x: 1135.2012, y: 748.715}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &495765524
Expand Down Expand Up @@ -4565,39 +4565,14 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 'Producer - Joshua Grussendorf


Programming Lead - Kenyou Teoh & Brian
McLatchie


Design Lead - Alex DeRooy


Art Lead - Nick Knehs


Sound
Lead - Henry Cummings


Programming Team - Tyler Austin, Alexander Workman,
Rafael Gonzalez, Gabriel Wenchell, Brandon Stih


Design Team - Logan Shade,
Sebastian Rosul, Sophia Kalua, Nicolas Suazo


Art Team - Star Grace Carpenter,
Elle Hoeper, Kaya Andrews


Sound Team - Kalista Hough, Treyvonn Jackson,
Ryan Minor

'
m_text: "Producer - Joshua Grussendorf\n\nProgramming Lead - Kenyou Teoh & Brian
McLatchie\n\nDesign Lead - Alex DeRooy\n\nArt Lead - Nick Knehs\n\nSound Lead
- Henry Cummings \n\nMarketing Lead - Alexander Workman\n\nProgramming Team -
Tyler Austin, Alexander Workman, Rafael Gonzalez, Gabriel Wenchell, Brandon Stih,
Jacob Biles\n\nDesign Team - Logan Shade, Sebastian Rosul, Sophia Kalua, Nicolas
Suazo, Isaiah Douglas \n\nArt Team - Star Grace Carpenter, Elle Hoeper, Kaya
Andrews\n\nSound Team - Kalista Hough, Treyvonn Jackson, Ryan Minor \n\nMarketing
Team - Logan Shade, Ryan Minor, Kaya Andrews, Tyler Austin\n"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 41b14729f81dfbc4881e6bf8ec517200, type: 2}
m_sharedMaterial: {fileID: -3071173805931373261, guid: 41b14729f81dfbc4881e6bf8ec517200, type: 2}
Expand Down
4 changes: 4 additions & 0 deletions Fire Escape Unity/Assets/Scenes/SpeakEasy_PreDemo.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25488,6 +25488,10 @@ PrefabInstance:
propertyPath: m_LocalPosition.x
value: 4.444458
objectReference: {fileID: 0}
- target: {fileID: 5315797614747640729, guid: 336e797cb57630446a065ba6caa41fb4, type: 3}
propertyPath: currentTime
value: 210
objectReference: {fileID: 0}
- target: {fileID: 6941517145120327073, guid: 336e797cb57630446a065ba6caa41fb4, type: 3}
propertyPath: m_LocalPosition.x
value: 5.78621
Expand Down
4 changes: 4 additions & 0 deletions Fire Escape Unity/Assets/Scenes/TutorialLevel.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47877,6 +47877,10 @@ PrefabInstance:
propertyPath: m_LocalPosition.x
value: 4.444458
objectReference: {fileID: 0}
- target: {fileID: 5315797614747640729, guid: 336e797cb57630446a065ba6caa41fb4, type: 3}
propertyPath: currentTime
value: 240
objectReference: {fileID: 0}
- target: {fileID: 5446307668576639385, guid: 336e797cb57630446a065ba6caa41fb4, type: 3}
propertyPath: m_Controller
value:
Expand Down