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
|
31d75482
|
Add controls. Switch Quest/Questline.cs names. And Button add Questline , quests, step
|
4 年前 |
Amel
|
7b1ed2b2
|
Merge branch 'main' into UI
|
4 年前 |
|
uChema
|
2847ceef
|
Fix current questline + Add UI Healthbar into Game play scene
|
4 年前 |
|
uChema
|
20cfec67
|
clean up folders
|
4 年前 |
Ciro Continisio
|
2d718f1c
|
Merge branch 'main' into vegetation-tweaks
# Conflicts:
# UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
|
4 年前 |
Amel Negra
|
e0ede3d5
|
Merge branch 'main' into AmelMain
|
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 年前 |
|
Amel Negra
|
4ac06b52
|
Merge remote-tracking branch 'origin/main' into AmelMain
|
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 年前 |
|
Amel
|
6d56e31b
|
Merge branch 'main' into mainAmel
|
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
|
53aaeb3f
|
Fix Quest SOs
|
4 年前 |
|
Ciro Continisio
|
709521fa
|
Merge branch 'main' into worldbuilding
|
4 年前 |
|
uChema
|
d36df8f3
|
Adding save to disk on questline update
|
4 年前 |
|
Ciro Continisio
|
1b98a3e3
|
Merge branch 'main' of github.com:UnityTechnologies/open-project-1
|
4 年前 |
|
uChema
|
0f212cd8
|
Add Questline Testing ground
|
4 年前 |
|
Ciro Continisio
|
d8f2c2f3
|
Merge branch 'main' into ciro
|
4 年前 |
|
uChema
|
8a2721d9
|
Setting Questline + rename SO's files
|
3 年前 |
|
uChema
|
d7205d06
|
Add all questlines and rework Dialogue structure and Dialogue/Quest System. Winning and losing outcome WIP
|
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
|
fab03691
|
Merge branch 'pr/396' into main . Fix Player Inventory/ Testing inventory data.
|
3 年前 |
itsLevi0sa
|
340dd8dc
|
Merge branch 'main' into CaveWhiteboxing
|
3 年前 |
|
Ciro Continisio
|
2d712a99
|
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Scenes/Locations/Beach.unity
|
3 年前 |
|
uChema
|
dc07bb35
|
Merge remote-tracking branch 'upstream/main' into main
|
3 年前 |
