Ciro Continisio
c3bf387e
Cleanup, Reorganisation of folders and Scenes
4 年前
circa94
cdbf1207
Merge branch 'circa94/master' into circa94/inventory-system
4 年前
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
f8f9e0b0
Event system refactoring
4 年前
Ciro Continisio
99c4ccb4
Audio functionality
4 年前
Ciro Continisio
ce5b07db
Fry king in scene, Loading tweaks
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 年前
jandd661
3ee06ccf
Update Beach Scene with test data
4 年前
jandd661
dfb183ee
Revert "Update Beach Scene with test data"
This reverts commit 90ac457d70ca678160e42ea1c3dc637709748cc1.
4 年前
jandd661
5e78c72a
Updated Beach Scene with test data for Scene Loader
4 年前
Ciro Continisio
c1fe908d
Fixes to example, moved files in Examples folder
4 年前
Ciro Continisio
5aaad3c6
Merge branch 'Location-Loader-issue-229-fix' into main
4 年前
Ciro Continisio
d62d8e9e
Merge branch 'main' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Prefabs/PrototypingTree.prefab.meta
# UOP1_Project/Assets/Samples.meta
# UOP1_Project/Assets/Samples/Polybrush.meta
# UOP1_Project/Assets/Samples/ProBuilder/4.4.0/Universal Render Pipeline Support/Material/ProBuilder Default URP.mat.meta
# UOP1_Project/Assets/Scenes/ArtShowcase/LightingData.asset.meta
# UOP1_Project/Assets/Scenes/ArtShowcase/ReflectionProbe-0.exr.meta
# UOP1_Project/Assets/Scenes/CharController.unity.meta
# UOP1_Project/Assets/Scenes/CharController/LightingData.asset
# UOP1_Project/Assets/Scenes/CharController/LightingData.asset.meta
# UOP1_Project/Assets/Scenes/CharController/ReflectionProbe-0.exr.meta
# UOP1_Project/Assets/Scenes/Locations/Beach/LightingData.asset
# UOP1_Project/Assets/Scenes/TestingGround.unity.meta
# UOP1_Project/Assets/Scenes/Whiteboxing/Beach/Proposal_1/BeachWhiteboxing_1_optimized.unity.meta
# UOP1_Project/Assets/Scenes/Whiteboxing/Beach/Proposal_1/BeachWhiteboxing_1_opt...
4 年前
GitHub
5c82e99e
Merge pull request #2 from UnityTechnologies/main
import changes from main
4 年前
Ciro Continisio
b5c513e4
Small tweaks
4 年前
Dan Young
268ab82e
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
Amel
2c9810c9
Merge branch 'main' into interaction
4 年前
Chema Damak
8a166bf0
Merge branch 'interaction' of https://github.com/UnityTechnologies/open-project-1 into interaction
4 年前
Dan Young
7ce66d74
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
GitHub
fb323a77
Allow multiple entry/exit points in Locations ( #284 )
* added support for multiple entry/exit points using PathSO
* + added entrance & exit in TestingGround scene going to the Beach scene
* + LocationExit: renamed a private method
* Added spawn location tag
* Added tag to entrances in different locations
* Find entrances with tag before spawning
* Added array initialization
* Made entrance a prefab
Co-authored-by: Amel Negra <amel.negra@unity3d.com>
4 年前
Amel Negra
23a23d5d
small tweaks on scenes
4 年前
uChema
c28d9833
Merge branch 'main' into QuestSystem
4 年前
Ciro Continisio
828d48b7
Empty Location scene
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
10a426d8
Scenes moved around
4 年前
Ciro Continisio
1c9c17d2
Reorganisation
4 年前
Ciro Continisio
d060f07a
Water plane Y scale fix
4 年前
Dane Byrd
c6beedc4
Merge branch 'art-assets' into ground_shader
4 年前
uChema
0f397e96
Merge branch 'main' into QuestSystem
4 年前
Ciro Continisio
5ca74ffe
Beach and Glade midboxing
4 年前
Ciro Continisio
a30ece4a
Merge branch 'pr-bash' into art-assets
4 年前
Ciro Continisio
bd2b6359
Midboxing again
4 年前
Ciro Continisio
b60fe6c7
Tweaks and bamboos
4 年前
GitHub
81481d8b
Merge pull request #4 from UnityTechnologies/main
update my local branch
4 年前
uChema
7ece782e
Merge branch 'main' into QuestSystem
4 年前
Ciro Continisio
dcf0b00e
Refactor part 3
4 年前
Ciro Continisio
7eee90e5
Loading refactor part 4
4 年前
Ciro Continisio
966da5a4
Initial camera position
4 年前
Ciro Continisio
0fd072b0
Enabled cold start
4 年前
Ciro Continisio
70978d9d
Audio changes
4 年前
Ciro Continisio
07f4bf25
Music playing
4 年前
Yohann Puyhaubert
460eb34c
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
4 年前
Ciro Continisio
91a763b7
Updated project to 2020 LTS
4 年前
Ciro Continisio
bfe7e497
New fire effect
4 年前
Ciro Continisio
c8c308d5
Relocated lighting settings
4 年前
GitHub
c0b2931f
Merge pull request #1 from UnityTechnologies/main
Update fork
4 年前
Amel
7b1ed2b2
Merge branch 'main' into UI
4 年前
Ciro Continisio
a1ce890c
Removed array of scenes from loading
4 年前
uChema
5d435a5e
Merge branch 'main' into UI
4 年前
Ciro Continisio
05c41c7f
Rebaked scenes
4 年前
Amel Negra
e0ede3d5
Merge branch 'main' into AmelMain
4 年前
Ciro Continisio
4a525440
Scene separated
4 年前
Ciro Continisio
42b7725e
Connected almost all scenes
Missing TownMarket and TownUpper
4 年前
Ciro Continisio
be943453
Scenes are all connected
4 年前
Ciro Continisio
c5a28a1e
Addressable settings
4 年前
Ciro Continisio
474f2d07
Camera tweaks
4 年前
Ciro Continisio
49a9a175
Baked all location scenes
4 年前
Ciro Continisio
23bd82d4
Beach landmass painting v1
4 年前
Ciro Continisio
ebe81a73
Worldbuilding in progress
Landmasses vertex paint, water plane tweaks
4 年前
Ciro Continisio
a2299fee
Water shaders, landmasses
4 年前
Ciro Continisio
5cc9de68
Beach changes, worldbuilding
Light settings, shader changes, prefab tweaks, model tweaks
4 年前
Ciro Continisio
f5afc4ea
Scenery
4 年前
Ciro Continisio
c22729d3
More worldbuilding
Full bake of all scenes
4 年前
uChema
735363c3
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Amel
6f206e69
Merge remote-tracking branch 'origin/main' into mainAmel
4 年前
Ciro Continisio
59efe5a3
Rock prefabs
4 年前
Ciro Continisio
bbf35a4d
SFX tweaks
Volume adjustments, moved Audio listener to Protagonist
4 年前
Ciro Continisio
4bd4a06c
Lightmap rebakes
4 年前
Ciro Continisio
53d9fe16
Scene work
4 年前
Ciro Continisio
8167037b
Worldbuilding
4 年前
uChema
eab4c107
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Ciro Continisio
2e9fcf21
BigTree shadow caster tweaks
Created custom shadow casting geometry for BigTrees, to get more light in the forest
3 年前
Ciro Continisio
dc51f9ac
More scenery work
3 年前
Ciro Continisio
51187a9d
Location work
3 年前
Ciro Continisio
587a2230
Worldbuilding
Scenes, rocks, waterfalls, foam, ...
Added fog
Rebaked all lighting
3 年前
Ciro Continisio
9e2212b4
Entry/exit fixes
3 年前
Ciro Continisio
80582a3d
Skyboxes for Forest and Forest Entrance
3 年前
uChema
71dcdcfd
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Ciro Continisio
6bd5deac
Added reverb zones
3 年前
Ciro Continisio
5f2c082e
Put sound on torches
Also added them to Field_Hill
3 年前
uChema
b768a7dc
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Ciro Continisio
4b2bcaf1
Mountain Path scene
3 年前
Ciro Continisio
115a64e1
Cave and Path entrance/exit
3 年前
Ciro Continisio
86269522
Fixes to cave
3 年前
Amel Negra
551380e3
Cutscene debug material and Nav mesh for test scene
3 年前
Amel Negra
e6b57e51
Adding Field Farms Cutscene scene for timeline tests
3 年前
Amel Negra
47746a1b
Pushing cutscene and changes on the scene
3 年前
Amel Negra
f23fd014
Temporarily disabled Slime critter state machines on scene for tests
3 年前
Amel Negra
77d67e1f
Removing temporary scene used
3 年前
uChema
b4892bfe
Merge with main
3 年前
Ciro Continisio
e7a11cf3
Interactables for Beach, Hill and Farms
3 年前
Ciro Continisio
eee951e1
Farms
3 年前
Ciro Continisio
509b93fe
Removed ForestEntrance scene
3 年前
Ciro Continisio
60b486d5
Scene work
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
7ac1c615
Pushing Beach scene with changes for beach candy cutscene
3 年前
Amel Negra
3b72c394
Resume gameplay after cutscene now works
3 年前
Amel Negra
a1c9548d
Organizing folders and tweaks on beach candy cutscene
3 年前
Amel Negra
890c9ef4
Adding beach cutscene scene as backup before merge
3 年前
Amel Negra
bce4012a
Made the cutscene prefab specific to the candy cutscene
3 年前
Amel Negra
a156875a
Merge remote-tracking branch 'origin/main' into main
3 年前
Amel Negra
3fa7bced
Removing Beach backup scene
3 年前
Amel Negra
5fb6c233
Re-Adding signal receiver on BardHare post merge
3 年前
Amel Negra
a7ac46c3
Tweaking talking animation transition in cutscene
3 年前
Amel Negra
7d7f08ff
tweaking transitions in cutscene
3 年前
uChema
02a13eae
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Amel Negra
a4661c6b
Beach cutscene as a prefab on the beach scene
3 年前
uChema
fab03691
Merge branch 'pr/396' into main . Fix Player Inventory/ Testing inventory data.
3 年前
Ciro Continisio
e858cef4
Market landmasses
3 年前
Ciro Continisio
93832439
Landmass work
3 年前
Ciro Continisio
bbffa7ea
Removed ProBuilder cache
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 年前
Ciro Continisio
6479be22
Ground patches
3 年前
Ciro Continisio
2d712a99
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Scenes/Locations/Beach.unity
3 年前
Ciro Continisio
e0c72522
Fixed BardHare dialogue camera being on at all times
3 年前
Ciro Continisio
a9b18d29
Baked all lightmaps
3 年前
Amel Negra
a676cd5d
Merge remote-tracking branch 'origin/main' into main
3 年前
Ciro Continisio
2de40c96
Work on mountain
3 年前
Ciro Continisio
c0f37c31
Merge branch 'worldbuilding'
3 年前
Amel Negra
095475d0
Pushing the scene after adding the new path configs
3 年前
Amel Negra
339144dd
Pushing path config changes as prefab
3 年前
Ciro Continisio
81c9fb97
Graphic work (mostly Cave)
3 年前
Ciro Continisio
25505e81
Worldbuilding
3 年前
Ciro Continisio
e693d85c
Worldbuilding
3 年前
Ciro Continisio
3ba16be3
EmptyLocation tweaks
3 年前
Ciro Continisio
e4121299
TownMarket work
3 年前
Ciro Continisio
c0d04e7a
TownMarket
3 年前
uChema
b1c2f634
Integrating Cutscenes and Questlines in final scenes
3 年前
Amel Negra
e9f4e34e
Merge remote-tracking branch 'origin/main' into main
3 年前
Amel
17e7e8f4
Pushing cutscene placeholders to the different scenes
3 年前
Ciro Continisio
b8f152c8
Beach light fixes and rebaked lightmaps
3 年前
Amel Negra
bbbf44d0
Fixing bard hare dialogue shot on beach scene
3 年前
Amel Negra
6242d7cf
wip win cutscene
3 年前
Amel
921d9db4
Adding beach final scene
3 年前
Amel
4e1ab710
Beach night scene light baking
3 年前
Amel
7db5cdba
placeholder for final cutscene
3 年前
Amel
4448fe99
pushing beach night scene
3 年前
Amel
b472d7a2
Adding load scene signal to load a location from timeline
3 年前
Amel
ee9d138e
Sweet dish cutscene now loads final beach cutscene on the end
3 年前
Amel
98847b01
Added celebration animations to cutscene
3 年前
Amel Negra
ec8eb680
Beach night final cutscene now starts main menu in the end
3 年前
Amel Negra
b75d5771
Polishing celebration part on win cutscene and added phoenix chick animation
3 年前
Amel Negra
e751564b
Tweaking sweet dish cutscene
3 年前
Amel Negra
3235736c
Baked Town Upper Navmesh to use for cutscene walking
3 年前
uChema
90cc66d9
Merge branch 'main' of https://github.com/uChema/open-project-1 into main
3 年前
uChema
dc07bb35
Merge remote-tracking branch 'upstream/main' into main
3 年前
GitHub
c0237ad9
Merge branch 'UnityTechnologies:main' into main
3 年前
uChema
378fc807
Merge branch 'main' of https://github.com/uChema/open-project-1 into main
3 年前
uChema
92cb047d
Merge remote-tracking branch 'upstream/main' into main
3 年前
Amel
1d5d51cb
Added beach intro cutscene + plays only when we play new game
3 年前
Amel
79795bad
Credits integration in final cutscene
3 年前
Ciro Continisio
53bc6c38
Refactored code to remove some warnings
3 年前
Ciro Continisio
30e472a6
Work on night scene
3 年前