Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feat: Client Driven Art Pass #68

Merged
merged 25 commits into from
Dec 1, 2022
Merged

Feat: Client Driven Art Pass #68

merged 25 commits into from
Dec 1, 2022

Commits on Nov 2, 2022

  1. update clientdriven sample to 2021.3.12f1

    @fernando-cortez
    fernando-cortez committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    af30a9e View commit details
    Browse the repository at this point in the history

  2. third person controller assets added

    @fernando-cortez
    fernando-cortez committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    68d3842 View commit details
    Browse the repository at this point in the history

  3. dependencies updated

    @fernando-cortez
    fernando-cortez committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    030f1e1 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2022

  1. First pass of art level art updates and URP port

    @jilfranco-unity
    jilfranco--unity authored and jilfranco-unity committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    7d79fd7 View commit details
    Browse the repository at this point in the history

  2. Added carrying animation to project

    @jilfranco-unity
    jilfranco--unity authored and jilfranco-unity committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    c27e9a3 View commit details
    Browse the repository at this point in the history

  3. Environment Art Pass

    @jilfranco-unity
    jilfranco--unity authored and jilfranco-unity committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    defabff View commit details
    Browse the repository at this point in the history

  4. Animation import setting edits

    @jilfranco-unity
    jilfranco--unity authored and jilfranco-unity committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    3052908 View commit details
    Browse the repository at this point in the history

  5. More environment art pass, specifically on drop zones and stoves

    @jilfranco-unity
    jilfranco--unity authored and jilfranco-unity committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    ad6c71b View commit details
    Browse the repository at this point in the history

  6. Dropzone ingredient animation

    @jilfranco-unity
    jilfranco--unity authored and jilfranco-unity committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    b41fa9c View commit details
    Browse the repository at this point in the history

  7. Animated ingredient materials

    @jilfranco-unity
    jilfranco--unity authored and jilfranco-unity committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    c249979 View commit details
    Browse the repository at this point in the history

  8. More overall theme changes, as well as some small bug fixes

    @jilfranco-unity
    jilfranco-unity committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    d99612f View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' into feat/client-driven-art-pass (Merged 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 committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    9f829ef View commit details
    Browse the repository at this point in the history

  10. Updated shadow biases to remove banding

    @jilfranco-unity
    jilfranco-unity committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    30f66b8 View commit details
    Browse the repository at this point in the history

  11. New GUIDs for these assets

    @jilfranco-unity
    jilfranco-unity committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    bbe8706 View commit details
    Browse the repository at this point in the history

  12. Turned off cast shadows on some object

    @jilfranco-unity
    jilfranco-unity committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    774b320 View commit details
    Browse the repository at this point in the history

  13. Updated shadow bias again to fix cracks in shadows

    @jilfranco-unity
    jilfranco-unity committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    5b945f6 View commit details
    Browse the repository at this point in the history

  14. deleted unused animations from this branch, will be restored in anoth… 

    …er branch
    @jilfranco-unity
    jilfranco-unity committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    a4132de View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2022

  1. Fixed NGO version to be 1.1.0

    @jilfranco-unity
    jilfranco-unity committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    fa278b5 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2022

  1. Merge branch 'develop' into feat/client-driven-art-pass

    @jilfranco-unity
    jilfranco-unity committed Nov 21, 2022
    Configuration menu
    Copy the full SHA
    193422c View commit details
    Browse the repository at this point in the history

  2. Updated ingredient materials 

    (most notably making the purple material a lot more white to increase contrast from the purple background)
    @jilfranco-unity
    jilfranco-unity committed Nov 21, 2022
    Configuration menu
    Copy the full SHA
    b90e00c View commit details
    Browse the repository at this point in the history

  3. Color adjustments

    @jilfranco-unity
    jilfranco-unity committed Nov 21, 2022
    Configuration menu
    Copy the full SHA
    906bd4c View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2022

  1. Updated 3rd person model materials to URP ones

    @jilfranco-unity
    jilfranco-unity committed Nov 23, 2022
    Configuration menu
    Copy the full SHA
    c64e9cd View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2022

  1. Removed this unused directive

    @jilfranco-unity
    jilfranco-unity committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    7d2611b View commit details
    Browse the repository at this point in the history

  2. Added these split nodes to remove errors about implicit truncation of… 

    … vectors
    @jilfranco-unity
    jilfranco-unity committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    41f5300 View commit details
    Browse the repository at this point in the history

  3. Updated these materials to URP shaders

    @jilfranco-unity
    jilfranco-unity committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    9c1bcbc View commit details
    Browse the repository at this point in the history