GitHub
ffe1b8b8
Working dialogue and cutscene system. ( #135 )
* Add Dialogue Track base implementation
* Custom timeline track and clip for dialog
- Can at any time call for a line of dialogue.
- Each clip binds line of dialogue to be later displayed on screen.
- Depending on the options of this clip, the Timeline might pause.
* Made adjustments based on HyagoOliveiran's suggestions
Tried to add more variables to increase legibility.
Added UpdateSlide function.
Deleted some empty lines.
* Update Character.cs
* Update Character.cs
* Update Character.cs
* Update Character.cs
* Update Character.cs
* Update Character.cs
* Update UOP1_Project/Assets/Scripts/Characters/Character.cs
I deleted unnecessary spacing by following atb-brown suggestion.
Co-authored-by: Austin Brown <atb.austin@gmail.com>
* Deleted unnecessary spacing
* Fixed bouncing issue when player hit under floating platform
* My take on a simple Player Spawn System
* Renamed SetRequestS...
4 年前
Chema Damak
54306cec
Added localization package
4 年前
GitHub
957c4a1c
Fix/dialogue line not shown in custom timeline track ( #180 )
* Fix DialogueLine not shown in custom TimelineTrack
* Make example scene.
* Delete not used script: DialogueMixerBehaviour.cs
* Push uncommited changes
* Fix minor bug
while timeline is playing, click on ExampleCutscene object, you get an error. This prevent that error.
* Inverted the checks
In preparation for making the tool work also in Edit mode
Co-authored-by: Ciro Continisio <ciro@unity3d.com>
4 年前
kgc00
781633e3
Merge remote-tracking branch 'upstream/main' into main
4 年前
Ciro Continisio
7705382e
Merge branch 'main' into state-machine-improvements
# Conflicts:
# UOP1_Project/Assets/Prefabs/Pig.prefab
4 年前
kgc00
c4dabcbe
merge
4 年前
Ciro Continisio
26747ac5
Merge branch 'treivize/feature/art/transparent_support' into art-assets
4 年前
Chema Damak
597b3f7b
Merge branch 'localization' into main
4 年前
Ciro Continisio
58d65aa2
Merge remote-tracking branch 'tech-mkt/main' into pr-bashing
4 年前
Ciro Continisio
826ef58b
AudioSystem functionality
4 年前
treivize
0728a4c6
Merge branch 'art-assets' into feature/art/pant_critter
4 年前
GitHub
14e737cc
Merge pull request #1 from UnityTechnologies/art-assets
Art assets
4 年前
GitHub
e09986b8
Merge branch 'main' into fix/object-pool
4 年前
treivize
df2ab2a2
Merge branch 'art-assets' into feature/art/slime_critter
4 年前
GitHub
5c82e99e
Merge pull request #2 from UnityTechnologies/main
import changes from main
4 年前
uChema
c852ab5b
Update Cutscenes to use Event Channels
4 年前
uChema
c128feff
Fix Dialogue branching and add UI
4 年前
uChema
4e8cb14b
Replace Dialogue lines with Localized string, Fix Quest System with questline
4 年前
Ciro Continisio
7cd4ce12
Merge remote-tracking branch 'tech-mkt/main' into pr-bash
4 年前
GitHub
d07ee56f
Merge pull request #1 from UnityTechnologies/main
Latest changes
4 年前
GitHub
b5417125
Merge pull request #7 from UnityTechnologies/main
Updating my local repository
4 年前
GitHub
c0b2931f
Merge pull request #1 from UnityTechnologies/main
Update fork
4 年前
Amel Negra
47746a1b
Pushing cutscene and changes on the scene
4 年前
Amel Negra
f23fd014
Temporarily disabled Slime critter state machines on scene for tests
4 年前
Ciro Continisio
7a6ec0e8
Merge remote-tracking branch 'tech-mkt/main'
4 年前
uChema
b4892bfe
Merge with main
4 年前
Amel Negra
8a1d6ab0
Binding main character to timeline
4 年前
Ciro Continisio
3e67c187
Merge branch 'main' into ciro
4 年前
uChema
f26da778
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Amel Negra
a4a0dc5b
Adding enter and exit timeline signals to set triggers on BardHare AC
4 年前
Amel Negra
3f5ae592
Adding beach cutscene playable
4 年前
Amel Negra
3b72c394
Resume gameplay after cutscene now works
4 年前
Amel Negra
a1c9548d
Organizing folders and tweaks on beach candy cutscene
4 年前
Amel Negra
6a5ea46a
tweaking animations on cutscene
4 年前
Amel Negra
50ea72eb
tweaking transitions in timeline
4 年前
uChema
9936dca6
Refactoring Dialogue System
4 年前
Amel Negra
a7ac46c3
Tweaking talking animation transition in cutscene
4 年前
Amel Negra
7d7f08ff
tweaking transitions in cutscene
4 年前
uChema
02a13eae
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
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...
4 年前
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 年前
Ciro Continisio
40572789
Merge branch 'CaveWhiteboxing' of https://github.com/itsLevi0sa/open-project-1 into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Cutscenes/PathAndCave.meta
# UOP1_Project/Assets/Cutscenes/PathAndCave.unity
# UOP1_Project/Assets/Cutscenes/PathAndCave.unity.meta
# UOP1_Project/Assets/Cutscenes/PathAndCave/NavMesh.asset
# UOP1_Project/Assets/Cutscenes/PathAndCave/NavMesh.asset.meta
# UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced.meta
# UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced.unity
# UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced.unity.meta
# UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced/NavMesh.asset
# UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced/NavMesh.asset.meta
# UOP1_Project/Assets/Scripts/Quests/Editor/QuestEditorWindow.cs
3 年前
Ciro Continisio
72e8db4d
Moved itsleviosa's whiteboxing
3 年前
Amel Negra
12905f99
Prefabs and playableDirectors placeholders created for different cutscenes
3 年前
Ciro Continisio
c0f37c31
Merge branch 'worldbuilding'
3 年前
Amel Negra
178534d3
Adding v1 of slime critters cutscene
3 年前
Ciro Continisio
83ea7526
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Scenes/Locations/Field_Farms.unity
3 年前
Amel Negra
c48bd53b
Sweet dish cutscene wip
3 年前
Amel
17e7e8f4
Pushing cutscene placeholders to the different scenes
3 年前
Amel Negra
2a8c28f6
Sweet dish cutscene wip
3 年前
Amel Negra
120c5b08
Added pause audio signal 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
9ac9becf
Beach candy cutscene don't pause after line display anymore
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
4689962b
Townsfolk front and back crowd going away signal
3 年前
Amel Negra
f4233540
Signals and script folder organization
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
1d5d51cb
Added beach intro cutscene + plays only when we play new game
3 年前
Amel
9c33d596
wip beach intro cutscene
3 年前
Amel
79795bad
Credits integration in final cutscene
3 年前
Amel
7b7510b3
Fix dialogue shots
3 年前
Amel Negra
bf6484ad
removed line pause in slime cutscene
3 年前
uChema
5ad05c8e
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
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 年前