treivize
|
e2449c18
|
[WIP] Plant Critter - Model UV Color Rig Animations
|
4 年前 |
treivize
|
4b202e5f
|
[WIP] Better UV, Rig and Texture
|
4 年前 |
treivize
|
884f78d8
|
[WIP] Update animations Idle, Warn, Alert and Attack
|
4 年前 |
treivize
|
449795a4
|
Add latest texture
|
4 年前 |
treivize
|
b5ba51b4
|
Added meshed eyes with animation for them
|
4 年前 |
treivize
|
93d46d23
|
Added spawning, injured and faint animations to plant critter
|
4 年前 |
treivize
|
896fc63a
|
Removed eyes from Plant Critter and set up a proper animator
|
4 年前 |
treivize
|
e9e05bd8
|
Updated Alert animation and clean up branch
|
4 年前 |
Ciro Continisio
|
5dd0e2e5
|
Small tweaks to the material and animator
|
4 年前 |
Ciro Continisio
|
bd14256e
|
Material and prefab tweaks
|
4 年前 |
GitHub
|
5a9a452f
|
Fix Plant Critter mesh scaling and name (#239)
|
4 年前 |
Dane Byrd
|
bd72e4e6
|
Merge remote-tracking branch 'UnityTechnologies/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 年前 |
treivize
|
a4dc96e7
|
Initial Plant Critter combat system - Get Hit - Killed
|
4 年前 |
Ciro Continisio
|
e6e1f38f
|
Merge branch 'feature/sub/plant_critter_combat_system' of https://github.com/treivize/open-project-1 into pr-bash
|
4 年前 |
Ciro Continisio
|
162a06e3
|
Refactoring, renaming, comments
|
4 年前 |
Ciro Continisio
|
7c088a1f
|
Merge branch 'pr-bash' into main
|
4 年前 |
uChema
|
c28d9833
|
Merge branch 'main' into QuestSystem
|
4 年前 |
GitHub
|
54f79bad
|
Added slime critter behavior (#312)
* Slime Critter initial behavior
* Added slime critter behavior
|
4 年前 |
Ciro Continisio
|
183fdac0
|
Merge remote-tracking branch 'tech-mkt/main' into main
|
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 年前 |
Dane Byrd
|
c6beedc4
|
Merge branch 'art-assets' into ground_shader
|
4 年前 |
uChema
|
0f397e96
|
Merge branch 'main' into QuestSystem
|
4 年前 |
Yohann Puyhaubert
|
ed7d963f
|
Added Player Cane Hit variant and enabling attack based on animation events
|
4 年前 |
Ciro Continisio
|
7ea6bfdf
|
Merge branch 'feature/player-cane-hit-anim-variant' of https://github.com/treivize/open-project-1 into pr-bash
# Conflicts:
# UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger.asset
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger.asset.meta
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger_OnEnter.asset
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/AttackTrigger_OnEnter.asset.meta
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsAttacking_False_OnEnter.asset
# UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/IsAttacking_True_OnEnter.asset.meta
|
4 年前 |
uChema
|
7ece782e
|
Merge branch 'main' into QuestSystem
|
4 年前 |
GitHub
|
b5417125
|
Merge pull request #7 from UnityTechnologies/main
Updating my local repository
|
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
|
5fade22f
|
Adding audio events for plant critter on fbx
|
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
|
2addb8d8
|
Added and integrated new attack animation for plant critter
|
3 年前 |
Amel Negra
|
ec0654b5
|
Plant critter attack animation v2 integration
|
3 年前 |
Amel Negra
|
b8e46c19
|
New farming animation in-place with Timeline example
|
3 年前 |
uChema
|
5ad05c8e
|
Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main
|
3 年前 |