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 年前
GitHub
0d96fe7f
Implement pause menu music ( #463 )
4 年前
Amel Negra
42ba5e06
Merge remote-tracking branch 'origin/main' into AmelMain
4 年前
uChema
b4892bfe
Merge with 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 年前
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
340dd8dc
Merge branch 'main' into CaveWhiteboxing
4 年前
uChema
1ce93bca
Small fixes in Game State System
4 年前
uChema
9511bfd5
Fixing Asset Table
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
8a36c2bf
Fix UI Rescaling. Test The whole game. WIP Interaction after cutscene
3 年前
uChema
93300a72
Rolling Credits
3 年前
Amel
22980250
Merge remote-tracking branch 'origin/main' into main
3 年前
uChema
57caaba3
Keep health between scenes
3 年前
uChema
94daf002
Restore health and Apply changes to MainMenuCanvas prefab
3 年前
uChema
2e7057c0
Error message when can't cook
3 年前
uChema
5c14c0b9
Update Switch tab button display to show both controls
3 年前
uChema
265562c0
"Add to Inventory" animated panel
3 年前
Ciro Continisio
7fdb5bae
Merge branch 'main' into UI-icons
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
2a223039
Fixed bugs
Addressable issues (stray loc tables), and a bug on the UI (inventory menu not updating a button prompt)
3 年前