Ciro Continisio
fb97255e
Moved art assets
4 年前
Ciro Continisio
1e91c076
Added Flower, fixed Signpost, Rubble sizing
4 年前
Ciro Continisio
057b78d2
Torch, PotOverFire
4 年前
GitHub
32d860af
Added fire shader and campfire ( #172 )
* Added fire shader and campfire
* Tweaked campfire light position
Co-authored-by: Ciro Continisio <ciro@unity3d.com>
4 年前
Ciro Continisio
03ff96ac
New test scenes
Big testing scene with Polybrush terrain, small test scene with just primitives
4 年前
Ciro Continisio
2c91dabf
Merge branch 'art-assets' into big-merge
# Conflicts:
# UOP1_Project/Assets/Prefabs/Props/PotOverFire.prefab
4 年前
Ciro Continisio
ecf3b2ef
Art updates
Imported chest, fixed Phoenix Chick, fixed BardHare
4 年前
Ciro Continisio
e5e7acc6
Merge branch 'art-assets' into main
4 年前
kgc00
253b73a3
Merge remote-tracking branch 'upstream/main' into main
4 年前
kgc00
7b04a609
Merge branch 'main' into simple-menu-controls
4 年前
Marek Takac
b02de935
Changed Pottery game object collider to box
4 年前
Ciro Continisio
5fcc526a
Merge branch 'use-box-collider-for-pottery-objects' of https://github.com/mtakac/open-project-1 into main
4 年前
Ciro Continisio
6804ad52
Boat, Fry king, Lantern fixes
4 年前
Ciro Continisio
09492dfa
Merge branch 'main' into pr-bashing
4 年前
Ciro Continisio
21cfe483
Art showcase 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 年前
Ciro Continisio
8c8cc61d
Fixed boat hierarchy
4 年前
Llaczky
955d7516
Nature Assets Fix V1.2
- Changes in the Textures, Topology and pivots
-Different types of plants and one big house.
4 年前
Llaczky
a05af5c2
Merge branch 'main' into art-assets
4 年前
GitHub
e09986b8
Merge branch 'main' into fix/object-pool
4 年前
Llaczky
b9257924
TownAssets
More enviroment 3D assets.
-Small house in the same style.
-Empty market stands
-Small market items for decoration
-A door.
4 年前
Ciro Continisio
71b3bcca
Merge branch 'art-assets' of https://github.com/Llaczky/open-project-1 into art-assets
4 年前
Ciro Continisio
a0ac9ece
Imported and tweaked extra vegetation
4 年前
Ciro Continisio
b414fbe0
Merge branch 'art-assets' into main
4 年前
Ciro Continisio
1d26bec4
Merge branch 'main' into state-machine-improvements
4 年前
treivize
df2ab2a2
Merge branch 'art-assets' into feature/art/slime_critter
4 年前
Eduardo de Albuquerque
8845aa98
Merge branch 'main' into HollowBoatEffect
# Conflicts:
# UOP1_Project/Assets/Settings/Graphics/ToonRendererData.asset
# UOP1_Project/ProjectSettings/TagManager.asset
4 年前
Ciro Continisio
d9dd5e5e
Tweaked RenderFeatures
4 年前
Ciro Continisio
1413811f
Material properties
4 年前
Ciro Continisio
bd14256e
Material and prefab tweaks
4 年前
Ciro Continisio
efd5063f
Imported latest town assets
4 年前
GitHub
74658126
Added Frying Pan asset ( #252 )
* Added Frying pan assets
* Changed material smothness
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 年前
Ciro Continisio
e7b2e446
New art assets
4 年前
Dan Young
268ab82e
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
Amel
5418926e
added null check before event raise on interaction
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 年前
Amel Negra
564a406f
Added new interaction scene example
4 年前
Amel Negra
370a7993
Merge remote-tracking branch 'origin/main' into interaction
4 年前
Amel Negra
9bae4220
Merge remote-tracking branch 'origin/interaction' into main
4 年前
Ciro Continisio
77242d26
Merge branch 'main' of github.com:UnityTechnologies/open-project-1 into main
# Conflicts:
# UOP1_Project/Assets/Scenes/TestingGround.unity
4 年前
Ciro Continisio
716120b4
Bushes, new Fern plant
4 年前
Dan Young
7ce66d74
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
Amel Negra
a3fdb227
Merge branch 'main' into whiteboxing
4 年前
HarshNarayanJha
e1f4210f
A Wooden Bench to Sit and eat
4 年前
treivize
a4dc96e7
Initial Plant Critter combat system - Get Hit - Killed
4 年前
Dan Young
038d588e
Oven from DanTen66
Here is the Oven that I have been working on with Albedo, Material and a Prefab Variant. I am including the .meta files just in case.
You mentioned not to adjust the material shader, though this one has an outline and from what I understand the buildings and enviroment are not supposed to.
4 年前
GitHub
d0298f3d
Merge pull request #3 from UnityTechnologies/art-assets
Art assets
4 年前
Amel Negra
c444c501
Merge remote-tracking branch 'origin/main' into scenes-re-architecture
4 年前
HarshNarayanJha
37b819b9
Revisioned The Bench
4 年前
Ciro Continisio
e6e1f38f
Merge branch 'feature/sub/plant_critter_combat_system' of https://github.com/treivize/open-project-1 into pr-bash
4 年前
Ciro Continisio
84e76f64
Fixes, typos and tweaks
4 年前
Ciro Continisio
7c088a1f
Merge branch 'pr-bash' into main
4 年前
Ciro Continisio
c6c67ff0
New sound effects
Wired new sound effects: jump, pickup, swing cane and footsteps
Laid the foundation work for more
Script playing sfx on player from animation clips
4 年前
uChema
c28d9833
Merge branch 'main' into QuestSystem
4 年前
GitHub
1853f7ab
Added Critter SO - Item drop when killed - FR critter names ( #299 )
4 年前
Amel Negra
01936592
Merge remote-tracking branch 'origin/art-assets' into main
4 年前
Ciro Continisio
183fdac0
Merge remote-tracking branch 'tech-mkt/main' into main
4 年前
uChema
4e8cb14b
Replace Dialogue lines with Localized string, Fix Quest System with questline
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
2f001d27
Prefab tweaks
4 年前
Ciro Continisio
bba6e8cc
Merge branch 'art-assets' of https://github.com/danten66/open-project-1 into pr-bash
4 年前
Ciro Continisio
4ca6acbc
Oven in scene
4 年前
Dane Byrd
c6beedc4
Merge branch 'art-assets' into ground_shader
4 年前
uChema
0f397e96
Merge branch 'main' into QuestSystem
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 年前
Ciro Continisio
e59508f5
Imported fence assets
4 年前
Ciro Continisio
05b8a006
Merge branch 'main' into art-assets
4 年前
Bronson Zgeb
80efbc3c
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Amel Negra
2e6b1d55
Merge remote-tracking branch 'origin/main' 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
bfe7e497
New fire effect
4 年前
Carlos Anderson
aadc5919
Add beer keg model, material, and prefab
4 年前
Carlos Anderson
65674583
Add cutting board model, material, and prefab
4 年前
Ciro Continisio
4474d79c
Fire prefabs and torch
4 年前
GitHub
c0b2931f
Merge pull request #1 from UnityTechnologies/main
Update fork
4 年前
Ciro Continisio
6683b1e2
Torches, shader changes
4 年前
Ciro Continisio
eaff6ea8
Fire, embers, smoke
4 年前
Ciro Continisio
abada924
Torch number of particles
4 年前
Ciro Continisio
293f994f
Merge branch 'graphic-rework'
4 年前
Amel
75d340a3
Merge remote-tracking branch 'redcurry/art-assets' into main
4 年前
uChema
997b50ae
Merge branch 'main' into pr/393
4 年前
Amel
7b1ed2b2
Merge branch 'main' into UI
4 年前
uChema
0ed45c81
Add Collectible Prefab
4 年前
Ciro Continisio
2d718f1c
Merge branch 'main' into vegetation-tweaks
# Conflicts:
# UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
4 年前
GitHub
509abae6
Add small bridge model, material, and prefab ( #423 )
4 年前
Ciro Continisio
6620446f
Navigation-related prefab tweaks
4 年前
Amel Negra
e0ede3d5
Merge branch 'main' into AmelMain
4 年前
uChema
3ce06cf5
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Ciro Continisio
bc17972b
Merge branch 'main' into iet
# Conflicts:
# UOP1_Project/Packages/manifest.json
4 年前
Ciro Continisio
42b7725e
Connected almost all scenes
Missing TownMarket and TownUpper
4 年前
GitHub
47348d31
Bridges and Earrings(Mesh, Material, and Prefabs) ( #429 )
Added more accessories for the [Accessories for Townsfolk card]
I also added the Bridge with the Side Railings.
4 年前
uChema
735363c3
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Amel
fecdb9df
Merge branch 'main' into mainAmel
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
3 年前
uChema
eab4c107
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Ciro Continisio
dc51f9ac
More scenery work
3 年前
Ciro Continisio
51187a9d
Location work
3 年前
uChema
71dcdcfd
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
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
509b93fe
Removed ForestEntrance scene
3 年前
uChema
718b6321
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Amel Negra
a156875a
Merge remote-tracking branch 'origin/main' into main
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 年前
Amel Negra
a676cd5d
Merge remote-tracking branch 'origin/main' into main
3 年前
Ciro Continisio
81c9fb97
Graphic work (mostly Cave)
3 年前
Ciro Continisio
8e61f477
Added light probes to prefabs
3 年前
Ciro Continisio
e693d85c
Worldbuilding
3 年前
Amel Negra
e9f4e34e
Merge remote-tracking branch 'origin/main' into main
3 年前
Ciro Continisio
b8f152c8
Beach light fixes and rebaked lightmaps
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 年前