Ciro Continisio
6d1b63ae
Reorganising assets
4 年前
Ciro Continisio
a06f9b30
Sample scene
Prefab creation, fixed rotation issue
4 年前
Ciro Continisio
43ebc212
Art reorganisation and cleanup
4 年前
Ciro Continisio
fb97255e
Moved art assets
4 年前
Ciro Continisio
1e91c076
Added Flower, fixed Signpost, Rubble sizing
4 年前
Ciro Continisio
24cc8443
Added crunch compression to all textures + Preset
4 年前
GitHub
0d06a95f
Added wind sensitiveness (green channel) on vertex color of nature FBX assets ( #156 )
* Palm tree wind vertex color layer
Added vertex color to Palm tree mesh
* Added wind sensivity vertex color on nature assets
* Added wind sensivity vertex color on nature assets
4 年前
Ciro Continisio
2c91dabf
Merge branch 'art-assets' into big-merge
# Conflicts:
# UOP1_Project/Assets/Prefabs/Props/PotOverFire.prefab
4 年前
jamieTSC
549a8569
+ added 4 new wildflowers (meshes, Material, texture and prefabs)
4 年前
jamieTSC
dd7ca1cc
+ added more wildflowers
+ added vertex painting for correction wind
+ added mask map for Andy's shader variants
4 年前
Llaczky
955d7516
Nature Assets Fix V1.2
- Changes in the Textures, Topology and pivots
-Different types of plants and one big house.
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
ab1e315f
Merge branch 'art-assets' of https://github.com/JamieNooten/open-project-1 into art-assets
4 年前
Ciro Continisio
291ae413
New flowers, fixes
Switched many small assets to bake with light probes instead of lightmaps
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
420aec35
Imported new rocks, asset fixes
Tweaked size of some trees
4 年前
Ciro Continisio
ce50c2eb
Merge branch 'art-assets' of github.com:UnityTechnologies/open-project-1 into art-assets
4 年前
Ciro Continisio
1413811f
Material properties
4 年前
Ciro Continisio
bd14256e
Material and prefab tweaks
4 年前
Ciro Continisio
d4366a3d
Rebaked scenes, removed directional lightmaps
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
f588e37a
New tree type
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 年前
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
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 年前
Ciro Continisio
d80af9c6
Imported new art
Fern2, Shell2 and Shell3, new faint animation
4 年前
Ciro Continisio
6294ecab
Merge branch 'art-assets' into pr-bash
4 年前
uChema
79e39b28
Merging Dialogue branching to the Quest System.
4 年前
Ciro Continisio
7e93f4c9
Bush texture update
4 年前
GitHub
d0298f3d
Merge pull request #3 from UnityTechnologies/art-assets
Art assets
4 年前
HarshNarayanJha
06438a1a
Pulled from upstream/main
4 年前
Amel Negra
c444c501
Merge remote-tracking branch 'origin/main' into scenes-re-architecture
4 年前
Ciro Continisio
1f10f375
Merge branch 'art-assets' into pr-bash
4 年前
Ciro Continisio
49f39298
Imported new animations
4 年前
Ciro Continisio
6e1104f0
Merge branch 'pr-bash' into main
4 年前
uChema
c28d9833
Merge branch 'main' into QuestSystem
4 年前
Ciro Continisio
4b89665c
Wind shader improved and painted more meshes
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 年前
Dane Byrd
c6beedc4
Merge branch 'art-assets' into ground_shader
4 年前
uChema
0f397e96
Merge branch 'main' into QuestSystem
4 年前
Smurjo
9b89eaca
Whiteboxing with reduced size
Scene "GeneralMapReduced". Including art asset "BigFallenTreeWithLeaves" which serves to block the path until the player has finished the tutorial quest.
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 年前
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 年前
alex
2f536097
Merge remote-tracking branch 'upstream/main' into main
4 年前
Ciro Continisio
01f30d5a
Imported animations and art
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 年前
uChema
7ece782e
Merge branch 'main' into QuestSystem
4 年前
Chema Damak
e7bcdcfd
Fixing the merge
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
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 年前
uChema
7abf0997
WIP - UI Integration
4 年前
GitHub
c0b2931f
Merge pull request #1 from UnityTechnologies/main
Update fork
4 年前
Ciro Continisio
58aa7cff
Material and texture tweaks
4 年前
Ciro Continisio
847a1352
Rock shader with grass or sand
4 年前
Ciro Continisio
7f0a24a9
Grass and Sand adjustments
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
76adf666
Tweaks to plants
All 3D models of vegetation have been tweaked in size, and have proper green channel for wind. Removed isolated mesh assets.
4 年前
Ciro Continisio
3bd54bf1
New colliders for BigRocks and BigTree
4 年前
Ciro Continisio
6dbe9c46
Trees collider tweaks
4 年前
Ciro Continisio
2d718f1c
Merge branch 'main' into vegetation-tweaks
# Conflicts:
# UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
4 年前
Amel Negra
e0ede3d5
Merge branch 'main' into AmelMain
4 年前
Ciro Continisio
17caa017
Cleanup
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 年前
Amel Negra
c094f333
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
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
3 年前
Ciro Continisio
17ad7091
Random tint shader
Added wind to random position tint shader
3 年前
Ciro Continisio
c22729d3
More worldbuilding
Full bake of all scenes
3 年前
uChema
735363c3
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Amel
6f206e69
Merge remote-tracking branch 'origin/main' into mainAmel
3 年前
Ciro Continisio
71481135
Shader and lighting tweaks
3 年前
Ciro Continisio
53d9fe16
Scene work
3 年前
Ciro Continisio
8167037b
Worldbuilding
3 年前
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 年前
uChema
71dcdcfd
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Ciro Continisio
25505e81
Worldbuilding
3 年前
Ciro Continisio
65a539ba
Art tweaks
3 年前
Ciro Continisio
c0d04e7a
TownMarket
3 年前
Amel Negra
e9f4e34e
Merge remote-tracking branch 'origin/main' into main
3 年前
Ciro Continisio
b8f152c8
Beach light fixes and rebaked lightmaps
3 年前
uChema
dc07bb35
Merge remote-tracking branch 'upstream/main' into main
3 年前