uChema
|
0ed45c81
|
Add Collectible Prefab
|
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 年前 |
|
uChema
|
3aeda760
|
Change collectable Item to trigger
|
4 年前 |
|
Ciro Continisio
|
73995838
|
Merge remote-tracking branch 'tech-mkt/main'
|
4 年前 |
Amel Negra
|
e0ede3d5
|
Merge branch 'main' into AmelMain
|
4 年前 |
|
Ciro Continisio
|
bc17972b
|
Merge branch 'main' into iet
# Conflicts:
# UOP1_Project/Packages/manifest.json
|
4 年前 |
|
Amel Negra
|
8965948b
|
Rock Critter egg prefab and
|
4 年前 |
|
Amel Negra
|
348c8c14
|
Merge branch 'AmelMain' into main
|
4 年前 |
|
uChema
|
c24dd21f
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
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
|
4 年前 |
|
uChema
|
fd58c9ac
|
Add new item icons
|
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 年前 |
|
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 年前 |
|
uChema
|
b1c2f634
|
Integrating Cutscenes and Questlines in final scenes
|
3 年前 |
|
Amel Negra
|
e9f4e34e
|
Merge remote-tracking branch 'origin/main' into main
|
3 年前 |
|
uChema
|
dc07bb35
|
Merge remote-tracking branch 'upstream/main' into main
|
3 年前 |
|
Ciro Continisio
|
510caa41
|
Small tweaks to UI elements
|
3 年前 |
