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 年前
Rainaldi Satria
179bd881
[Bot] Automated dotnet-format update
4 年前
Chema Damak
54306cec
Added localization package
4 年前
GitHub
e7a3f51c
Dialogue system event fix ( #162 )
* changed input phase check to match best practices
* refactored system to go through input reader. properly unsubscribing from events in dialogue system
* Nitpick on the naming
Co-authored-by: Ciro Continisio <ciro@unity3d.com>
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 年前
Rainaldi Satria
b62977f8
[Bot] Automated dotnet-format update
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 年前
Chema Damak
093779d0
Fix cutscenes
4 年前
Chema Damak
d9519898
[Bot] Automated dotnet-format update
4 年前
Chema Damak
9bfb88e2
[Bot] Automated dotnet-format update
4 年前
GitHub
5c82e99e
Merge pull request #2 from UnityTechnologies/main
import changes from main
4 年前
uChema
79e39b28
Merging Dialogue branching to the Quest System.
4 年前
uChema
28237f05
Fix Dialogue UI and Cutscene with the new changes
4 年前
uChema
c852ab5b
Update Cutscenes to use Event Channels
4 年前
uChema
f72f481b
Change events on the Dialogue track, instead of the dialogue clip
4 年前
uChema
748ff00f
Add a quest, and test; WIP
4 年前
uChema
b2cf2c5b
Refractoring
4 年前
uChema
e54c3d58
[Bot] Automated dotnet-format update
4 年前
uChema
2fbe347a
Merge branch 'QuestSystem' of https://github.com/UnityTechnologies/open-project-1 into QuestSystem
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 年前
uChema
6938ba52
Code Cleaning/refractoring
4 年前
Amel Negra
e0ede3d5
Merge branch 'main' into AmelMain
4 年前
uChema
cf9b5d2c
WIP Settings menu
4 年前
itsLevi0sa
5a4b5e30
[Bot] Automated dotnet-format update
4 年前
Ciro Continisio
76cc2e8b
Merge branch 'ForestMaze' of https://github.com/itsLevi0sa/open-project-1 into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Scripts/UI/UIManager.cs
4 年前
Amel Negra
8151f1b5
Merge remote-tracking branch 'origin/main' into AmelMain
4 年前
uChema
127bd54d
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Amel Negra
94be6353
Fixing dialogue error on cutscene end
4 年前
Amel Negra
632f55f9
Hide the Dialogue UI when we advance in cutscene dialogue now works
4 年前
Ciro Continisio
7a6ec0e8
Merge remote-tracking branch 'tech-mkt/main'
4 年前
uChema
b4892bfe
Merge with main
4 年前
Amel Negra
d9900de0
Cutscene can be triggered by specific cinematic events (+ kept collider trigger for test purpose)
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
9dc93db3
Pushing TimelineBinder script now works with multiple objects if needed
4 年前
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 年前
uChema
b1c2f634
Integrating Cutscenes and Questlines in final scenes
3 年前
Amel Negra
e9f4e34e
Merge remote-tracking branch 'origin/main' into main
3 年前
Amel Negra
a557f23b
Now DialogueBehaviour takes care of disabling UI dialogue when not paused
3 年前
Amel
8b2d50b0
Add start state for townsfolks
3 年前
Amel Negra
f4233540
Signals and script folder organization
3 年前
uChema
dc07bb35
Merge remote-tracking branch 'upstream/main' into main
3 年前
uChema
92cb047d
Merge remote-tracking branch 'upstream/main' into main
3 年前
uChema
f7c5fc57
Switch file to correct folder
3 年前
Amel
1d5d51cb
Added beach intro cutscene + plays only when we play new game
3 年前
Amel
79795bad
Credits integration in final cutscene
3 年前
uChema
2e7057c0
Error message when can't cook
3 年前
Amel
6520caab
Separated Timeline scene loading from the LocationExit script
3 年前
Ciro Continisio
7fdb5bae
Merge branch 'main' into UI-icons
3 年前
Ciro Continisio
27ebfa55
Code formatting and tweaks
3 年前
Ciro Continisio
6b104b55
Mega code cleanup
3 年前