Ciro Continisio
fb97255e
Moved art assets
4 年前
Ciro Continisio
8bcb0d29
Imported directions sign, removed no_eyes tests
4 年前
Ciro Continisio
1e91c076
Added Flower, fixed Signpost, Rubble sizing
4 年前
Ciro Continisio
24cc8443
Added crunch compression to all textures + Preset
4 年前
Ciro Continisio
057b78d2
Torch, PotOverFire
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 年前
Ciro Continisio
07d58711
Boat, Fry king
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 年前
Eduardo de Albuquerque
3cb4982d
Added a mask geometry to the project and updated boat prefab
4 年前
Ciro Continisio
1413811f
Material properties
4 年前
Ciro Continisio
bd14256e
Material and prefab tweaks
4 年前
Ciro Continisio
101906b4
Townsfolk_M animations, Palm2
4 年前
Dane Byrd
bd72e4e6
Merge remote-tracking branch 'UnityTechnologies/art-assets' into art-assets
4 年前
Ciro Continisio
3def478b
Imported Smurjo's models, reorganised folders
4 年前
Ciro Continisio
11189097
Merge remote-tracking branch '_tech-mkt/art-assets' into art-assets
4 年前
Ciro Continisio
efd5063f
Imported latest town assets
4 年前
GitHub
74658126
Added Frying Pan asset ( #252 )
* Added Frying pan assets
* Changed material smothness
4 年前
GitHub
8c61e1d3
Updated furnishing texture and colliders on furniture ( #251 )
4 年前
Ciro Continisio
de401a73
Shader tweaks and reorganisation
4 年前
Ciro Continisio
019c7796
Merge branch 'art-assets' into main
4 年前
Ciro Continisio
6a16876d
Relocated stray assets
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
2e18946e
Imported ground textures
4 年前
Smurjo
c6862e6f
palm leaf set and lobster
Prefabs for the cooking festival
4 年前
Ciro Continisio
e7b2e446
New art assets
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 年前
Amel Negra
370a7993
Merge remote-tracking branch 'origin/main' into interaction
4 年前
Ciro Continisio
5f6fe538
Merge branch 'main' of https://github.com/Smurjo/open-project-1 into pr-bash
4 年前
Ciro Continisio
cd138aa3
Imported lobster, palm leaf set, tavern owner's hair
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 年前
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 年前
Smurjo
178053c0
Almonds, artichokes, cucumbers, lemons, onions, oranges, truffles, vanilla
Almonds, artichokes, cucumbers, lemons, onions, oranges, truffles, vanilla
4 年前
Smurjo
50b64a9a
added ginger, applied transform at Blender fbx export for almonds, artichokes, cucumber and lemons
added ginger
applied transform at Blender fbx export for almonds, artichokes, cucumber and lemons
moved prefabs to prefab folder "food"
4 年前
Smurjo
0c706b8e
applied transform at Blender fbx export for oranges, onions, truffles and vanilla
applied transform at Blender fbx export for oranges, onions, truffles and vanilla
moved prefabs to prefab folder
4 年前
Amel Negra
c444c501
Merge remote-tracking branch 'origin/main' into scenes-re-architecture
4 年前
Smurjo
10477f56
Added maize
It's the same texture for all, 1024x1024.
Triangles:
- maize cob 640
- single grain 88
- maize in box 1630
4 年前
HarshNarayanJha
37b819b9
Revisioned The Bench
4 年前
Smurjo
61e85048
Added mangetout
2 slightly different versions plus one with the ends cut off
The texture is 1024x1024.
Triangles:
mangetout pod (2 versions) 380 and 290
mangetout cooked 134
mangetout in box 2885
4 年前
Smurjo
90fe71a7
critter eggs, critter seeds and chicolade
Fantasy food ingredients obtained from critters.
4 年前
Ciro Continisio
b15b206e
Merge branch 'main' of https://github.com/HarshNarayanJha/open-project-1 into pr-bash
4 年前
Ciro Continisio
ef68d3e0
Imported WoodenBench
4 年前
Ciro Continisio
7c088a1f
Merge branch 'pr-bash' into main
4 年前
uChema
c28d9833
Merge branch 'main' into QuestSystem
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
01b4cabf
Food and vegetables
# Conflicts:
# UOP1_Project/Packages/packages-lock.json
# UOP1_Project/ProjectSettings/PackageManagerSettings.asset
# UOP1_Project/ProjectSettings/ProjectVersion.txt
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 年前
Smurjo
456c7bdd
Whiteboxing of general map in medium size divided into 6 scenes
- contains minimalistic scene loading and unloading scripts only for trying this out
- contains small editor tool to create views. Don't delete deactivated objects in spawn scene if you want to update the views. There is the issue that the created views are too dark, I suspect it is a problem between the Texture2D-Format and the RenderTexture-Format - I would appreciate advice which formats to use.
- contains few additional art assets like shiitake mushrooms, big trees, bushes and creepers. The bushes are intended only for the whiteboxing to be replaced with more elaborate art assets later. The creepers and big trees are to be refined somewhat if we decide to use them.
To try out the map open the spawn scene and press play in the editor. Make sure all scenes were added to the build settings.
4 年前
Smurjo
e7c4b415
Added cooking festival to whiteboxing of medium scale map
whiteboxing as shown in https://youtu.be/TnBEHHI2FtA
4 年前
Ciro Continisio
bd33c8df
Merge branch 'main' of https://github.com/Smurjo/open-project-1 into pr-bash
4 年前
Ciro Continisio
477798f0
Relocated temp assets in whiteboxing folder
4 年前
Yohann Puyhaubert
068abd40
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
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 年前
Yohann Puyhaubert
460eb34c
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
4 年前
uChema
7321e9d0
UI Integration (WIP)
4 年前
Ciro Continisio
91a763b7
Updated project to 2020 LTS
4 年前
Carlos Anderson
aadc5919
Add beer keg model, material, and prefab
4 年前
uChema
7abf0997
WIP - UI Integration
4 年前
Carlos Anderson
65674583
Add cutting board model, material, and prefab
4 年前
Ciro Continisio
544c3cc9
Eliminated some outlins
4 年前
GitHub
c0b2931f
Merge pull request #1 from UnityTechnologies/main
Update fork
4 年前
Ciro Continisio
58aa7cff
Material and texture tweaks
4 年前
Ciro Continisio
293f994f
Merge branch 'graphic-rework'
4 年前
Amel
75d340a3
Merge remote-tracking branch 'redcurry/art-assets' into main
4 年前
Amel
79a9f0bb
Updated new models materials to URP Unlit and assigning the base maps
4 年前
Amel
3aab4f7e
Updated materials on new props to use Toon shader
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
5cc9de68
Beach changes, worldbuilding
Light settings, shader changes, prefab tweaks, model tweaks
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
6f206e69
Merge remote-tracking branch 'origin/main' into mainAmel
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
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 年前
uChema
d36df8f3
Adding save to disk on questline update
3 年前
uChema
71dcdcfd
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Ciro Continisio
1b98a3e3
Merge branch 'main' of github.com:UnityTechnologies/open-project-1
3 年前
GitHub
a30ef766
Added Statue(Mesh, Material, and Prefabs) ( #458 )
Statue was a contribution that was discussed in the forums and not based on any codecks card. The name I do have for him is from a Youtube Video, so I don't have any ideas for an original name if needed.
Meshes and Prefabs are in their specific folders.
Please delete the questions below, and type the answers in their place instead
3 年前
uChema
b768a7dc
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 年前
Nathan V
a1b0eb29
Modifying Railed Bridge Meshes
This PR was based on a discussion on the Forums, where I modified the bridges for specific reasons, such as having support beams to reach the ground or no support beams to make the bridge look like it's floating.
Longer Beams: https://forum.unity.com/threads/3d-art-assets.980892/page-7
No Support Beams: https://forum.unity.com/threads/3d-art-assets.980892/page-8
3 年前
Ciro Continisio
509b93fe
Removed ForestEntrance scene
3 年前
Ciro Continisio
472b2651
Merge branch 'main' of https://github.com/MortyJHin/open-project-1 into worldbuilding
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 年前
Ciro Continisio
5ef923fb
Material and model tweaks
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 年前
itsLevi0sa
340dd8dc
Merge branch 'main' into CaveWhiteboxing
3 年前
Ciro Continisio
1aeed5db
Water mill
3 年前
Ciro Continisio
33395788
RockCritter egg and Gold RockCritter egg
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
65a539ba
Art tweaks
3 年前
Ciro Continisio
c0d04e7a
TownMarket
3 年前
Amel Negra
e9f4e34e
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
dc07bb35
Merge remote-tracking branch 'upstream/main' into main
3 年前
GitHub
20443cb5
Added Short Stone Wall(Mesh, Material, and Prefabs) ( #492 )
This includes:
A prefab of a Stone Wall Section
Stone Wall Mesh/Prefab
And a piece that you can attach on the sides of the walls
3 年前