Ciro Continisio
|
3cf5b804
|
Moved scenes
|
4 年前 |
Ciro Continisio
|
953afd39
|
Merge branch 'loading-refactor' into pr-bash
# Conflicts:
# UOP1_Project/Assets/Prefabs/GameplayEssentials/SceneLoader.prefab
|
4 年前 |
Ciro Continisio
|
ea9dfcea
|
Small fix to SceneLoader
|
4 年前 |
Ciro Continisio
|
dcf0b00e
|
Refactor part 3
|
4 年前 |
Ciro Continisio
|
7d8f5cc8
|
Small tweaks
|
4 年前 |
Ciro Continisio
|
05b8a006
|
Merge branch 'main' into art-assets
|
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
|
07f4bf25
|
Music playing
|
4 年前 |
uChema
|
3d4fdc12
|
UI Integration (WIP)
|
4 年前 |
uChema
|
5e51d58b
|
UI Improvements
|
4 年前 |
Yohann Puyhaubert
|
460eb34c
|
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
|
4 年前 |
uChema
|
7321e9d0
|
UI Integration (WIP)
|
4 年前 |
uChema
|
da6359bd
|
small improvements
|
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
|
09ec279d
|
Fix Input when closing Inventory
|
4 年前 |
uChema
|
2a357495
|
Open/Close Inventory with Input system. No mouse needed
|
4 年前 |
Ciro Continisio
|
0509be25
|
Refactored the whole cold startup mechanism
|
4 年前 |
uChema
|
129eaee3
|
Control Dialogue with keyboard/controller
|
4 年前 |
uChema
|
5d435a5e
|
Merge branch 'main' into UI
|
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 年前 |
Amel Negra
|
81b3de1b
|
Fix interaction
|
4 年前 |
uChema
|
7120f338
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
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 年前 |
uChema
|
78eac924
|
Pause Screen
|
4 年前 |
uChema
|
7828a4fe
|
Asset folder Clean up
|
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 年前 |
uChema
|
be536522
|
Merge with main and fix Selection bug
|
4 年前 |
Amel Negra
|
c7f86452
|
Merge remote-tracking branch 'origin/main' into main
|
4 年前 |
uChema
|
66b47933
|
Default Button improvement
|
4 年前 |
uChema
|
b13a9a92
|
Refactor and rearrange folders
|
4 年前 |
uChema
|
b73d6df4
|
Fix last commit + Make Interaction item resizable
|
4 年前 |
Ciro Continisio
|
e6dcfc27
|
Merge branch 'main' into whiteboxing
|
4 年前 |
Amel
|
9c232940
|
Audio configs tweaking
|
4 年前 |
Ciro Continisio
|
bbf35a4d
|
SFX tweaks
Volume adjustments, moved Audio listener to Protagonist
|
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
|
3 年前 |
Ciro Continisio
|
f8947aa6
|
Sound tweaks and timing
Tweaked SFX timing on animation clips
|
3 年前 |
Wiecio
|
7a89c938
|
First implementation of fading during loading scenes
|
4 年前 |
uChema
|
b768a7dc
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
3 年前 |
Ciro Continisio
|
065751a8
|
Merge branch 'main' of https://github.com/Wiecio/open-project-1 into ciro
# Conflicts:
# UOP1_Project/Assets/Scenes/Managers/PersistentManagers.unity
# UOP1_Project/Assets/Scripts/Events/ScriptableObjects/LoadEventChannelSO.cs
# UOP1_Project/Assets/Scripts/SaveSystem/SaveSystem.cs
# UOP1_Project/Assets/Scripts/SceneManagement/LocationExit.cs
# UOP1_Project/Assets/Scripts/SceneManagement/SceneLoader.cs
|
3 年前 |
Ciro Continisio
|
cc99c71a
|
Added 3D to main menu (temp)
|
3 年前 |
uChema
|
09ae3bfc
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
3 年前 |
uChema
|
e022f2ee
|
Rework on questline naming
|
3 年前 |
Ciro Continisio
|
36d16456
|
File cleanup and relocation
|
3 年前 |
Amel Negra
|
42ba5e06
|
Merge remote-tracking branch 'origin/main' into AmelMain
|
3 年前 |
uChema
|
b4892bfe
|
Merge with main
|
3 年前 |
uChema
|
ad52a32a
|
hot fixes - Questline integration
|
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 年前 |
itsLevi0sa
|
340dd8dc
|
Merge branch 'main' into CaveWhiteboxing
|
3 年前 |
Amel Negra
|
120c5b08
|
Added pause audio signal for cutscene
|
3 年前 |
Amel Negra
|
a557f23b
|
Now DialogueBehaviour takes care of disabling UI dialogue when not paused
|
3 年前 |
Amel
|
8b2d50b0
|
Add start state for townsfolks
|
3 年前 |
uChema
|
1ce93bca
|
Small fixes in Game State System
|
3 年前 |
uChema
|
4ad4a353
|
Settings System
|
3 年前 |
uChema
|
9511bfd5
|
Fixing Asset Table
|
3 年前 |
uChema
|
dc07bb35
|
Merge remote-tracking branch 'upstream/main' into main
|
3 年前 |
uChema
|
41cc566f
|
Merge Settings with main
|
3 年前 |
uChema
|
0a1c31a0
|
Add healthbar
|
3 年前 |
uChema
|
0e1137be
|
Adding Icons + New Interaction system
|
3 年前 |
uChema
|
f29c7129
|
Add Icons placeholders - Set Game Scene UI - Add Aggro System
|
3 年前 |
uChema
|
1eaafa64
|
Add Rolling credits to GameplayScene
|
3 年前 |
Amel
|
22980250
|
Merge remote-tracking branch 'origin/main' into main
|
3 年前 |
Amel
|
79795bad
|
Credits integration in final cutscene
|
3 年前 |
uChema
|
5c14c0b9
|
Update Switch tab button display to show both controls
|
3 年前 |
Ciro Continisio
|
7fdb5bae
|
Merge branch 'main' into UI-icons
|
3 年前 |
Ciro Continisio
|
6b104b55
|
Mega code cleanup
|
3 年前 |
Ciro Continisio
|
f1c2b9e1
|
Added Teleporter cheat menu
Press C key to activate, only in the editor
|
3 年前 |
Ciro Continisio
|
f0d72306
|
Moving files and tweaks
|
3 年前 |