Ciro Continisio
a9617e2b
Toon shading v1
4 年前
Ciro Continisio
74d5128e
Toon shader improvments
- Updated URP from 7.3.0 to 7.5.1
- Moved to most recent 19.4
- New custom lighting shader (Toon 2), not yet toonified
4 年前
Ciro Continisio
0788d614
Custom lighting shader tests
4 年前
Ciro Continisio
5e4de146
Isolated outline test
Created its own scene and shader for testing purposes
4 年前
Ciro Continisio
369c0864
Toon Shader v2 in progress
4 年前
Ciro Continisio
b0af5562
Toon shader done
Needs to be broken down into pieces for modularity
4 年前
Ciro Continisio
4e9d1665
More art imported
4 年前
Ciro Continisio
3fb9738d
Knife, walking cane, lantern, pouch, Rockcritter
4 年前
Ciro Continisio
43ebc212
Art reorganisation and cleanup
4 年前
GitHub
999566a9
OP Devlog #1 : Toon shading ( #173 )
* upgrade to 2020.2
* add else condition in CustomLighting
* fix missing material in ToonShading scene
Co-authored-by: doJester13 <minarini.work@gmail.com>
Co-authored-by: doJester13 <minairni.work@gmail.com>
4 年前
GitHub
1945e33b
fix(hlsl): Add else condition ( #129 )
4 年前
Ciro Continisio
c1fab67c
Merge branch 'art-assets' of github.com:UnityTechnologies/open-project-1 into art-assets
4 年前
Dickmendra
647b64bd
Added a cartoon water shader and material
4 年前
GitHub
76c293b0
Added a cartoon water shader and material ( #137 )
4 年前
Ciro Continisio
68bbd76f
Tweaks to water shader and folders
4 年前
Ciro Continisio
5d15549e
Merge branch 'art-assets' of github.com:UnityTechnologies/open-project-1 into art-assets
# Conflicts:
# UOP1_Project/Assets/Materials/Water.mat.meta
# UOP1_Project/Assets/Scenes/ArtShowcase.meta
# UOP1_Project/Assets/Scenes/ArtShowcase.unity
# UOP1_Project/Assets/Shaders/ToonWater.meta
4 年前
GitHub
b00809ef
Toon Shader Wind effect addon ( #150 )
* Toon Shader Wind effect addon
New Sub Graph added to simulate wind based on gradient noise (over world coordinates) and applied on Object coordinates depending of the mesh vertex color (Green channel) only.
- Properties: Wind speed, Wind density, Wind strength, Wind direction (around Y axis)
Note: No update on FBX files in this PR to introduce vertex color on the existing assets. It will be done through one/multiple other PRs.
* Toon refactor
Reading back the requirement from Toon Shader add-on, it is preferred (for perf reason) to have a separated unlit shader for Toon shading with wind impact, instead of having wind graph applied to all object even if they are not sensitve to the wind.
Toon shader refactor:
- Extract each part into a separated Sub Shader
-- Shadow part: ToonShadow
-- Specular part: ToonSpecular
- Move current Toon implementation into Sub Graph: ToonColor
- Use ToonColor into Unlit shader Toon...
4 年前
GitHub
a5b61b2f
Added foam + refraction + depth fare to water shader ( #139 )
* Alternative water shader proposition
* Unlit water shader and add shadow
- Unlit water shader
- Add shadow as done in Toon shader
- Add vertex displacement like done in dickmendra shader
- Change the showcase water plane to intersect with the rock close to it to see foam
* Shader clean up
* Water shader improvements
- Water effect distance cut off
- Expose light probe contribution
- Control surface shadow intensity
* Small tweaks to showcase scene
* Water shader fixes
* Showcase water
* Small tweaks
Co-authored-by: Ciro Continisio <ciro@unity3d.com>
4 年前
Ciro Continisio
ba83a73b
Shadow fix
4 年前
GitHub
e92791cc
Fix Water Shader: shallow water is now refrated ( #174 )
4 年前
GitHub
32d860af
Added fire shader and campfire ( #172 )
* Added fire shader and campfire
* Tweaked campfire light position
Co-authored-by: Ciro Continisio <ciro@unity3d.com>
4 年前
GitHub
49995b3a
Fix refraction for object above sea level ( #177 )
4 年前
Ciro Continisio
2c91dabf
Merge branch 'art-assets' into big-merge
# Conflicts:
# UOP1_Project/Assets/Prefabs/Props/PotOverFire.prefab
4 年前
Ciro Continisio
10258092
Merge remote-tracking branch 'tech-mkt/art-assets' into big-merge
4 年前
treivize
572e0cdd
Added Transparent support on ToonShading and Glass Shader for the lantern
4 年前
Ciro Continisio
e694237c
Added grouping in Toon
4 年前
Ciro Continisio
26747ac5
Merge branch 'treivize/feature/art/transparent_support' into art-assets
4 年前
Ciro Continisio
e5e7acc6
Merge branch 'art-assets' into main
4 年前
treivize
bb0dafff
Added Slime Critter and new Toon shader to add Fresnel effect on it
4 年前
treivize
245438bb
Fixed Fresnel effect done before outline and add water like movement
4 年前
treivize
612432c6
Added Slime Critters variants and final Toon_Fresnel Shader
4 年前
treivize
b5415b10
Fixed Main Light direction custom method
4 年前
treivize
f1cf3605
Simplify Toon_Fresnel shader - move Direct Specular to Lightning Model
4 年前
kgc00
253b73a3
Merge remote-tracking branch 'upstream/main' into main
4 年前
andytouch
a397d578
Art: Added Detail Masks for Main Characters. Added DetailMaskTint Shader Graph.
4 年前
treivize
ec0e4787
Fixed Slime inner movement to be Object UV based and clamp direct specular
4 年前
kgc00
7b04a609
Merge branch 'main' into simple-menu-controls
4 年前
andytouch
6da421fe
Art: Added RandomPositionTint Shader Graph.
4 年前
Ciro Continisio
6804ad52
Boat, Fry king, Lantern fixes
4 年前
Ciro Continisio
05095f49
Merge remote-tracking branch 'tech-mkt/art-assets' into pr-bashing
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 年前
shuttle127
47c639cb
Create silhouette pass
Added some URP render features to silhouette characters when they're behind static scenery
4 年前
Ciro Continisio
09419cf4
Tweaks, dither shader
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 年前
treivize
c0ba79ab
Updated direct specular contribution
4 年前
Ciro Continisio
163fb9ae
Merge branch 'feature/art/slime_critter' of https://github.com/treivize/open-project-1 into pr-bash
4 年前
Ciro Continisio
b197acbf
Shaders simplification
4 年前
Ciro Continisio
0a93b3d8
Shadergraph adjustments
4 年前
Ciro Continisio
29fb04b5
Removed LightProbe contribution parameter from all shaders
4 年前
GitHub
19a7c4c5
Upgrade to 2020.2.13b ( #247 )
4 年前
Dane Byrd
e3d74a91
Remove Fresnel properties from ToonShading subgraph
I moved Albedo out from ToonShading and into the main shadergraph. I then created the new subgraph Albedo_Fresnel which contains the lerp operation needed for the slimes. The Albedo subgraph has been added to all toon shadergraph variants.
4 年前
Dane Byrd
8ae0f49f
Remove Albedo Influence on Specular Light Brightness
Swapping the order of the multiply and add nodes in the ToonShading subgraph to multiply albedo by diffuse light alone, then add specular highlights.
Along with this is the need ability to control specular light transparency, which can now be done using the Specular Color property's alpha channel.
4 年前
GitHub
6bf8be1d
Added back recklol Dissolve effect ( #217 )
* Added recklol dissolve effect with some tweaks
* Added names to dissolve outputs
* Added a dissolve effect option in contextual menu and add alpha cutoff in Toon_Disolve
4 年前
Ciro Continisio
11189097
Merge remote-tracking branch '_tech-mkt/art-assets' into art-assets
4 年前
Jan Urbanec
6b5816a6
Rebase + updated previous changes to update light if there is no baked GI.
4 年前
Jan Urbanec
9d0b1667
Changed shader node flow using branchless nodes.
4 年前
Ciro Continisio
e7641175
Merge branch 'art-assets' of https://github.com/daneobyrd/open-project-1 into daneobyrd-art-assets
4 年前
Ciro Continisio
de401a73
Shader tweaks and reorganisation
4 年前
Ciro Continisio
019c7796
Merge branch 'art-assets' into main
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 年前
Dan Young
268ab82e
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
Ciro Continisio
6c55468b
Skybox experiments
4 年前
Ciro Continisio
2b770690
ClearSky skybox
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 年前
Dan Young
7ce66d74
Merge remote-tracking branch 'upstream/art-assets' into art-assets
4 年前
Amel Negra
a3fdb227
Merge branch 'main' into whiteboxing
4 年前
GitHub
d0298f3d
Merge pull request #3 from UnityTechnologies/art-assets
Art assets
4 年前
Amel Negra
c444c501
Merge remote-tracking branch 'origin/main' into scenes-re-architecture
4 年前
GitHub
54240307
Devlog 3: Handling complex input ( #307 )
Project upgrade to 2021.1
4 年前
Dane Byrd
004c7bd1
Ground Shader WIP
Includes ground shader prototype with vertex color debug. Moves outline subgraph out of the main ToonShading subgraph. I have not included Noise Textures as I need to verify that the noise textures I used for testing are under an open-source license.
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 年前
treivize
68000753
Fixed for issue #206
4 年前
treivize
395ad4f1
Added Shader Graph solution to Outline for AA, Distance Fading and Screen Resolution independency
4 年前
Ciro Continisio
c691552b
Merge branch 'pr-bash' into whiteboxing
# Conflicts:
# UOP1_Project/Assets/Samples.meta
4 年前
Ciro Continisio
a87f0330
Merge branch 'feature/art/outline_aa_fading_screen' of https://github.com/treivize/open-project-1 into pr-bash
4 年前
treivize
cdc1c41c
Issue #321 - Fixed water height not working as expected
4 年前
Ciro Continisio
9c8a0189
Merge branch 'bugfix/water/water-height-not-working' of https://github.com/treivize/open-project-1 into pr-bash
4 年前
treivize
9fbdf5c8
Extend refraction scale to be lower than 5 ( from 0 to 10)
4 年前
Ciro Continisio
33bbc827
Merge remote-tracking branch 'treivize/bugfix/water/water-height-not-working' into pr-bash
4 年前
Ciro Continisio
d62c17bb
Merge branch 'bugfix/art/shader_gi_backup' of https://github.com/treivize/open-project-1 into pr-bash
4 年前
Dane Byrd
c6beedc4
Merge branch 'art-assets' into ground_shader
4 年前
uChema
0f397e96
Merge branch 'main' into QuestSystem
4 年前
Dane Byrd
9bcf2bfc
PR Ground Shader
Several updates to address odd visual artifacts on texture edges.
Use maximum instead of add, only one noise channel, multiply and clamp vertex color.
4 年前
Dane Byrd
aee72350
Property Name consistency
small change, added (B) to the fourth texture property's name
4 年前
Ciro Continisio
4220f2f7
Relocated assets
4 年前
Yohann Puyhaubert
acb20c67
Fixed white crispy outline in Play mode around object over water
4 年前
GitHub
81481d8b
Merge pull request #4 from UnityTechnologies/main
update my local branch
4 年前
Ciro Continisio
4557ca49
Merge branch 'bugfix/water-crispy-white-outline' of https://github.com/treivize/open-project-1 into main
4 年前
uChema
7ece782e
Merge branch 'main' into QuestSystem
4 年前
vanoverc
4816946d
Created a Shader Subgraph that applies Emission to a material using CustomEmission.hlsl, and added Emission to the Toon Shadergraph
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
9f80c6a1
Merge pull request #2 from Donkeylipsh/em1
Shading Model - Emission Support
4 年前
GitHub
b5417125
Merge pull request #7 from UnityTechnologies/main
Updating my local repository
4 年前
vanoverc
e5c6e42f
Emission Support - Converted custom HLSL into Shadergraph Subgraph, and added that to the Toon Shadergraph
4 年前
Ciro Continisio
363ab4fa
Merge branch 'main' of https://github.com/Donkeylipsh/open-project-1 into main
4 年前
Ciro Continisio
6acf65d7
Tweaked emission graph, added textures
4 年前
Yohann Puyhaubert
0b3da4fa
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
4 年前
GitHub
c20ffd23
Added slash effect when player is triggering an attack ( #356 )
* Added slash effect when player is triggering an attack
* Corrected after merge from main
* renamed script to correct typing mistake
Co-authored-by: Amel Negra <amel.negra@unity3d.com>
4 年前
Bronson Zgeb
a19b2328
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Ciro Continisio
2f0661e3
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Yohann Puyhaubert
460eb34c
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
4 年前
Ciro Continisio
bfe7e497
New fire effect
4 年前
Ciro Continisio
cb823c2b
Light tweaks and bugfix on shader
4 年前
Ciro Continisio
6eaf1632
Changed gradients on toon shader
4 年前
GitHub
c0b2931f
Merge pull request #1 from UnityTechnologies/main
Update fork
3 年前
Ciro Continisio
4e0a85c8
Removed outline completely
3 年前
Ciro Continisio
6683b1e2
Torches, shader changes
3 年前
Ciro Continisio
eaff6ea8
Fire, embers, smoke
3 年前
Ciro Continisio
753835bc
Night sky, sunset
3 年前
Ciro Continisio
847a1352
Rock shader with grass or sand
3 年前
Ciro Continisio
f72c56c2
Rock shader
3 年前
Ciro Continisio
293f994f
Merge branch 'graphic-rework'
3 年前
uChema
997b50ae
Merge branch 'main' into pr/393
3 年前
Amel
7b1ed2b2
Merge branch 'main' into UI
3 年前
Ciro Continisio
ee8e2b89
Wind shader tweaks
3 年前
Ciro Continisio
f40bd45e
Phoenix Chick 2.0
3 年前
Amel Negra
e0ede3d5
Merge branch 'main' into AmelMain
3 年前
Ciro Continisio
381edcb3
Double-sided toon shader
3 年前
uChema
3ce06cf5
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Ciro Continisio
bc17972b
Merge branch 'main' into iet
# Conflicts:
# UOP1_Project/Packages/manifest.json
3 年前
Amel Negra
c094f333
Merge branch 'main' into AmelMain
3 年前
Felix Herbst
cdd82f3d
Add multi_compile keywords to CustomLighting.hlsl, remove ShaderGraph keywords that did the same
list comes from Lit.shader, "Universal Pipeline keywords" section
3 年前
Ciro Continisio
5636f0a4
Improvements to vertex ground shader
Now world-space coordinates
3 年前
Ciro Continisio
ebe81a73
Worldbuilding in progress
Landmasses vertex paint, water plane tweaks
3 年前
Ciro Continisio
a2299fee
Water shaders, landmasses
3 年前
Ciro Continisio
5cc9de68
Beach changes, worldbuilding
Light settings, shader changes, prefab tweaks, model tweaks
3 年前
Ciro Continisio
0cf6d134
Merge branch 'move-multi-compile-to-hlsl' of https://github.com/needle-tools/open-project-1 into needle-tools-move-multi-compile-to-hlsl
# Conflicts:
# UOP1_Project/Assets/Shaders/Toon_Ground_VertexColour.shadergraph
3 年前
Ciro Continisio
e84872d3
Merge branch 'needle-tools-move-multi-compile-to-hlsl' into worldbuilding
3 年前
Ciro Continisio
b50f7789
Shaders upgraded
3 年前
Ciro Continisio
17ad7091
Random tint shader
Added wind to random position tint shader
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
1c06f55d
Added fog to shaders
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
e7a11cf3
Interactables for Beach, Hill and Farms
3 年前
Ciro Continisio
56d5c554
Tweaks to glow shader
Fresnel influence is now controllable
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 年前
Ciro Continisio
33395788
RockCritter egg and Gold RockCritter egg
3 年前
Amel Negra
a676cd5d
Merge remote-tracking branch 'origin/main' into main
3 年前
Ciro Continisio
81c9fb97
Graphic work (mostly Cave)
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 年前
uChema
f29c7129
Add Icons placeholders - Set Game Scene UI - Add Aggro System
3 年前
Ciro Continisio
53bc6c38
Refactored code to remove some warnings
3 年前