Chema Damak
|
3aaa37cc
|
Add UI system, Inventory UI and update Inventory System
|
4 年前 |
Amel
|
90998767
|
Merge remote-tracking branch 'origin/Inventory' 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 年前 |
Dan Young
|
7ce66d74
|
Merge remote-tracking branch 'upstream/art-assets' into art-assets
|
4 年前 |
|
Amel Negra
|
a3fdb227
|
Merge branch 'main' into whiteboxing
|
4 年前 |
GitHub
|
d0298f3d
|
Merge pull request #3 from UnityTechnologies/art-assets
Art assets
|
4 年前 |
|
Amel Negra
|
c444c501
|
Merge remote-tracking branch 'origin/main' into scenes-re-architecture
|
4 年前 |
uChema
|
4e8cb14b
|
Replace Dialogue lines with Localized string, Fix Quest System with questline
|
4 年前 |
|
uChema
|
b48675a8
|
Add italian locale
|
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 年前 |
|
Amel Negra
|
49e49849
|
Adding to Localized tables Fry King actor and dialogue to test
|
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
|
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
|
d7205d06
|
Add all questlines and rework Dialogue structure and Dialogue/Quest System. Winning and losing outcome WIP
|
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
|
340dd8dc
|
Merge branch 'main' into CaveWhiteboxing
|
4 年前 |
