Ciro Continisio
|
7cd4ce12
|
Merge remote-tracking branch 'tech-mkt/main' into pr-bash
|
4 年前 |
Ciro Continisio
|
91b6456e
|
Merge remote-tracking branch 'tech-mkt/main' into main
|
4 年前 |
Ciro Continisio
|
6acf65d7
|
Tweaked emission graph, added textures
|
4 年前 |
uChema
|
3d4fdc12
|
UI Integration (WIP)
|
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 年前 |
uChema
|
7abf0997
|
WIP - UI Integration
|
4 年前 |
GitHub
|
c0b2931f
|
Merge pull request #1 from UnityTechnologies/main
Update fork
|
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 年前 |
uChema
|
2847ceef
|
Fix current questline + Add UI Healthbar into Game play scene
|
4 年前 |
uChema
|
0ed45c81
|
Add Collectible Prefab
|
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
|
cf9b5d2c
|
WIP Settings menu
|
4 年前 |
uChema
|
b52c1a1f
|
Add UI to Main Menu + Add Popup + Working on Settings
|
4 年前 |
uChema
|
7828a4fe
|
Asset folder Clean up
|
4 年前 |
uChema
|
f77ecadd
|
Pause game when Pause
|
4 年前 |
uChema
|
c3699920
|
Fix Subscribe/unsubscribe issue in UI. Implement Pause Menu with all its functions
|
4 年前 |
Amel Negra
|
8151f1b5
|
Merge remote-tracking branch 'origin/main' into AmelMain
|
4 年前 |
Amel Negra
|
345f2126
|
Rock Critter Item added to localization tables
|
4 年前 |
Amel Negra
|
348c8c14
|
Merge branch 'AmelMain' into main
|
4 年前 |
Amel Negra
|
c7f86452
|
Merge remote-tracking branch 'origin/main' into main
|
4 年前 |
uChema
|
c24dd21f
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
4 年前 |
uChema
|
b73d6df4
|
Fix last commit + Make Interaction item resizable
|
3 年前 |
Ciro Continisio
|
e6dcfc27
|
Merge branch 'main' into whiteboxing
|
3 年前 |
Amel Negra
|
49e49849
|
Adding to Localized tables Fry King actor and dialogue to test
|
3 年前 |
uChema
|
10a19c7c
|
Move USS file to correct folder
|
3 年前 |
Amel Negra
|
36cba268
|
Fixed Fry King dialogue typo
|
3 年前 |
Amel Negra
|
0b4f451f
|
Merge branch 'AmelMain' into main
|
3 年前 |
uChema
|
aa88e701
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
3 年前 |
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
|
3 年前 |
uChema
|
50525348
|
Fix Quest Tool : Add Remove buttons and AddDialogue Buttons
|
3 年前 |
Ciro Continisio
|
6bf9cfe1
|
Merge remote-tracking branch 'tech-mkt/main'
|
3 年前 |
Ciro Continisio
|
47ed0d6a
|
Merge branch 'main' into worldbuilding
|
3 年前 |
uChema
|
8b7ce38c
|
Create questlines
|
3 年前 |
Amel
|
6d56e31b
|
Merge branch 'main' into mainAmel
|
3 年前 |
Ciro Continisio
|
85c5bf58
|
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Prefabs/Gameplay/CameraSystem.prefab
# UOP1_Project/Assets/Scenes/Locations/Beach.unity
|
3 年前 |
uChema
|
283617f7
|
Creating Win/Lose quests and how to handle - Saving quests WIP
|
3 年前 |
Ciro Continisio
|
709521fa
|
Merge branch 'main' into worldbuilding
|
3 年前 |
uChema
|
d36df8f3
|
Adding save to disk on questline update
|
3 年前 |
Ciro Continisio
|
1b98a3e3
|
Merge branch 'main' of github.com:UnityTechnologies/open-project-1
|
3 年前 |
uChema
|
0f212cd8
|
Add Questline Testing ground
|
3 年前 |
Ciro Continisio
|
d8f2c2f3
|
Merge branch 'main' into ciro
|
3 年前 |
uChema
|
8a2721d9
|
Setting Questline + rename SO's files
|
3 年前 |
uChema
|
fd58c9ac
|
Add new item icons
|
3 年前 |
uChema
|
d7205d06
|
Add all questlines and rework Dialogue structure and Dialogue/Quest System. Winning and losing outcome WIP
|
3 年前 |
uChema
|
4413ebd5
|
Adding missing items + missing questline to a finite quest. Fixing errors.
Use TestingInventory with TestingGround_Questline scene to test the full quest
|
3 年前 |
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...
|
3 年前 |
uChema
|
7671fd63
|
Change 'Salty' adjective to Savory
|
3 年前 |
Amel Negra
|
a156875a
|
Merge remote-tracking branch 'origin/main' into main
|
3 年前 |
uChema
|
9936dca6
|
Refactoring Dialogue System
|
3 年前 |
itsLevi0sa
|
340dd8dc
|
Merge branch 'main' into CaveWhiteboxing
|
3 年前 |
Ciro Continisio
|
984180df
|
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/02a28a9c355f4fac879be8ab591f1a6a.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/0f35a51a6d884c8ab30219b5a3b05de7.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/108b5a6e887748a1875141cf7eefbf8e.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/177f1a363471462daaaa7e27712e2b77.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/17f9a240deb94feb8a71fae200bf7ff1.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/26347a43a1d94f6eba6efb6ca3d40208.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/2ab75110e077404aaaa2789feb3cc82e.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/2f392744e4d142f7a81da2a69bdaa99f.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/512005dcb52a4d588ffc91db589f24ff.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/61ff26a351934...
|
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
|
dc07bb35
|
Merge remote-tracking branch 'upstream/main' into main
|
3 年前 |
uChema
|
2e7057c0
|
Error message when can't cook
|
3 年前 |
Ciro Continisio
|
7fdb5bae
|
Merge branch 'main' into UI-icons
|
3 年前 |
Ciro Continisio
|
c099b7b7
|
Addressable fixes
|
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
|
2a223039
|
Fixed bugs
Addressable issues (stray loc tables), and a bug on the UI (inventory menu not updating a button prompt)
|
3 年前 |