Ciro Continisio
|
e858cef4
|
Market landmasses
|
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
|
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 年前 |
Amel Negra
|
cdba81f2
|
Pushing animations, ACs and prefabs tweaked for cutscenes
|
3 年前 |
uChema
|
718b6321
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
3 年前 |
Amel Negra
|
5ff6116e
|
Adding Nar actor
|
3 年前 |
uChema
|
7671fd63
|
Change 'Salty' adjective to Savory
|
3 年前 |
Amel Negra
|
d25a7fc5
|
Adding black image png for cutscenes fade in and out
|
3 年前 |
Ciro Continisio
|
a0a16da1
|
Scene work
|
3 年前 |
Ciro Continisio
|
5ef923fb
|
Material and model tweaks
|
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
|
3835c521
|
Skybox and water tweaks
Now endless water plane!
|
3 年前 |
Ciro Continisio
|
60b486d5
|
Scene work
|
3 年前 |
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.
|
3 年前 |
Ciro Continisio
|
472b2651
|
Merge branch 'main' of https://github.com/MortyJHin/open-project-1 into worldbuilding
|
3 年前 |
Ciro Continisio
|
509b93fe
|
Removed ForestEntrance scene
|
3 年前 |
Ciro Continisio
|
43f6f6f7
|
Merge branch 'main' into worldbuilding
|
3 年前 |
Ciro Continisio
|
eee951e1
|
Farms
|
3 年前 |
Ciro Continisio
|
460fb941
|
Merge branch 'CaveWhiteboxing' of https://github.com/itsLevi0sa/open-project-1 into worldbuilding
|
3 年前 |
Ciro Continisio
|
97ff2e4b
|
Probuilder meshes
|
3 年前 |
Ciro Continisio
|
56d5c554
|
Tweaks to glow shader
Fresnel influence is now controllable
|
3 年前 |
Ciro Continisio
|
ba483324
|
Ayud and Felfel looks
|
3 年前 |
uChema
|
9f463dfd
|
Hot Fix : Cooking mode inventory is maintained after action (Cook, change tab, select other items)
|
3 年前 |
Ciro Continisio
|
e7a11cf3
|
Interactables for Beach, Hill and Farms
|
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 年前 |
uChema
|
6a1077d3
|
Create cutscenes dialogue
|
3 年前 |
uChema
|
97ccda6a
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
3 年前 |