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 年前
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 年前
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
4995dad7
Merge branch 'pr/290' into QuestSystem
4 年前
uChema
b48675a8
Add italian locale
4 年前
Ciro Continisio
c691552b
Merge branch 'pr-bash' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Samples.meta
4 年前
uChema
837d24dd
Fix Shared Tables (Localization) conflict.
4 年前
Ciro Continisio
334de1f1
Part 1
4 年前
Chema Damak
e7bcdcfd
Fixing the merge
4 年前
Ciro Continisio
76ed440e
AddressableAsset settings
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 年前
Ciro Continisio
953afd39
Merge branch 'loading-refactor' into pr-bash
# Conflicts:
# UOP1_Project/Assets/Prefabs/GameplayEssentials/SceneLoader.prefab
4 年前
Ciro Continisio
94a617c8
Reorganising SceneDataSOs
4 年前
GitHub
a16c268f
Town Whiteboxing ( #384 )
Created a Town Folder inside the Whiteboxing Folder, with the scene/materials/script and lightmap data inside. Also added a SceneDataSO named Town in the SceneData>Locations folder.
4 年前
Bronson Zgeb
80efbc3c
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Amel Negra
2e6b1d55
Merge remote-tracking branch 'origin/main' into main
4 年前
Ciro Continisio
cdc832d0
Reorganised Addressables
4 年前
Ciro Continisio
dbb87e76
More Addressables
4 年前
Ciro Continisio
f6f1ad38
Fixes on the AudioManager, music in the Main Menu
4 年前
uChema
3d4fdc12
UI Integration (WIP)
4 年前
Yohann Puyhaubert
460eb34c
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
4 年前
uChema
7321e9d0
UI Integration (WIP)
4 年前
uChema
5bb0b53c
Fixing some UIs / Adding localized preview image for the items
4 年前
GitHub
c0b2931f
Merge pull request #1 from UnityTechnologies/main
Update fork
4 年前
uChema
31d75482
Add controls. Switch Quest/Questline.cs names. And Button add Questline , quests, step
4 年前
uChema
e492f068
Clean project and add folder creation.
4 年前
GitHub
54d99d4a
Fixes #385 where no locale is selected in a build. ( #392 )
4 年前
uChema
997b50ae
Merge branch 'main' into pr/393
4 年前
Amel
7b1ed2b2
Merge branch 'main' into UI
4 年前
uChema
27225bd9
Fix localization error
4 年前
uChema
09ec279d
Fix Input when closing Inventory
4 年前
uChema
5c109f22
Fix Items / Condense Localization tables. NB : Quests are not working anymore
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
b52c1a1f
Add UI to Main Menu + Add Popup + Working on Settings
4 年前
Ciro Continisio
4c903dff
Whiteboxing master scene v1
4 年前
Amel Negra
8151f1b5
Merge remote-tracking branch 'origin/main' into AmelMain
4 年前
uChema
127bd54d
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Ciro Continisio
4a525440
Scene separated
4 年前
Ciro Continisio
42b7725e
Connected almost all scenes
Missing TownMarket and TownUpper
4 年前
Ciro Continisio
c5a28a1e
Addressable settings
4 年前
uChema
b73d6df4
Fix last commit + Make Interaction item resizable
4 年前
Ciro Continisio
e6dcfc27
Merge branch 'main' into whiteboxing
4 年前
Amel Negra
49e49849
Adding to Localized tables Fry King actor and dialogue to test
4 年前
Amel Negra
1b0a6a80
pushing the rest
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 年前
Ciro Continisio
7798b04e
Addressable changes
Packaged more files into Addressables
4 年前
uChema
eab4c107
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
uChema
0f212cd8
Add Questline Testing ground
4 年前
Ciro Continisio
d8f2c2f3
Merge branch 'main' into ciro
4 年前
Ciro Continisio
daf25dee
Removed test scene from build
TestingGround_Questline was in the default AA group
4 年前
uChema
09ae3bfc
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
uChema
fd58c9ac
Add new item icons
3 年前
Ciro Continisio
4b2bcaf1
Mountain Path scene
3 年前
Amel Negra
f670d943
Updating cutscene example scene with dialogue-cutscene updates
3 年前
Ciro Continisio
7a6ec0e8
Merge remote-tracking branch 'tech-mkt/main'
3 年前
uChema
b4892bfe
Merge with main
3 年前
Ciro Continisio
3e67c187
Merge branch 'main' into ciro
3 年前
Ciro Continisio
509b93fe
Removed ForestEntrance scene
3 年前
uChema
718b6321
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Amel Negra
a156875a
Merge remote-tracking branch 'origin/main' into main
3 年前
Amel
88755c36
Added final beach scene as addressable
3 年前
Amel Negra
ec8eb680
Beach night final cutscene now starts main menu in the end
3 年前
uChema
90cc66d9
Merge branch 'main' of https://github.com/uChema/open-project-1 into main
3 年前
uChema
4ad4a353
Settings System
3 年前
uChema
9511bfd5
Fixing Asset Table
3 年前
uChema
92cb047d
Merge remote-tracking branch 'upstream/main' into main
3 年前
Ciro Continisio
b622ace5
Updated to 2020.3.17f1
3 年前
Ciro Continisio
c099b7b7
Addressable fixes
3 年前
Ciro Continisio
534f3a7b
Fixes to ScriptableObjects values
3 年前
Ciro Continisio
b74f3140
More Runtime Anchor refactoring, other SO additions
Also fixed bug with RuntimeAnchors
Fixed BardHare state machine (error on Animator parameter)
3 年前
Ciro Continisio
6b104b55
Mega code cleanup
3 年前
Ciro Continisio
7c866dcc
Fix for Addressables issue
3 年前
Ciro Continisio
2a223039
Fixed bugs
Addressable issues (stray loc tables), and a bug on the UI (inventory menu not updating a button prompt)
3 年前