Amel Negra
|
d9900de0
|
Cutscene can be triggered by specific cinematic events (+ kept collider trigger for test purpose)
|
3 年前 |
Amel Negra
|
719e6464
|
updating prefab and scene for cutscene
|
3 年前 |
Amel Negra
|
79c4bba1
|
Removed not needed child game objects from cutscene prefab
|
3 年前 |
Amel Negra
|
bce4012a
|
Made the cutscene prefab specific to the candy cutscene
|
3 年前 |
Amel Negra
|
a4661c6b
|
Beach cutscene as a prefab on the beach scene
|
3 年前 |
Ciro Continisio
|
984180df
|
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/02a28a9c355f4fac879be8ab591f1a6a.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/0f35a51a6d884c8ab30219b5a3b05de7.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/108b5a6e887748a1875141cf7eefbf8e.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/177f1a363471462daaaa7e27712e2b77.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/17f9a240deb94feb8a71fae200bf7ff1.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/26347a43a1d94f6eba6efb6ca3d40208.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/2ab75110e077404aaaa2789feb3cc82e.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/2f392744e4d142f7a81da2a69bdaa99f.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/512005dcb52a4d588ffc91db589f24ff.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/61ff26a351934...
|
3 年前 |
Amel Negra
|
d3f9f09c
|
Added general cutscenePlayableDirector prefab
|
3 年前 |
Amel Negra
|
6c5d90c9
|
Adding slime cutscene prefab and playable
|
3 年前 |
Ciro Continisio
|
2d712a99
|
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Scenes/Locations/Beach.unity
|
3 年前 |
Amel Negra
|
12905f99
|
Prefabs and playableDirectors placeholders created for different cutscenes
|
3 年前 |
Amel Negra
|
178534d3
|
Adding v1 of slime critters cutscene
|
3 年前 |
Amel Negra
|
339144dd
|
Pushing path config changes as prefab
|
3 年前 |
Amel Negra
|
8128c471
|
Tweaking cutscene camera shake frequency and amplitude
|
3 年前 |
Ciro Continisio
|
83ea7526
|
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Scenes/Locations/Field_Farms.unity
|
3 年前 |
Amel Negra
|
ecc29c82
|
Sweet dish prefab
|
3 年前 |
Amel
|
17e7e8f4
|
Pushing cutscene placeholders to the different scenes
|
3 年前 |
Amel Negra
|
2a8c28f6
|
Sweet dish cutscene wip
|
3 年前 |
Amel Negra
|
97322354
|
Disabling interaction GO on pigchef during cutscene (To remove talk UI)
|
3 年前 |
Amel Negra
|
4836919b
|
Disabled trigger and play on awake for cutscene
|
3 年前 |
Amel
|
75728ee5
|
wip win cutscene
|
3 年前 |
Amel
|
eea075cb
|
Integrating new phoenix chick animations into candy cutscene + tweaking
|
3 年前 |
Amel Negra
|
125046cc
|
polishing candy cutscene
|
3 年前 |
Amel Negra
|
6242d7cf
|
wip win cutscene
|
3 年前 |
Amel
|
29d23b0e
|
Beach game end cutscene
|
3 年前 |
Amel
|
7db5cdba
|
placeholder for final cutscene
|
3 年前 |
Amel
|
b472d7a2
|
Adding load scene signal to load a location from timeline
|
3 年前 |
Amel
|
ee9d138e
|
Sweet dish cutscene now loads final beach cutscene on the end
|
3 年前 |
Amel
|
98847b01
|
Added celebration animations to cutscene
|
3 年前 |
Amel Negra
|
ec8eb680
|
Beach night final cutscene now starts main menu in the end
|
3 年前 |
Amel Negra
|
b75d5771
|
Polishing celebration part on win cutscene and added phoenix chick animation
|
3 年前 |
Amel Negra
|
e751564b
|
Tweaking sweet dish cutscene
|
3 年前 |
Amel Negra
|
265dcb02
|
Added savory dish cutscene
|
3 年前 |
uChema
|
dc07bb35
|
Merge remote-tracking branch 'upstream/main' into main
|
3 年前 |
GitHub
|
c0237ad9
|
Merge branch 'UnityTechnologies:main' into main
|
3 年前 |
uChema
|
378fc807
|
Merge branch 'main' of https://github.com/uChema/open-project-1 into main
|
3 年前 |
uChema
|
92cb047d
|
Merge remote-tracking branch 'upstream/main' into main
|
3 年前 |
Amel
|
5511adb3
|
Disabled cutscene test colliders for 2 final cutscenes
|
3 年前 |
Amel
|
1d5d51cb
|
Added beach intro cutscene + plays only when we play new game
|
3 年前 |
Amel
|
c2dc91c9
|
Added placeholder on UI for intro cutscene since it's wip
|
3 年前 |
Amel
|
5319d9b4
|
Disable the cutscene placeholder text by default
|
3 年前 |
Amel
|
79795bad
|
Credits integration in final cutscene
|
3 年前 |
Amel
|
c263ded6
|
Fixing beach cutscenes timeline binding confusion
|
3 年前 |
Amel
|
bad6196e
|
Fixed talk interaction enabled forever after cutscenes
|
3 年前 |
Amel Negra
|
662602a1
|
Glucoses now show up only after cutscene
|
3 年前 |
Amel Negra
|
e529677a
|
Glucoses now show up only after cutscene and removed line pause in cutscene
|
3 年前 |
uChema
|
5ad05c8e
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
3 年前 |
Amel
|
6520caab
|
Separated Timeline scene loading from the LocationExit script
|
3 年前 |
Amel
|
80427a24
|
Disabled fire flame on phoenix chick during cutscene
|
3 年前 |
Amel
|
a0e8bc6f
|
character disabled during beach intro cutscene
|
3 年前 |
Ciro Continisio
|
7fdb5bae
|
Merge branch 'main' into UI-icons
|
3 年前 |
Ciro Continisio
|
30e472a6
|
Work on night scene
|
3 年前 |