Chema Damak
|
54306cec
|
Added localization package
|
4 年前 |
Chema Damak
|
7653f891
|
Add localized Dialogue
|
4 年前 |
uChema
|
2aa92a2d
|
Merge
|
4 年前 |
Chema Damak
|
3aaa37cc
|
Add UI system, Inventory UI and update Inventory System
|
4 年前 |
Amel
|
90998767
|
Merge remote-tracking branch 'origin/Inventory' into interaction
|
4 年前 |
Chema Damak
|
2051a72a
|
Adding interaction UI + Events
|
4 年前 |
uChema
|
6434aa7b
|
Renaming and cleaning folders
|
4 年前 |
Amel Negra
|
96e4f244
|
Merge remote-tracking branch 'origin/interaction' 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 年前 |
uChema
|
c128feff
|
Fix Dialogue branching and add UI
|
4 年前 |
GitHub
|
d0298f3d
|
Merge pull request #3 from UnityTechnologies/art-assets
Art assets
|
4 年前 |
uChema
|
748ff00f
|
Add a quest, and test; WIP
|
4 年前 |
Amel Negra
|
c444c501
|
Merge remote-tracking branch 'origin/main' into scenes-re-architecture
|
4 年前 |
uChema
|
02abd5ef
|
Rename Folder
|
4 年前 |
uChema
|
01c0ef6b
|
Modify Quest1
|
4 年前 |
GitHub
|
1853f7ab
|
Added Critter SO - Item drop when killed - FR critter names (#299)
|
4 年前 |
Amel Negra
|
01936592
|
Merge remote-tracking branch 'origin/art-assets' into main
|
4 年前 |
Ciro Continisio
|
183fdac0
|
Merge remote-tracking branch 'tech-mkt/main' into main
|
4 年前 |
uChema
|
4e8cb14b
|
Replace Dialogue lines with Localized string, Fix Quest System with questline
|
4 年前 |
Dan Young
|
eb670224
|
Merge remote-tracking branch 'upstream/art-assets' into art-assets
|
4 年前 |
uChema
|
b48675a8
|
Add italian locale
|
4 年前 |
Ciro Continisio
|
c691552b
|
Merge branch 'pr-bash' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Samples.meta
|
4 年前 |
uChema
|
0f397e96
|
Merge branch 'main' into QuestSystem
|
4 年前 |
uChema
|
837d24dd
|
Fix Shared Tables (Localization) conflict.
|
4 年前 |
Chema Damak
|
e7bcdcfd
|
Fixing the merge
|
4 年前 |
Chema Damak
|
59a6d63a
|
Fix Google Sheet Service
|
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 年前 |
Yohann Puyhaubert
|
0b3da4fa
|
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
|
4 年前 |