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
8bcb0d29
Imported directions sign, removed no_eyes tests
4 年前
Ciro Continisio
24cc8443
Added crunch compression to all textures + Preset
4 年前
Ciro Continisio
e1f2b62c
Imported rigged RockCritter, renaming
4 年前
Ciro Continisio
03ff96ac
New test scenes
Big testing scene with Polybrush terrain, small test scene with just primitives
4 年前
Ciro Continisio
c28c6bc6
New Pig and RockCritter animations
4 年前
Ciro Continisio
38b89476
Added PostProcessing support
4 年前
Ciro Continisio
b5de134f
New art demo scene
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 年前
treivize
df2ab2a2
Merge branch 'art-assets' into feature/art/slime_critter
4 年前
Ciro Continisio
bd14256e
Material and prefab tweaks
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 年前
Ciro Continisio
e7641175
Merge branch 'art-assets' of https://github.com/daneobyrd/open-project-1 into daneobyrd-art-assets
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 年前
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 年前
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 年前
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
6acf65d7
Tweaked emission graph, added textures
4 年前
Yohann Puyhaubert
0b3da4fa
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
4 年前
Ciro Continisio
09ce5d71
Tweaks
4 年前
Ciro Continisio
2eabe55e
Outlines removed
4 年前
GitHub
c0b2931f
Merge pull request #1 from UnityTechnologies/main
Update fork
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 年前
Amel Negra
203ad8de
Renamed ''idle 2'' RockCritter animation to ''Alert ''
4 年前
uChema
167ca847
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
4 年前
Amel Negra
ddcc378c
Merge branch 'main' into AmelMain
4 年前
Amel Negra
abfb3081
Rock Critter Animator Override Controller
3 年前
Amel Negra
db4289a0
removing old rock critter controller
3 年前
Amel Negra
5552969c
adding attack in place anim to test for rock critter
3 年前
Amel Negra
a1965f75
added events to attack anim
3 年前
Amel Negra
4d800711
replace with new attack anim on rock critter override controller
3 年前
Amel Negra
99871ed8
temporarily using the idle animation for the rock critter faint
3 年前
Amel Negra
0f2334d3
removing broken attack in place anim
3 年前
Amel Negra
6bb088d5
Attack animation works
3 年前
Amel Negra
348c8c14
Merge branch 'AmelMain' into main
3 年前
uChema
c24dd21f
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Amel Negra
c0a90df6
Rock critter keeps walk animation on alert
3 年前
uChema
52a617fe
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Amel
90c6c12d
Adding attack event for rock critter on animation (not fbx) since it's made in Unity
3 年前
Amel
681e36ce
Adding audio events to fbxs on rock critter
3 年前
Amel Negra
7654f9e8
Merge remote-tracking branch 'amel-unity/main' into main
3 年前
uChema
d0523373
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
3 年前
Ciro Continisio
85c5bf58
Merge branch 'main' into worldbuilding
# Conflicts:
# UOP1_Project/Assets/Prefabs/Gameplay/CameraSystem.prefab
# UOP1_Project/Assets/Scenes/Locations/Beach.unity
3 年前
Amel Negra
e611f40c
Adding rock critter snooze animation
3 年前
Amel Negra
f6c9e887
Rock critter snooze state tweaking after animation integration
3 年前
GitHub
c0237ad9
Merge branch 'UnityTechnologies:main' into main
3 年前
uChema
378fc807
Merge branch 'main' of https://github.com/uChema/open-project-1 into main
3 年前