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 年前 |
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
|
008bad73
|
Fix Merge
|
4 年前 |
uChema
|
13a140e3
|
[Bot] Automated dotnet-format update
|
4 年前 |
uChema
|
964f7361
|
New Quest System with Questlines
|
4 年前 |
uChema
|
4e8cb14b
|
Replace Dialogue lines with Localized string, Fix Quest System with questline
|
4 年前 |
uChema
|
b48675a8
|
Add italian locale
|
4 年前 |
uChema
|
821d5ccf
|
[Bot] Automated dotnet-format update
|
4 年前 |
uChema
|
2f8fcd7c
|
Merge branch 'QuestSystem' of https://github.com/UnityTechnologies/open-project-1 into QuestSystem
|
4 年前 |
Brett
|
548ae699
|
Add QuestEditorWindow
|
4 年前 |
Brett
|
0f0b8928
|
Reduce nesting
|
4 年前 |
Brett
|
cbad06cd
|
Update T : ScriptableObject
|
4 年前 |
uChema
|
31d75482
|
Add controls. Switch Quest/Questline.cs names. And Button add Questline , quests, step
|
4 年前 |
uChema
|
e492f068
|
Clean project and add folder creation.
|
4 年前 |
uChema
|
586f9500
|
[Bot] Automated dotnet-format update
|
4 年前 |
uChema
|
a70ca312
|
Fix Quest Anchor SO
|
4 年前 |
Amel
|
7b1ed2b2
|
Merge branch 'main' into UI
|
4 年前 |
uChema
|
e4b71f99
|
Add controls
|
4 年前 |
uChema
|
86db6931
|
Rename Quest Data to quest manager + Add Game Manager
|
4 年前 |
uChema
|
d1f0a9e1
|
Add healthbar logic
|
4 年前 |
Ciro Continisio
|
2d718f1c
|
Merge branch 'main' into vegetation-tweaks
# Conflicts:
# UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
|
4 年前 |
uChema
|
6938ba52
|
Code Cleaning/refractoring
|
4 年前 |
Ciro Continisio
|
fd6a9ce0
|
Cleanup
Added DOTween license, relocated Resources folder
|
4 年前 |
Amel Negra
|
e0ede3d5
|
Merge branch 'main' into AmelMain
|
4 年前 |
uChema
|
3ce06cf5
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
4 年前 |
Ciro Continisio
|
bc17972b
|
Merge branch 'main' into iet
# Conflicts:
# UOP1_Project/Packages/manifest.json
|
4 年前 |
uChema
|
cf9b5d2c
|
WIP Settings menu
|
4 年前 |
itsLevi0sa
|
5a4b5e30
|
[Bot] Automated dotnet-format update
|
4 年前 |
Amel Negra
|
a186115b
|
Added IsInDialogue to step controller
|
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
|
507e39d5
|
Now townsfolk stop talking when one of them interact with chef
|
4 年前 |
Amel Negra
|
017d02f4
|
Renamed all files to fit general NPC use instead of townsfolk
|
4 年前 |
Amel
|
148e0a62
|
Checking if the talking to array is not empty before going through it
|
4 年前 |
Amel Negra
|
b3067c77
|
Fixed issue of all townsfolk listening to protagonist
|
4 年前 |
Amel
|
03aa1941
|
wip fixing townsfolk state machine on talk and listen
|
4 年前 |
Amel
|
58d7262d
|
wip v2 townsfolk
|
4 年前 |
Amel
|
e5e6a42e
|
Townsfolk state machine V1
|
4 年前 |
Amel Negra
|
8151f1b5
|
Merge remote-tracking branch 'origin/main' into AmelMain
|
4 年前 |
Amel Negra
|
b23afbae
|
Updating talk state so it's independent from other states
|
4 年前 |
uChema
|
127bd54d
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
4 年前 |
Ciro Continisio
|
350159af
|
Merge branch 'main' into whiteboxing
|
4 年前 |
uChema
|
e132a119
|
Add a StepToDialogue function to the StepSO. Fix preview display in the Quest tool
|
4 年前 |
Ciro Continisio
|
e6dcfc27
|
Merge branch 'main' into whiteboxing
|
4 年前 |
uChema
|
f934ef08
|
Fix last commit
|
4 年前 |
uChema
|
10a19c7c
|
Move USS file to correct folder
|
4 年前 |
Amel Negra
|
d464d645
|
Added dialogue shot to step controller script
|
4 年前 |
Amel Negra
|
4ac06b52
|
Merge remote-tracking branch 'origin/main' into AmelMain
|
4 年前 |
Amel Negra
|
fe1f23a8
|
Merge branch 'main' into AmelMain
|
4 年前 |
Amel Negra
|
0b4f451f
|
Merge branch 'AmelMain' into main
|
4 年前 |
uChema
|
aa88e701
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
4 年前 |
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
|
4 年前 |
uChema
|
50525348
|
Fix Quest Tool : Add Remove buttons and AddDialogue Buttons
|
4 年前 |
Ciro Continisio
|
6bf9cfe1
|
Merge remote-tracking branch 'tech-mkt/main'
|
4 年前 |
Ciro Continisio
|
47ed0d6a
|
Merge branch 'main' into worldbuilding
|
4 年前 |
uChema
|
8b7ce38c
|
Create questlines
|
4 年前 |
uChema
|
5c004cab
|
Fix previous changes
|
4 年前 |
uChema
|
20147309
|
Adding quests to the questmanager Scriptable object
|
4 年前 |
Amel
|
cc169e61
|
Merge remote-tracking branch 'origin/main' into main
|
4 年前 |
Amel
|
6d56e31b
|
Merge branch 'main' into mainAmel
|
4 年前 |
uChema
|
662910d3
|
Hotfix - Add wrap to Editor only code
|
4 年前 |
Amel
|
226ea216
|
Merge remote-tracking branch 'origin/main' into mainAmel
|
4 年前 |
Amel
|
a0b65245
|
Dialogue shot tweaking
|
4 年前 |
Ciro Continisio
|
85c5bf58
|
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Prefabs/Gameplay/CameraSystem.prefab
# UOP1_Project/Assets/Scenes/Locations/Beach.unity
|
4 年前 |
uChema
|
37e5adb2
|
Fix Quests SO
|
4 年前 |
uChema
|
eab4c107
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
4 年前 |
uChema
|
283617f7
|
Creating Win/Lose quests and how to handle - Saving quests WIP
|
4 年前 |
uChema
|
d3f9b548
|
Added save Questline status
|
4 年前 |
Ciro Continisio
|
709521fa
|
Merge branch 'main' into worldbuilding
|
4 年前 |
uChema
|
d36df8f3
|
Adding save to disk on questline update
|
4 年前 |
uChema
|
62ba1135
|
Remove test debugging
|
4 年前 |
Ciro Continisio
|
1b98a3e3
|
Merge branch 'main' of github.com:UnityTechnologies/open-project-1
|
4 年前 |
uChema
|
8a2721d9
|
Setting Questline + rename SO's files
|
4 年前 |
uChema
|
fd58c9ac
|
Add new item icons
|
4 年前 |
uChema
|
2415469c
|
Change SO's menu asset order. Add End of dialogue event to event Data.
|
4 年前 |
uChema
|
e022f2ee
|
Rework on questline naming
|
4 年前 |
uChema
|
d7205d06
|
Add all questlines and rework Dialogue structure and Dialogue/Quest System. Winning and losing outcome WIP
|
4 年前 |
uChema
|
4413ebd5
|
Adding missing items + missing questline to a finite quest. Fixing errors.
Use TestingInventory with TestingGround_Questline scene to test the full quest
|
4 年前 |
itsLevi0sa
|
72ec616e
|
[Bot] Automated dotnet-format update
|
4 年前 |
Ciro Continisio
|
460fb941
|
Merge branch 'CaveWhiteboxing' of https://github.com/itsLevi0sa/open-project-1 into worldbuilding
|
4 年前 |
Ciro Continisio
|
de0f0586
|
Revert "Merge branch 'CaveWhiteboxing' of https://github.com/itsLevi0sa/open-project-1 into worldbuilding"
This reverts commit 5141fc8d8d88057646e6602844c0bc709606f6d3, reversing
changes made to 0146f00fa2288b3baf783f2feb33ed3ff37fb231.
|
4 年前 |
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...
|
4 年前 |
itsLevi0sa
|
aa9e8032
|
Merge branch 'CaveWhiteboxing' of https://github.com/itsLevi0sa/open-project-1 into CaveWhiteboxing
|
4 年前 |
itsLevi0sa
|
340dd8dc
|
Merge branch 'main' into CaveWhiteboxing
|
4 年前 |
itsLevi0sa
|
0425b39f
|
[Bot] Automated dotnet-format update
|
4 年前 |
uChema
|
1d6b8128
|
Use Game States In State Machine
|
4 年前 |
uChema
|
8a36c2bf
|
Fix UI Rescaling. Test The whole game. WIP Interaction after cutscene
|
3 年前 |
uChema
|
8760a221
|
Select first Item in Inventory when Inventory Open
|
3 年前 |
Ciro Continisio
|
7fdb5bae
|
Merge branch 'main' into UI-icons
|
3 年前 |
Ciro Continisio
|
53bc6c38
|
Refactored code to remove some warnings
|
3 年前 |
Ciro Continisio
|
27ebfa55
|
Code formatting and tweaks
|
3 年前 |
Ciro Continisio
|
e0bf1a99
|
More code cleanup and bug fixes
Renamed tools
Hidden Quest tool
Added debug visualisation to some ScriptableObjects using ReadOnly attribute
|
3 年前 |
Ciro Continisio
|
6b104b55
|
Mega code cleanup
|
3 年前 |
Ciro Continisio
|
c62d8542
|
Renamed all FryKing assets to LegendaryChef
|
3 年前 |