uChema
cf9b5d2c
WIP Settings menu
4 年前
itsLevi0sa
5a4b5e30
[Bot] Automated dotnet-format update
4 年前
uChema
c3699920
Fix Subscribe/unsubscribe issue in UI. Implement Pause Menu with all its functions
4 年前
Ciro Continisio
76cc2e8b
Merge branch 'ForestMaze' of https://github.com/itsLevi0sa/open-project-1 into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Scripts/UI/UIManager.cs
4 年前
Ciro Continisio
e4d15d8c
Relocated whiteboxing scenes and folders
4 年前
GitHub
2fdc4efa
Update GameStateSO.cs ( #438 )
Fixed issue causing StackOverflowException when starting a dialogue.
4 年前
Amel Negra
8151f1b5
Merge remote-tracking branch 'origin/main' into AmelMain
4 年前
Amel Negra
319c24e9
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
350159af
Merge branch 'main' into whiteboxing
4 年前
uChema
be536522
Merge with main and fix Selection bug
4 年前
uChema
6c3280b4
Fix Dialogue closing when finished and Inventory close button
4 年前
Amel Negra
c7f86452
Merge remote-tracking branch 'origin/main' into main
4 年前
Amel Negra
35ef2889
Fixing merge conflicts
4 年前
Ciro Continisio
42b7725e
Connected almost all scenes
Missing TownMarket and TownUpper
4 年前
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
4 年前
uChema
8a2721d9
Setting Questline + rename SO's files
4 年前
uChema
09ae3bfc
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
uChema
d7205d06
Add all questlines and rework Dialogue structure and Dialogue/Quest System. Winning and losing outcome WIP
4 年前
uChema
ad52a32a
hot fixes - Questline integration
4 年前
uChema
4413ebd5
Adding missing items + missing questline to a finite quest. Fixing errors.
Use TestingInventory with TestingGround_Questline scene to test the full quest
4 年前
itsLevi0sa
72ec616e
[Bot] Automated dotnet-format update
4 年前
Ciro Continisio
460fb941
Merge branch 'CaveWhiteboxing' of https://github.com/itsLevi0sa/open-project-1 into worldbuilding
4 年前
Ciro Continisio
de0f0586
Revert "Merge branch 'CaveWhiteboxing' of https://github.com/itsLevi0sa/open-project-1 into worldbuilding"
This reverts commit 5141fc8d8d88057646e6602844c0bc709606f6d3, reversing
changes made to 0146f00fa2288b3baf783f2feb33ed3ff37fb231.
4 年前
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...
4 年前
itsLevi0sa
aa9e8032
Merge branch 'CaveWhiteboxing' of https://github.com/itsLevi0sa/open-project-1 into CaveWhiteboxing
4 年前
itsLevi0sa
340dd8dc
Merge branch 'main' into CaveWhiteboxing
4 年前
uChema
3faf99a1
Use the state machine to change Game State to and from Combat
4 年前
uChema
1d6b8128
Use Game States In State Machine
4 年前
uChema
1ce93bca
Small fixes in Game State System
4 年前
uChema
4ad4a353
Settings System
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 年前
Ciro Continisio
27ebfa55
Code formatting and tweaks
3 年前
Ciro Continisio
313f8a7f
Code cleanup, refactored Anchors to be generic
3 年前
Ciro Continisio
202b38ba
More code refactoring around Anchors
3 年前
Ciro Continisio
e0bf1a99
More code cleanup and bug fixes
Renamed tools
Hidden Quest tool
Added debug visualisation to some ScriptableObjects using ReadOnly attribute
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
5af375fa
Various changes around health management
Fixed UIHealthBar reset hearts bug
Relocated UI event channels under the Health folder
Enemies no longer fire UpdateUI events
Fixed PigChef's missing sounds
3 年前
Ciro Continisio
f0d72306
Moving files and tweaks
3 年前