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 年前
Chema Damak
9e43c174
[Bot] Automated dotnet-format update
4 年前
Chema Damak
7653f891
Add localized Dialogue
4 年前
Chema Damak
04a8fa29
[Bot] Automated dotnet-format update
4 年前
Chema Damak
eea05022
Revert "[Bot] Automated dotnet-format update"
This reverts commit de9179553d8398b66e55565a91c1de91db43d51e.
4 年前
Chema Damak
6f3d6f8d
[Bot] Automated dotnet-format update
4 年前
uChema
2aa92a2d
Merge
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 年前
kgc00
781633e3
Merge remote-tracking branch 'upstream/main' into main
4 年前
GitHub
afec2f17
Remove unused ReorderableList implementation ( #181 )
* Remove confusing ReorderableList
* Removed unused custom Inspector
Co-authored-by: Ciro Continisio <ciro@unity3d.com>
4 年前
Ciro Continisio
7705382e
Merge branch 'main' into state-machine-improvements
# Conflicts:
# UOP1_Project/Assets/Prefabs/Pig.prefab
4 年前
kgc00
c4dabcbe
merge
4 年前
rainaldisatria
6fabd6a2
Update DialogueDataSO.cs to support branching
4 年前
kgc00
253b73a3
Merge remote-tracking branch 'upstream/main' into main
4 年前
Chema Damak
597b3f7b
Merge branch 'localization' into main
4 年前
kgc00
7b04a609
Merge branch 'main' into simple-menu-controls
4 年前
Chema Damak
093779d0
Fix cutscenes
4 年前
rainaldisatria
d74551dd
Create DialogueTrigger.cs
4 年前
rainaldisatria
b0513472
Adjust DialogueManager.cs to support branching
4 年前
Chema Damak
3aaa37cc
Add UI system, Inventory UI and update Inventory System
4 年前
rainaldisatria
85be34a1
Update DialogueManager.cs to support showing DialogueData and branching
4 年前
Chema Damak
9bfb88e2
[Bot] Automated dotnet-format update
4 年前
Ciro Continisio
58d65aa2
Merge remote-tracking branch 'tech-mkt/main' into pr-bashing
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 年前
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 年前
Amel
90998767
Merge remote-tracking branch 'origin/Inventory' into interaction
4 年前
Chema Damak
8871d820
Changed Events to Event Channels
4 年前
Chema Damak
2051a72a
Adding interaction UI + Events
4 年前
Chema Damak
e3274c8d
[Bot] Automated dotnet-format update
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 年前
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
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
c128feff
Fix Dialogue branching and add UI
4 年前
GitHub
d0298f3d
Merge pull request #3 from UnityTechnologies/art-assets
Art assets
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 年前
uChema
02abd5ef
Rename Folder
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
81f12965
[Bot] Automated dotnet-format update
4 年前
uChema
7ba49641
Merge branch 'QuestSystem' of https://github.com/UnityTechnologies/open-project-1 into QuestSystem
4 年前
uChema
008bad73
Fix Merge
4 年前
uChema
13a140e3
[Bot] Automated dotnet-format update
4 年前
uChema
4e8cb14b
Replace Dialogue lines with Localized string, Fix Quest System with questline
4 年前
uChema
b48675a8
Add italian locale
4 年前
uChema
837d24dd
Fix Shared Tables (Localization) conflict.
4 年前
uChema
821d5ccf
[Bot] Automated dotnet-format update
4 年前
uChema
47ad6cc8
[Bot] Automated dotnet-format update
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
b53cf466
Fix to Editor scripts blocking the build process
4 年前
Bronson Zgeb
da00990f
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Yohann Puyhaubert
460eb34c
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
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 年前
uChema
c3699920
Fix Subscribe/unsubscribe issue in UI. Implement Pause Menu with all its functions
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 年前
Amel Negra
c7f86452
Merge remote-tracking branch 'origin/main' into main
4 年前
uChema
e132a119
Add a StepToDialogue function to the StepSO. Fix preview display in the Quest tool
3 年前
Ciro Continisio
e6dcfc27
Merge branch 'main' into whiteboxing
3 年前
uChema
f934ef08
Fix last commit
3 年前
Amel Negra
36cba268
Fixed Fry King dialogue typo
3 年前
Amel Negra
4ac06b52
Merge remote-tracking branch 'origin/main' into AmelMain
3 年前
Amel Negra
fe1f23a8
Merge branch 'main' into AmelMain
3 年前
Ciro Continisio
72d88c0d
Merge branch 'main' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/AddressableAssetsData/OSX/addressables_content_state.bin.meta
# UOP1_Project/Assets/Scenes/Locations/Field_Farms.unity.meta
# UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
# UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/FryKing.meta
3 年前
uChema
50525348
Fix Quest Tool : Add Remove buttons and AddDialogue Buttons
3 年前
Ciro Continisio
6bf9cfe1
Merge remote-tracking branch 'tech-mkt/main'
3 年前
Ciro Continisio
47ed0d6a
Merge branch 'main' into worldbuilding
3 年前
uChema
662910d3
Hotfix - Add wrap to Editor only code
3 年前
Amel
226ea216
Merge remote-tracking branch 'origin/main' into mainAmel
3 年前
Ciro Continisio
85c5bf58
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Prefabs/Gameplay/CameraSystem.prefab
# UOP1_Project/Assets/Scenes/Locations/Beach.unity
3 年前
uChema
37e5adb2
Fix Quests SO
3 年前
uChema
283617f7
Creating Win/Lose quests and how to handle - Saving quests WIP
3 年前
Ciro Continisio
709521fa
Merge branch 'main' into worldbuilding
3 年前
uChema
8a2721d9
Setting Questline + rename SO's files
3 年前
uChema
2415469c
Change SO's menu asset order. Add End of dialogue event to event Data.
3 年前
uChema
e022f2ee
Rework on questline naming
3 年前
Amel Negra
94be6353
Fixing dialogue error on cutscene end
3 年前
Ciro Continisio
7a6ec0e8
Merge remote-tracking branch 'tech-mkt/main'
3 年前
uChema
b4892bfe
Merge with main
3 年前
Ciro Continisio
3e67c187
Merge branch 'main' into ciro
3 年前
uChema
d7205d06
Add all questlines and rework Dialogue structure and Dialogue/Quest System. Winning and losing outcome WIP
3 年前
uChema
6a1077d3
Create cutscenes dialogue
3 年前
uChema
4413ebd5
Adding missing items + missing questline to a finite quest. Fixing errors.
Use TestingInventory with TestingGround_Questline scene to test the full quest
3 年前
Ciro Continisio
056f6536
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/BardHare.prefab
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/BardHare.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/FryKing.prefab
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/FryKing.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/Townsfolk_1.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/Townsfolk_2.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/Townsfolk_3.prefab
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/Townsfolk_3.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/Townsfolk_4.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/Ayud.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/BardHare-Maqam.prefab
# UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/BardHare-Maqam.prefab.meta
# UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/BardHare.pr...
3 年前
uChema
9936dca6
Refactoring Dialogue System
3 年前
itsLevi0sa
340dd8dc
Merge branch 'main' into CaveWhiteboxing
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 年前
uChema
b1c2f634
Integrating Cutscenes and Questlines in final scenes
3 年前
Amel Negra
e9f4e34e
Merge remote-tracking branch 'origin/main' into main
3 年前
uChema
1d6b8128
Use Game States In State Machine
3 年前
uChema
dc07bb35
Merge remote-tracking branch 'upstream/main' into main
3 年前
Ciro Continisio
27ebfa55
Code formatting and tweaks
3 年前
Ciro Continisio
6b104b55
Mega code cleanup
3 年前