Skip to content

Conversation

@jilfranco-unity
Copy link
Contributor

Description

A PR for the first art pass on the client driven sample! I've used the starter assets as well as some custom assets & shaders to dress up our level. Final animation setup will come in a PR after the third person controller PR is merged into develop.

Overall level:
image
image
image

Stoves:
image
image

Ingredients:
image
image
image

Drop Zones:
image
image

@jilfranco-unity jilfranco-unity added the enhancement New feature or request label Nov 14, 2022
@unity-cla-assistant
Copy link

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.


jilfranco--unity seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
You have signed the CLA already but the status is still pending? Let us recheck it.

…s (Conflicts resolved mostly using mine)

# Conflicts:
#	Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GreyBlue_Mat.mat
#	Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GridBlue_01_Mat.mat
#	Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GridOrange_01_Mat.mat
#	Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/URP_HDRP_ShaderGraph/ShaderGraphGrid_01_Mat.mat
#	Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Models/Box_350x250x200_Mesh.fbx.meta
#	Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Models/Box_350x250x300_Mesh.fbx.meta
#	Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Models/Ground_Mesh.fbx.meta
#	Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Models/Ramp_100x100x200_Mesh.fbx.meta
#	Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Models/Ramp_Mesh.fbx.meta
#	Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Models/Stairs_200x100x200_Mesh.fbx.meta
#	Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Models/Stairs_650_400_300_Mesh.fbx.meta
#	Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Models/Structure_Mesh.fbx.meta
#	Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Models/Tunnel_Mesh.fbx.meta
#	Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Models/Wall_Mesh.fbx.meta
#	Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Skybox/SkyboxLite.mat
#	Basic/ClientDriven/Assets/StarterAssets/Environment/Prefabs/Environment_Prefab.prefab
#	Basic/ClientDriven/Assets/StarterAssets/Environment/Shaders/URP_HDRP_ShaderGraph/UrpTriplanar.shadergraph
#	Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Animations/Jump--InAir.anim.fbx.meta
#	Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Animations/Jump--Jump.anim.fbx.meta
#	Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Animations/Locomotion--Run_N.anim.fbx.meta
#	Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Animations/Locomotion--Run_N_Land.anim.fbx.meta
#	Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Animations/Locomotion--Run_S.anim.fbx.meta
#	Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Animations/Locomotion--Walk_N.anim.fbx.meta
#	Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Animations/Locomotion--Walk_N_Land.anim.fbx.meta
#	Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Animations/Stand--Idle.anim.fbx.meta
#	Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Models/Armature.fbx.meta
#	Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Prefabs/MainCamera.prefab
#	Basic/ClientDriven/Packages/manifest.json
#	Basic/ClientDriven/Packages/packages-lock.json
@jilfranco-unity jilfranco-unity deleted the feat/client-driven-starter-assets-art-pass branch November 14, 2022 21:40
@jilfranco-unity jilfranco-unity restored the feat/client-driven-starter-assets-art-pass branch November 14, 2022 21:40
@fernando-cortez fernando-cortez deleted the feat/client-driven-starter-assets-art-pass branch December 13, 2022 20:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants