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 年前
rainaldisatria
aa3e083b
Prepare example scene
4 年前
rainaldisatria
53931d79
Make DialogueData for examples
4 年前
rainaldisatria
4065435a
Push uncommited changes
4 年前
rainaldisatria
40613066
Push more uncommited changes
4 年前
rainaldisatria
0ec96c10
Create choice button prefab
4 年前
Chema Damak
597b3f7b
Merge branch 'localization' into main
4 年前
rainaldisatria
8df7066a
Move and rename example scene name
4 年前
Chema Damak
093779d0
Fix cutscenes
4 年前
Chema Damak
3aaa37cc
Add UI system, Inventory UI and update Inventory System
4 年前
rainaldisatria
f7791e6d
Update BranchingExamples.unity
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 年前
Ciro Continisio
c1fe908d
Fixes to example, moved files in Examples folder
4 年前
GitHub
19a7c4c5
Upgrade to 2020.2.13b ( #247 )
4 年前
Amel Negra
9182a86c
Added interaction example scene
4 年前
Amel Negra
d3d514e2
Added examples to interaction example scene
4 年前
Amel
71613a40
pushing interaction example scene
4 年前
Ciro Continisio
5aaad3c6
Merge branch 'Location-Loader-issue-229-fix' into main
4 年前
Amel
90998767
Merge remote-tracking branch 'origin/Inventory' into interaction
4 年前
Amel
8d423ac9
post merge fixes
4 年前
Dan Young
268ab82e
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
Amel
5418926e
added null check before event raise on interaction
4 年前
Amel
2807218f
bard hare in interaction example scene for talk interaction test
4 年前
Amel
2c9810c9
Merge branch 'main' into interaction
4 年前
Chema Damak
8a166bf0
Merge branch 'interaction' of https://github.com/UnityTechnologies/open-project-1 into interaction
4 年前
Amel
fe4de3b9
updated example scene for interaction
4 年前
uChema
6434aa7b
Renaming and cleaning folders
4 年前
Amel Negra
564a406f
Added new interaction scene example
4 年前
Amel Negra
96e4f244
Merge remote-tracking branch 'origin/interaction' into interaction
4 年前
Amel Negra
9bae4220
Merge remote-tracking branch 'origin/interaction' into main
4 年前
Ciro Continisio
77242d26
Merge branch 'main' of github.com:UnityTechnologies/open-project-1 into main
# Conflicts:
# UOP1_Project/Assets/Scenes/TestingGround.unity
4 年前
Ciro Continisio
9be54793
Reorganised scenes
4 年前
Ciro Continisio
757da81d
Removes spaces in scene names
4 年前
Dan Young
7ce66d74
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
Amel Negra
a3fdb227
Merge branch 'main' into whiteboxing
4 年前
uChema
d5f3635f
Merge branch 'pr/195' into QuestSystem
4 年前
uChema
c852ab5b
Update Cutscenes to use Event Channels
4 年前
uChema
a16fe655
Dialogue And Quest Managers + Refractoring some scripts
4 年前
uChema
748ff00f
Add a quest, and test; WIP
4 年前
uChema
edca0f63
Rename Task to Step
4 年前
uChema
b2cf2c5b
Refractoring
4 年前
Amel Negra
c444c501
Merge remote-tracking branch 'origin/main' into scenes-re-architecture
4 年前
Ciro Continisio
84e76f64
Fixes, typos and tweaks
4 年前
Ciro Continisio
7c088a1f
Merge branch 'pr-bash' into main
4 年前
GitHub
f5865370
Scene Selector window ( #285 )
* changed input phase check to match best practices
* menu input
- handles keyboard + gamepad inputs
- handles mouse inputs
- created component to place on selectable UI elements to register them
as a pointer enter/exit receiver
- updated inputreader to contain menu inputs as well
- updated input actions to contain new menu inputs
* updates
* debug
* docs
* removed ununsed var
* doc
* found fix for todo #2
* added to component menu
* was able to fix edge case #1
* doc
* updates
* undid prefab change
* merged in main, added menu prefab to asset database
* removed action asset reference in event system on prefab
* readme
* menu prefab into scene
* updated readme
* removed call to base.onenter in CC button to simplify selection logic
* Use more reliable SceneAsset instead of error-prone scene name
This also makes a custom editor unnecessary
* Set proper SceneAssets and serialize
* ...
4 年前
uChema
c28d9833
Merge branch 'main' into QuestSystem
4 年前
uChema
4e8cb14b
Replace Dialogue lines with Localized string, Fix Quest System with questline
4 年前
Dan Young
eb670224
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
Ciro Continisio
c691552b
Merge branch 'pr-bash' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Samples.meta
4 年前
Ciro Continisio
4220f2f7
Relocated assets
4 年前
Ciro Continisio
bd2b6359
Midboxing again
4 年前
GitHub
81481d8b
Merge pull request #4 from UnityTechnologies/main
update my local branch
4 年前
Ciro Continisio
e5f66cfc
Tweaks, removing doppler effect
4 年前
alex
2f536097
Merge remote-tracking branch 'upstream/main' into main
4 年前
GitHub
762d050f
Merge pull request #6 from UnityTechnologies/main
Updating my branch
4 年前
Smurjo
df03afb9
Merge branch 'main' of https://github.com/Smurjo/open-project-1 into main
4 年前
uChema
7ece782e
Merge branch 'main' into QuestSystem
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 年前
Ciro Continisio
91a763b7
Updated project to 2020 LTS
4 年前
GitHub
c0b2931f
Merge pull request #1 from UnityTechnologies/main
Update fork
4 年前
Amel
7b1ed2b2
Merge branch 'main' into UI
4 年前
Ciro Continisio
9d833ec9
Removed random sample scenes
4 年前
uChema
735363c3
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Amel
6f206e69
Merge remote-tracking branch 'origin/main' into mainAmel
4 年前
Amel Negra
f670d943
Updating cutscene example scene with dialogue-cutscene updates
3 年前
Ciro Continisio
7a6ec0e8
Merge remote-tracking branch 'tech-mkt/main'
3 年前
uChema
b4892bfe
Merge with main
3 年前
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
8a1d6ab0
Binding main character to timeline
3 年前
Ciro Continisio
3e67c187
Merge branch 'main' into ciro
3 年前
uChema
f26da778
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前