uChema
|
7cd7c86b
|
Merge branch 'pr/67' into main
|
3 年前 |
|
uChema
|
1121acab
|
Reset Interactable prefab
|
3 年前 |
GitHub
|
0aa3c019
|
Wiki images
|
3 年前 |
|
uChema
|
b1c2f634
|
Integrating Cutscenes and Questlines in final scenes
|
3 年前 |
|
GitHub
|
4b758ddc
|
Wiki images
|
3 年前 |
Ciro Continisio
|
83ea7526
|
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Scenes/Locations/Field_Farms.unity
|
3 年前 |
|
Ciro Continisio
|
c0d04e7a
|
TownMarket
|
3 年前 |
|
Ciro Continisio
|
e4121299
|
TownMarket work
|
3 年前 |
|
Ciro Continisio
|
3ba16be3
|
EmptyLocation tweaks
|
3 年前 |
|
Ciro Continisio
|
e693d85c
|
Worldbuilding
|
3 年前 |
|
Ciro Continisio
|
65a539ba
|
Art tweaks
|
3 年前 |
|
Ciro Continisio
|
8e61f477
|
Added light probes to prefabs
|
3 年前 |
|
Ciro Continisio
|
1d3f0c8a
|
Added FallCatcher script for water areas
|
3 年前 |
|
Ciro Continisio
|
25505e81
|
Worldbuilding
|
3 年前 |
|
Ciro Continisio
|
81c9fb97
|
Graphic work (mostly Cave)
|
3 年前 |
Amel Negra
|
8128c471
|
Tweaking cutscene camera shake frequency and amplitude
|
3 年前 |
|
Amel Negra
|
339144dd
|
Pushing path config changes as prefab
|
3 年前 |
|
Amel Negra
|
178534d3
|
Adding v1 of slime critters cutscene
|
3 年前 |
|
Amel Negra
|
095475d0
|
Pushing the scene after adding the new path configs
|
3 年前 |
|
Amel Negra
|
fa8cc2af
|
Added new path configs for slime critters on the Field_Farms scene
|
3 年前 |
|
Ciro Continisio
|
c0f37c31
|
Merge branch 'worldbuilding'
|
3 年前 |
|
Ciro Continisio
|
2de40c96
|
Work on mountain
|
3 年前 |
|
Amel Negra
|
12905f99
|
Prefabs and playableDirectors placeholders created for different cutscenes
|
3 年前 |
|
Ciro Continisio
|
72e8db4d
|
Moved itsleviosa's whiteboxing
|
3 年前 |
|
Amel Negra
|
7764a8fd
|
Merge remote-tracking branch 'origin/main' into main
|
3 年前 |
|
uChema
|
59488a5c
|
Merge branch 'pr/400' into main
|
3 年前 |
|
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 年前 |
|
Amel Negra
|
a676cd5d
|
Merge remote-tracking branch 'origin/main' into main
|
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 年前 |
|
Amel Negra
|
6c5d90c9
|
Adding slime cutscene prefab and playable
|
3 年前 |
|
Amel Negra
|
d3f9f09c
|
Added general cutscenePlayableDirector prefab
|
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 年前 |
|
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 年前 |
|
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 年前 |
itsLevi0sa
|
0425b39f
|
[Bot] Automated dotnet-format update
|
3 年前 |
