uChema
|
6434aa7b
|
Renaming and cleaning folders
|
4 年前 |
Amel Negra
|
96e4f244
|
Merge remote-tracking branch 'origin/interaction' into interaction
|
4 年前 |
uChema
|
c852ab5b
|
Update Cutscenes to use Event Channels
|
4 年前 |
uChema
|
a16fe655
|
Dialogue And Quest Managers + Refractoring some scripts
|
4 年前 |
uChema
|
edca0f63
|
Rename Task to Step
|
4 年前 |
uChema
|
b2cf2c5b
|
Refractoring
|
4 年前 |
uChema
|
008bad73
|
Fix Merge
|
4 年前 |
Chema Damak
|
fab44b36
|
Merge fixes completed
|
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
|
52cb413e
|
Capitalisation fix part2
|
4 年前 |
Bronson Zgeb
|
253267ff
|
Save Data when you add or remove an item
|
4 年前 |
Ciro Continisio
|
2f0661e3
|
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 年前 |
Yohann Puyhaubert
|
460eb34c
|
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
|
4 年前 |
uChema
|
627867d3
|
UI Tweeks + some items descriptions
|
4 年前 |
GitHub
|
c0b2931f
|
Merge pull request #1 from UnityTechnologies/main
Update fork
|
4 年前 |
uChema
|
09ec279d
|
Fix Input when closing Inventory
|
4 年前 |
uChema
|
e4b71f99
|
Add controls
|
4 年前 |
uChema
|
86db6931
|
Rename Quest Data to quest manager + Add Game Manager
|
4 年前 |
uChema
|
0db80293
|
Change disabled and Selected button graphics. Add reset UI when reloaded
|
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
|
78eac924
|
Pause Screen
|
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
|
c7f86452
|
Merge remote-tracking branch 'origin/main' into main
|
4 年前 |
uChema
|
b13a9a92
|
Refactor and rearrange folders
|
4 年前 |
Ciro Continisio
|
e6dcfc27
|
Merge branch 'main' into whiteboxing
|
4 年前 |
Amel
|
a0b65245
|
Dialogue shot tweaking
|
4 年前 |
Ciro Continisio
|
8d6a3cb2
|
Audio tweaks
|
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 年前 |
uChema
|
eab4c107
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
4 年前 |
uChema
|
283617f7
|
Creating Win/Lose quests and how to handle - Saving quests WIP
|
4 年前 |
Ciro Continisio
|
709521fa
|
Merge branch 'main' into worldbuilding
|
4 年前 |
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
|
e022f2ee
|
Rework on questline naming
|
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
|
eee951e1
|
Farms
|
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
|
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 年前 |
itsLevi0sa
|
340dd8dc
|
Merge branch 'main' into CaveWhiteboxing
|
3 年前 |
uChema
|
90cc66d9
|
Merge branch 'main' of https://github.com/uChema/open-project-1 into main
|
3 年前 |
Amel
|
7b7510b3
|
Fix dialogue shots
|
3 年前 |
Ciro Continisio
|
6b104b55
|
Mega code cleanup
|
3 年前 |