Chema Damak
|
3aaa37cc
|
Add UI system, Inventory UI and update Inventory System
|
4 年前 |
Amel Negra
|
9bd8609f
|
Added filled circle sprite
|
4 年前 |
|
Amel Negra
|
a98227d6
|
images for loading screen tests
|
4 年前 |
|
Amel Negra
|
a60986ee
|
updated loading screen
|
4 年前 |
|
Amel Negra
|
e8d73e33
|
Merge branch 'scenes-re-architecture' into main
|
4 年前 |
uChema
|
c28d9833
|
Merge branch 'main' into QuestSystem
|
4 年前 |
Dan Young
|
eb670224
|
Merge remote-tracking branch 'upstream/art-assets' into art-assets
|
4 年前 |
Ciro Continisio
|
c691552b
|
Merge branch 'pr-bash' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Samples.meta
|
4 年前 |
|
uChema
|
3d4fdc12
|
UI Integration (WIP)
|
4 年前 |
|
uChema
|
5e51d58b
|
UI Improvements
|
4 年前 |
|
uChema
|
7321e9d0
|
UI Integration (WIP)
|
4 年前 |
|
uChema
|
5bb0b53c
|
Fixing some UIs / Adding localized preview image for the items
|
4 年前 |
|
uChema
|
627867d3
|
UI Tweeks + some items descriptions
|
4 年前 |
GitHub
|
c0b2931f
|
Merge pull request #1 from UnityTechnologies/main
Update fork
|
4 年前 |
|
uChema
|
129eaee3
|
Control Dialogue with keyboard/controller
|
4 年前 |
|
uChema
|
e4b71f99
|
Add controls
|
4 年前 |
|
uChema
|
5c109f22
|
Fix Items / Condense Localization tables. NB : Quests are not working anymore
|
4 年前 |
|
uChema
|
0db80293
|
Change disabled and Selected button graphics. Add reset UI when reloaded
|
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
|
53e43844
|
Renaming folders + Add UI Art Assets
|
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
|
c094f333
|
Merge branch 'main' into AmelMain
|
4 年前 |
|
uChema
|
cf9b5d2c
|
WIP Settings menu
|
4 年前 |
|
uChema
|
b52c1a1f
|
Add UI to Main Menu + Add Popup + Working on Settings
|
4 年前 |
|
Amel Negra
|
8151f1b5
|
Merge remote-tracking branch 'origin/main' into AmelMain
|
4 年前 |
|
uChema
|
4ad4a353
|
Settings System
|
3 年前 |
|
uChema
|
0e1137be
|
Adding Icons + New Interaction system
|
3 年前 |
|
uChema
|
f29c7129
|
Add Icons placeholders - Set Game Scene UI - Add Aggro System
|
3 年前 |
|
uChema
|
3854e2ed
|
Art folder reorg
|
3 年前 |
|
uChema
|
5c14c0b9
|
Update Switch tab button display to show both controls
|
3 年前 |
|
Ciro Continisio
|
ad5d889a
|
First batch of icons
|
3 年前 |
|
Ciro Continisio
|
7fdb5bae
|
Merge branch 'main' into UI-icons
|
3 年前 |
|
Ciro Continisio
|
96ae1f52
|
Reorganised folders
|
3 年前 |
|
Ciro Continisio
|
cfc7ad66
|
Inventory icons pt 2
|
3 年前 |
|
Ciro Continisio
|
f0d72306
|
Moving files and tweaks
|
3 年前 |
