Ciro Continisio
10a426d8
Scenes moved around
4 年前
Ciro Continisio
30e58a35
Farmer hat tweaks
4 年前
Ciro Continisio
4ca6acbc
Oven in scene
4 年前
Ciro Continisio
b8227469
Moustache prefabbed
4 年前
Dane Byrd
c6beedc4
Merge branch 'art-assets' into ground_shader
4 年前
uChema
0f397e96
Merge branch 'main' into QuestSystem
4 年前
uChema
837d24dd
Fix Shared Tables (Localization) conflict.
4 年前
GitHub
81481d8b
Merge pull request #4 from UnityTechnologies/main
update my local branch
4 年前
GitHub
87e0c403
Combat System - Critter/CritterSO scripts refactor using state machine capabilities and adding config SO ( #325 )
* Critter refactor using state machine capabilities and adding config SO
* Fixes following DeivSky's review
* Optimized NavMeshAgent null check
* Added abstractions between Critter script and ConfigSO
* Corrections following Amel review
* Split transition tables - move to fsm chasing and roaming settings
* Fixes on transition table
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 年前
Ciro Continisio
b7e86dc9
Merge branch 'main' of https://github.com/AlexandreGheraibia/open-project-1 into main
# Conflicts:
# UOP1_Project/Assets/Prefabs/Characters/Pig/Interaction.prefab
# UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab
4 年前
Ciro Continisio
28d4d3bb
Attack system overhaul
4 年前
uChema
7ece782e
Merge branch 'main' into QuestSystem
4 年前
uChema
7f7c4818
Fix Merge
4 年前
Chema Damak
e7bcdcfd
Fixing the merge
4 年前
Chema Damak
fab44b36
Merge fixes completed
4 年前
Ciro Continisio
7cd4ce12
Merge remote-tracking branch 'tech-mkt/main' into pr-bash
4 年前
GitHub
d07ee56f
Merge pull request #1 from UnityTechnologies/main
Latest changes
4 年前
GitHub
b5417125
Merge pull request #7 from UnityTechnologies/main
Updating my local repository
4 年前
Yohann Puyhaubert
22788ea0
Included pathway component to edit PathwayConfigSO
4 年前
Ciro Continisio
7eee90e5
Loading refactor part 4
4 年前
Amel Negra
bf22bd19
Added new accessories to the ArtShowcase scene
4 年前
Bronson Zgeb
a19b2328
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Ciro Continisio
2f0661e3
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
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 年前
Ciro Continisio
61f7cbe7
Scene redress and rebakes
4 年前
Amel Negra
6d8a1da0
Added example to Testing ground sc of slime critter moving along a path
4 年前
Ciro Continisio
e63ce59b
Lighting adjustments, probes
4 年前
GitHub
c0b2931f
Merge pull request #1 from UnityTechnologies/main
Update fork
4 年前
Ciro Continisio
e81c0ea8
Material work
4 年前
Ciro Continisio
44604f6f
Updated testing scenes
4 年前
Ciro Continisio
753835bc
Night sky, sunset
4 年前
Ciro Continisio
543c9e95
New lightmaps for TestingGround
4 年前
Ciro Continisio
293f994f
Merge branch 'graphic-rework'
4 年前
uChema
997b50ae
Merge branch 'main' into pr/393
4 年前
Amel
7b1ed2b2
Merge branch 'main' into UI
4 年前
Ciro Continisio
a1ce890c
Removed array of scenes from loading
4 年前
uChema
e4b71f99
Add controls
4 年前
uChema
5d435a5e
Merge branch 'main' into UI
4 年前
uChema
0ed45c81
Add Collectible Prefab
4 年前
Ciro Continisio
49d768c5
Rebaked TestingGround and ArtShowcase
4 年前
Ciro Continisio
05c41c7f
Rebaked scenes
4 年前
Amel
c326d169
updating townsfolk prefabs on TestingGround scene
4 年前
uChema
b536dfe7
Removing extra StepController component
4 年前
Amel Negra
9c3cf5d7
changes on testing ground scene
4 年前
Ciro Continisio
42e0d46a
Changes to TestingGround
4 年前
Amel Negra
e0ede3d5
Merge branch 'main' into AmelMain
4 年前
Amel Negra
5578a4b5
Fixing scene after merge
4 年前
Ciro Continisio
8f5b1bdb
Refined PigChef animations
4 年前
Ciro Continisio
17caa017
Cleanup
4 年前
uChema
3ce06cf5
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Amel Negra
b330e005
Testing ground scene with new townsfolk behaviors
4 年前
Ciro Continisio
bc17972b
Merge branch 'main' into iet
# Conflicts:
# UOP1_Project/Packages/manifest.json
4 年前
Amel Negra
c094f333
Merge branch 'main' into AmelMain
4 年前
uChema
b52c1a1f
Add UI to Main Menu + Add Popup + Working on Settings
4 年前
Amel Negra
eb36a053
updating scene with new prefab
4 年前
uChema
78eac924
Pause Screen
4 年前
Amel Negra
57b64e83
Pushing scene to make townsfolk idle on start
4 年前
Amel Negra
aef41f89
All townsfolk are intractable (removed variant)
4 年前
uChema
c3699920
Fix Subscribe/unsubscribe issue in UI. Implement Pause Menu with all its functions
4 年前
Amel Negra
1f8d4c95
Updated prefabs to add new event from step controller
4 年前
Amel Negra
6e88180e
pushing changes on scene
4 年前
Amel Negra
2855090c
Pushing the scene with the changes
4 年前
Amel Negra
a63051d7
wip
4 年前
Amel Negra
3be09cbd
Added another example of townsfolk talking to scene
4 年前
Amel Negra
3a9decf3
comment debug lines and push scene
4 年前
Amel Negra
a49e0c34
Set states for different townsfolk in the scene
4 年前
Amel
86f9401b
Updating townsfolk prefabs to be prefab variants from fbx
4 年前
Amel
4717e2f5
wip
4 年前
Amel Negra
aa357f79
Pushing scene with changes
4 年前
Amel Negra
7e8c921b
pushing scene with changes
4 年前
Amel
03aa1941
wip fixing townsfolk state machine on talk and listen
4 年前
Amel
811a6012
Bard hare state machine wip
4 年前
Amel Negra
ce10fdea
Bard hare state machine working
4 年前
Amel Negra
8151f1b5
Merge remote-tracking branch 'origin/main' into AmelMain
4 年前
Amel Negra
45e48bda
Disable state machine debug transitions
4 年前
Amel Negra
b23afbae
Updating talk state so it's independent from other states
4 年前
Ciro Continisio
350159af
Merge branch 'main' into whiteboxing
4 年前
Amel Negra
cebb0463
Rock critter example added to TestingGround scene
4 年前
Amel Negra
fbc93a67
pushing scene with rock critter changes
4 年前
Amel Negra
e0700a24
slowing walk speed for slime critter
4 年前
Amel Negra
6bb088d5
Attack animation works
4 年前
Amel Negra
348c8c14
Merge branch 'AmelMain' into main
4 年前
Amel Negra
c7f86452
Merge remote-tracking branch 'origin/main' into main
4 年前
Amel Negra
35ef2889
Fixing merge conflicts
4 年前
uChema
c24dd21f
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Amel Negra
52d6b39f
post merge bard hare fix
4 年前
Amel Negra
aec6fa7d
Townsfolk using another walk path
4 年前
uChema
52a617fe
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Ciro Continisio
4a525440
Scene separated
4 年前
Amel Negra
3794c8dd
Filling the townsfolk talkingTo arrays
4 年前
Amel Negra
0876b376
pushing the scene
4 年前
Amel Negra
946cf3fe
updating bard hare state machine with new changes from townsfolk v2 SM
4 年前
Amel Negra
f7ead9e8
updating scene after changes and adding new path config for townsfolk
4 年前
Amel Negra
c2ffc760
pushing scene
4 年前
uChema
75076141
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Ciro Continisio
e6dcfc27
Merge branch 'main' into whiteboxing
4 年前
Ciro Continisio
49a9a175
Baked all location scenes
4 年前
Amel Negra
365cc438
Added fry king to the scene
4 年前
Amel Negra
9d9487e8
Pushing testing ground scene with NPCs positions adjustments
4 年前
Amel Negra
586b9eed
Added noise for dialogue shot cameras of NPCs
4 年前
Amel Negra
a6e9748f
scene updates
4 年前
Amel Negra
0b4f451f
Merge branch 'AmelMain' into main
4 年前
uChema
aa88e701
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Ciro Continisio
72d88c0d
Merge branch 'main' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/AddressableAssetsData/OSX/addressables_content_state.bin.meta
# UOP1_Project/Assets/Scenes/Locations/Field_Farms.unity.meta
# UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
# UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/FryKing.meta
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
f790674d
Rebaked TestingGround
4 年前
uChema
d0523373
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Amel
6d15815d
tweaking testing ground townsfolk path
4 年前
Amel
d09c4ea9
Pushing scene after updates
4 年前
Amel
9c232940
Audio configs tweaking
4 年前
Ciro Continisio
bbf35a4d
SFX tweaks
Volume adjustments, moved Audio listener to Protagonist
4 年前
Ciro Continisio
4bd4a06c
Lightmap rebakes
4 年前
Ciro Continisio
8d6a3cb2
Audio tweaks
4 年前
Ciro Continisio
53d9fe16
Scene work
4 年前
Ciro Continisio
85c5bf58
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Prefabs/Gameplay/CameraSystem.prefab
# UOP1_Project/Assets/Scenes/Locations/Beach.unity
4 年前
Ciro Continisio
8167037b
Worldbuilding
4 年前
uChema
eab4c107
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Ciro Continisio
51187a9d
Location work
4 年前
Ciro Continisio
587a2230
Worldbuilding
Scenes, rocks, waterfalls, foam, ...
Added fog
Rebaked all lighting
3 年前
Ciro Continisio
a10b5dae
ProBuilder 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
86579ca9
Camera tweaks
Tweaks to the prefab
Added Ground layer, camera now avoids that (but landmasses not on the Ground layer yet)
3 年前
Amel
b5b71e0f
Adding fallen tree for bard hare on testing ground scene
3 年前
Ciro Continisio
a8343b05
Merge remote-tracking branch 'tech-mkt/main'
3 年前
uChema
0f212cd8
Add Questline Testing ground
3 年前
uChema
b768a7dc
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Ciro Continisio
d8f2c2f3
Merge branch 'main' into ciro
3 年前
uChema
8a2721d9
Setting Questline + rename SO's files
3 年前
Ciro Continisio
4b2bcaf1
Mountain Path scene
3 年前
uChema
b4892bfe
Merge with main
3 年前
Ciro Continisio
b214f102
Work on character controller
3 年前
Ciro Continisio
93d83526
New scene bake
3 年前
Ciro Continisio
f3bd8b00
Three raycasts
3 年前
Ciro Continisio
c3118a36
New day, new test
3 年前
Ciro Continisio
5b2ff381
More tweaks to CC
3 年前
Ciro Continisio
832dd088
Merge branch 'ciro'
3 年前
uChema
f26da778
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
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 年前
uChema
718b6321
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
uChema
441fd47b
Add Mountain rock critter variant.
3 年前
Amel Negra
a156875a
Merge remote-tracking branch 'origin/main' into main
3 年前
uChema
fab03691
Merge branch 'pr/396' into main . Fix Player Inventory/ Testing inventory data.
3 年前
itsLevi0sa
340dd8dc
Merge branch 'main' into CaveWhiteboxing
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
8761fdff
Fixes to ArtShowcase
3 年前
Ciro Continisio
d3537763
Art assets
Tweaked wooden bench UVs and texture, created Campfire prefab out of PotOverFire
3 年前
Ciro Continisio
8e056bbc
Wok
Added wok model, created composite wok cooking prefab, added CookingSteam fx
3 年前
Ciro Continisio
6de2a6a1
ArtShowcase light bake
3 年前
Ciro Continisio
2d712a99
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Scenes/Locations/Beach.unity
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
dc07bb35
Merge remote-tracking branch 'upstream/main' into main
3 年前
uChema
93300a72
Rolling Credits
3 年前
Amel
22980250
Merge remote-tracking branch 'origin/main' into main
3 年前
Ciro Continisio
534f3a7b
Fixes to ScriptableObjects values
3 年前
Ciro Continisio
c62d8542
Renamed all FryKing assets to LegendaryChef
3 年前