6d1b63ae
Reorganising assets
4 年前
a06f9b30
Sample scene
Prefab creation, fixed rotation issue
4 年前
43ebc212
Art reorganisation and cleanup
4 年前
fb97255e
Moved art assets
4 年前
1e91c076
Added Flower, fixed Signpost, Rubble sizing
4 年前
03ff96ac
New test scenes
Big testing scene with Polybrush terrain, small test scene with just primitives
4 年前
2c91dabf
Merge branch 'art-assets' into big-merge
# Conflicts:
# UOP1_Project/Assets/Prefabs/Props/PotOverFire.prefab
4 年前
549a8569
+ added 4 new wildflowers (meshes, Material, texture and prefabs)
4 年前
dd7ca1cc
+ added more wildflowers
+ added vertex painting for correction wind
+ added mask map for Andy's shader variants
4 年前
955d7516
Nature Assets Fix V1.2
- Changes in the Textures, Topology and pivots
-Different types of plants and one big house.
4 年前
71b3bcca
Merge branch 'art-assets' of https://github.com/Llaczky/open-project-1 into art-assets
4 年前
a0ac9ece
Imported and tweaked extra vegetation
4 年前
b414fbe0
Merge branch 'art-assets' into main
4 年前
ab1e315f
Merge branch 'art-assets' of https://github.com/JamieNooten/open-project-1 into art-assets
4 年前
291ae413
New flowers, fixes
Switched many small assets to bake with light probes instead of lightmaps
4 年前
1d26bec4
Merge branch 'main' into state-machine-improvements
4 年前
df2ab2a2
Merge branch 'art-assets' into feature/art/slime_critter
4 年前
8845aa98
Merge branch 'main' into HollowBoatEffect
# Conflicts:
# UOP1_Project/Assets/Settings/Graphics/ToonRendererData.asset
# UOP1_Project/ProjectSettings/TagManager.asset
4 年前
420aec35
Imported new rocks, asset fixes
Tweaked size of some trees
4 年前
d9dd5e5e
Tweaked RenderFeatures
4 年前
ce50c2eb
Merge branch 'art-assets' of github.com:UnityTechnologies/open-project-1 into art-assets
4 年前
87226439
Put the big rocks on the OccludingObjects layer
4 年前
bd14256e
Material and prefab tweaks
4 年前
101906b4
Townsfolk_M animations, Palm2
4 年前
bd72e4e6
Merge remote-tracking branch 'UnityTechnologies/art-assets' into art-assets
4 年前
f588e37a
New tree type
4 年前
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 年前
e7b2e446
New art assets
4 年前
268ab82e
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
2c9810c9
Merge branch 'main' into interaction
4 年前
8a166bf0
Merge branch 'interaction' of https://github.com/UnityTechnologies/open-project-1 into interaction
4 年前
370a7993
Merge remote-tracking branch 'origin/main' into interaction
4 年前
716120b4
Bushes, new Fern plant
4 年前
7ce66d74
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
a3fdb227
Merge branch 'main' into whiteboxing
4 年前
786fb321
Fixed colliders on the trees
Added child GO to the trees named "leaves", added colliders to the leaves and set layer of leaves to "TreeLeaves" (So, also added this new layer. Set in physics properties to not collide with anything). In CameraSystem/FreeLook_VCam in "Cinemachine collider" added "TreeLeaves" layer in the field "Collide Against".
4 年前
d80af9c6
Imported new art
Fern2, Shell2 and Shell3, new faint animation
4 年前
6294ecab
Merge branch 'art-assets' into pr-bash
4 年前
d0298f3d
Merge pull request #3 from UnityTechnologies/art-assets
Art assets
4 年前
06438a1a
Pulled from upstream/main
4 年前
c444c501
Merge remote-tracking branch 'origin/main' into scenes-re-architecture
4 年前
9d05162d
Merge branch 'main' of https://github.com/Hey-Mikelangelo/open-project-1 into pr-bash
4 年前
c28d9833
Merge branch 'main' into QuestSystem
4 年前
4b89665c
Wind shader improved and painted more meshes
3 年前
eb670224
Merge remote-tracking branch 'upstream/art-assets' into art-assets
3 年前
c691552b
Merge branch 'pr-bash' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Samples.meta
3 年前
2f001d27
Prefab tweaks
3 年前
c6beedc4
Merge branch 'art-assets' into ground_shader
3 年前
0f397e96
Merge branch 'main' into QuestSystem
3 年前
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.
3 年前
bd2b6359
Midboxing again
3 年前
b60fe6c7
Tweaks and bamboos
3 年前
81481d8b
Merge pull request #4 from UnityTechnologies/main
update my local branch
3 年前
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.
3 年前
2f536097
Merge remote-tracking branch 'upstream/main' into main
3 年前
01f30d5a
Imported animations and art
3 年前
762d050f
Merge pull request #6 from UnityTechnologies/main
Updating my branch
3 年前
df03afb9
Merge branch 'main' of https://github.com/Smurjo/open-project-1 into main
3 年前
7ece782e
Merge branch 'main' into QuestSystem
3 年前
bd33c8df
Merge branch 'main' of https://github.com/Smurjo/open-project-1 into pr-bash
3 年前
477798f0
Relocated temp assets in whiteboxing folder
3 年前
068abd40
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
3 年前
1bec3630
Updated water shader added.
Stored with a new plane, material and timeline asset.
3 年前
09ce5d71
Tweaks
3 年前
c0b2931f
Merge pull request #1 from UnityTechnologies/main
Update fork
3 年前
7b1ed2b2
Merge branch 'main' into UI
3 年前
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.
3 年前
3bd54bf1
New colliders for BigRocks and BigTree
3 年前
6dbe9c46
Trees collider tweaks
3 年前
6620446f
Navigation-related prefab tweaks
3 年前
e0ede3d5
Merge branch 'main' into AmelMain
3 年前
3ce06cf5
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
bc17972b
Merge branch 'main' into iet
# Conflicts:
# UOP1_Project/Packages/manifest.json
3 年前
a2299fee
Water shaders, landmasses
3 年前
5cc9de68
Beach changes, worldbuilding
Light settings, shader changes, prefab tweaks, model tweaks
3 年前
c22729d3
More worldbuilding
Full bake of all scenes
3 年前
735363c3
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
6f206e69
Merge remote-tracking branch 'origin/main' into mainAmel
3 年前
59efe5a3
Rock prefabs
3 年前
53d9fe16
Scene work
3 年前
8167037b
Worldbuilding
3 年前
eab4c107
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
2e9fcf21
BigTree shadow caster tweaks
Created custom shadow casting geometry for BigTrees, to get more light in the forest
3 年前
dc51f9ac
More scenery work
3 年前
587a2230
Worldbuilding
Scenes, rocks, waterfalls, foam, ...
Added fog
Rebaked all lighting
3 年前
71dcdcfd
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
8e61f477
Added light probes to prefabs
3 年前
e9f4e34e
Merge remote-tracking branch 'origin/main' into main
3 年前
b8f152c8
Beach light fixes and rebaked lightmaps
3 年前
dc07bb35
Merge remote-tracking branch 'upstream/main' into main
3 年前
Ciro Continisio
jamieTSC
Llaczky
treivize
Eduardo de Albuquerque
Dane Byrd
Dan Young
Amel
Chema Damak
Amel Negra
Hey-Mikelangelo
GitHub
HarshNarayanJha
uChema
Smurjo
alex
Yohann Puyhaubert
Kyle Minors