Ciro Continisio
40572789
Merge branch 'CaveWhiteboxing' of https://github.com/itsLevi0sa/open-project-1 into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Cutscenes/PathAndCave.meta
# UOP1_Project/Assets/Cutscenes/PathAndCave.unity
# UOP1_Project/Assets/Cutscenes/PathAndCave.unity.meta
# UOP1_Project/Assets/Cutscenes/PathAndCave/NavMesh.asset
# UOP1_Project/Assets/Cutscenes/PathAndCave/NavMesh.asset.meta
# UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced.meta
# UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced.unity
# UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced.unity.meta
# UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced/NavMesh.asset
# UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced/NavMesh.asset.meta
# UOP1_Project/Assets/Scripts/Quests/Editor/QuestEditorWindow.cs
3 年前
Ciro Continisio
a9b18d29
Baked all lightmaps
3 年前
Ciro Continisio
e0c72522
Fixed BardHare dialogue camera being on at all times
3 年前
Ciro Continisio
2d712a99
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Scenes/Locations/Beach.unity
3 年前
Ciro Continisio
6de2a6a1
ArtShowcase light bake
3 年前
Ciro Continisio
8e056bbc
Wok
Added wok model, created composite wok cooking prefab, added CookingSteam fx
3 年前
Ciro Continisio
d3537763
Art assets
Tweaked wooden bench UVs and texture, created Campfire prefab out of PotOverFire
3 年前
Ciro Continisio
8761fdff
Fixes to ArtShowcase
3 年前
Ciro Continisio
33395788
RockCritter egg and Gold RockCritter egg
3 年前
Ciro Continisio
1aeed5db
Water mill
3 年前
Ciro Continisio
6479be22
Ground patches
3 年前
uChema
84ae59c8
Fix Push
3 年前
uChema
7ba7a559
Merge branch 'pr/396' into main
3 年前
uChema
fab03691
Merge branch 'pr/396' into main . Fix Player Inventory/ Testing inventory data.
3 年前
Amel Negra
a4661c6b
Beach cutscene as a prefab on the beach scene
3 年前
uChema
73019e13
Merge branch 'pr/480' into main
3 年前
paciFIST Studios
8daff79f
Update UIMenuManager.cs
Found a small bug, which was causing a NullReferenceException
Bug ticket:
https://github.com/UnityTechnologies/open-project-1/issues/478
Forum Thread:
https://forum.unity.com/threads/bug-uimenumanager-throws-nullreferenceexception-on-game-exit.1142410/#post-7337182
3 年前
uChema
2f6c4b7a
Hot fix : NullReferenceException on game exit
3 年前
uChema
1ce93bca
Small fixes in Game State System
3 年前
uChema
90cc66d9
Merge branch 'main' of https://github.com/uChema/open-project-1 into main
3 年前
uChema
1d6b8128
Use Game States In State Machine
3 年前
uChema
3faf99a1
Use the state machine to change Game State to and from Combat
3 年前
itsLevi0sa
0425b39f
[Bot] Automated dotnet-format update
3 年前
Ciro Continisio
984180df
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/02a28a9c355f4fac879be8ab591f1a6a.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/0f35a51a6d884c8ab30219b5a3b05de7.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/108b5a6e887748a1875141cf7eefbf8e.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/177f1a363471462daaaa7e27712e2b77.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/17f9a240deb94feb8a71fae200bf7ff1.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/26347a43a1d94f6eba6efb6ca3d40208.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/2ab75110e077404aaaa2789feb3cc82e.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/2f392744e4d142f7a81da2a69bdaa99f.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/512005dcb52a4d588ffc91db589f24ff.asset
# UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/61ff26a351934...
3 年前
itsLevi0sa
340dd8dc
Merge branch 'main' into CaveWhiteboxing
3 年前
Ciro Continisio
bbffa7ea
Removed ProBuilder cache
3 年前
itsLevi0sa
aa9e8032
Merge branch 'CaveWhiteboxing' of https://github.com/itsLevi0sa/open-project-1 into CaveWhiteboxing
3 年前
Ciro Continisio
93832439
Landmass work
3 年前
itsLevi0sa
2b78139d
Created PathAndCave scene (Scene A) and PathAndCave_Reduced scene (Scene B)
Scene A is the previously commited Cave scene with the addition of the path and a better asset grouping. Scene B is the Cave scene reduced and some path additions arranged to fit in the base scene provided in the Locations folder. Also included both scenes' NavMeshes.
3 年前
Ciro Continisio
e858cef4
Market landmasses
3 年前
uChema
02a13eae
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Amel Negra
7d7f08ff
tweaking transitions in cutscene
3 年前
Amel Negra
d9d8d631
Adding talk sfx events to pig chef talk clips
3 年前
Amel Negra
a7ac46c3
Tweaking talking animation transition in cutscene
3 年前
uChema
9936dca6
Refactoring Dialogue System
3 年前
Amel Negra
5fb6c233
Re-Adding signal receiver on BardHare post merge
3 年前
Amel Negra
3fa7bced
Removing Beach backup scene
3 年前
Amel Negra
a156875a
Merge remote-tracking branch 'origin/main' into main
3 年前
Amel Negra
50ea72eb
tweaking transitions in timeline
3 年前
Amel Negra
bce4012a
Made the cutscene prefab specific to the candy cutscene
3 年前
Amel Negra
890c9ef4
Adding beach cutscene scene as backup before merge
3 年前
Amel Negra
6a5ea46a
tweaking animations on cutscene
3 年前
Amel Negra
a1c9548d
Organizing folders and tweaks on beach candy cutscene
3 年前
Amel Negra
3b72c394
Resume gameplay after cutscene now works
3 年前
Amel Negra
bc3c5fd1
Merge remote-tracking branch 'origin/main' into main
3 年前
Amel Negra
7ac1c615
Pushing Beach scene with changes for beach candy cutscene
3 年前
Amel Negra
3f5ae592
Adding beach cutscene playable
3 年前
Amel Negra
9dc93db3
Pushing TimelineBinder script now works with multiple objects if needed
3 年前
Amel Negra
a4a0dc5b
Adding enter and exit timeline signals to set triggers on BardHare AC
3 年前
uChema
441fd47b
Add Mountain rock critter variant.
3 年前