Ciro Continisio
0ceeafd9
Refreshed Forest and Beach scenes
4 年前
kgc00
781633e3
Merge remote-tracking branch 'upstream/main' into main
4 年前
Ciro Continisio
7705382e
Merge branch 'main' into state-machine-improvements
# Conflicts:
# UOP1_Project/Assets/Prefabs/Pig.prefab
4 年前
kgc00
c4dabcbe
merge
4 年前
Ciro Continisio
99c4ccb4
Audio functionality
4 年前
treivize
0728a4c6
Merge branch 'art-assets' into feature/art/pant_critter
4 年前
GitHub
14e737cc
Merge pull request #1 from UnityTechnologies/art-assets
Art assets
4 年前
treivize
df2ab2a2
Merge branch 'art-assets' into feature/art/slime_critter
4 年前
GitHub
5c82e99e
Merge pull request #2 from UnityTechnologies/main
import changes from main
4 年前
Amel Negra
5d87a633
Pushing scenes
4 年前
Amel Negra
e8d73e33
Merge branch 'scenes-re-architecture' into main
4 年前
Amel Negra
23a23d5d
small tweaks on scenes
4 年前
uChema
c28d9833
Merge branch 'main' into QuestSystem
4 年前
Dan Young
eb670224
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
Ciro Continisio
c691552b
Merge branch 'pr-bash' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Samples.meta
4 年前
Ciro Continisio
290cf250
Merge branch 'pr-bash' into main
4 年前
alex
2f536097
Merge remote-tracking branch 'upstream/main' into main
4 年前
GitHub
762d050f
Merge pull request #6 from UnityTechnologies/main
Updating my branch
4 年前
Smurjo
df03afb9
Merge branch 'main' of https://github.com/Smurjo/open-project-1 into main
4 年前
uChema
7ece782e
Merge branch 'main' into QuestSystem
4 年前
Ciro Continisio
7eee90e5
Loading refactor part 4
4 年前
Bronson Zgeb
bd9a16aa
Added a Load function to StartGame.
Can now load a previously saved game from disk.
4 年前
Bronson Zgeb
5c50ddcf
Keep a backup of previous save. Added Continue from save to Menu.
4 年前
Ciro Continisio
2f0661e3
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
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
f6f1ad38
Fixes on the AudioManager, music in the Main Menu
4 年前
Yohann Puyhaubert
460eb34c
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
4 年前
GitHub
c0b2931f
Merge pull request #1 from UnityTechnologies/main
Update fork
4 年前
Ciro Continisio
0509be25
Refactored the whole cold startup mechanism
4 年前
Ciro Continisio
eaa6623e
Enabled the cold editor startup for the MainMenu scene too
4 年前
uChema
e4b71f99
Add controls
4 年前
uChema
5d435a5e
Merge branch 'main' into UI
4 年前
Amel
ce73c3ab
Merge remote-tracking branch 'origin/main' into main
4 年前
uChema
84d13891
Merge branch 'main' into UI
4 年前
uChema
b52c1a1f
Add UI to Main Menu + Add Popup + Working on Settings
4 年前
uChema
30ea906a
Add close button to Settings and Credits screens
4 年前
uChema
78eac924
Pause Screen
4 年前
Ciro Continisio
617c7a6a
Quick fix on Quit popup
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
b13a9a92
Refactor and rearrange folders
3 年前
Ciro Continisio
e6dcfc27
Merge branch 'main' into whiteboxing
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
62ba1135
Remove test debugging
3 年前
Ciro Continisio
1b98a3e3
Merge branch 'main' of github.com:UnityTechnologies/open-project-1
3 年前
Ciro Continisio
cc99c71a
Added 3D to main menu (temp)
3 年前
uChema
8a2721d9
Setting Questline + rename SO's files
3 年前
uChema
09ae3bfc
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Ciro Continisio
c853f465
Fix to initial scene
3 年前
Ciro Continisio
754f3f28
Removed dead prefab links
3 年前
uChema
d7205d06
Add all questlines and rework Dialogue structure and Dialogue/Quest System. Winning and losing outcome WIP
3 年前
uChema
6a1077d3
Create cutscenes dialogue
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
60b486d5
Scene work
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 年前
Ciro Continisio
a0a16da1
Scene work
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 年前
Ciro Continisio
bbffa7ea
Removed ProBuilder cache
3 年前
itsLevi0sa
340dd8dc
Merge branch 'main' into CaveWhiteboxing
3 年前
Amel Negra
a676cd5d
Merge remote-tracking branch 'origin/main' into main
3 年前
uChema
90cc66d9
Merge branch 'main' of https://github.com/uChema/open-project-1 into main
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
0a1c31a0
Add healthbar
3 年前
uChema
f29c7129
Add Icons placeholders - Set Game Scene UI - Add Aggro System
3 年前
uChema
94daf002
Restore health and Apply changes to MainMenuCanvas prefab
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 年前