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

fix(gltf): replace deprecated md5 assets #27

Merged
merged 5 commits into from
Oct 31, 2020
Merged

fix(gltf): replace deprecated md5 assets #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eff0e80
feat(gltf): replace deprecated human md5 assets
jdrueckert Oct 21, 2020
ba9e8f9
feat(gltf): replace deprecated gooey md5 assets
jdrueckert Oct 21, 2020
5c99583
Merge remote-tracking branch 'origin/develop' into feat/replace-md5-gltf
jdrueckert Oct 27, 2020
73327cc
fix(gltf): gooey and visitor prefabs
jdrueckert Oct 27, 2020
65ed0f6
fix: display name, hatchling size
jdrueckert Oct 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
864 changes: 0 additions & 864 deletions assets/animations/femalehumanRun.md5anim
View file
Open in desktop

This file was deleted.

9,099 changes: 0 additions & 9,099 deletions assets/animations/femalehumanStand.md5anim
View file
Open in desktop

This file was deleted.

1,404 changes: 0 additions & 1,404 deletions assets/animations/femalehumanWalk.md5anim
View file
Open in desktop

This file was deleted.

450 changes: 0 additions & 450 deletions assets/animations/gooeyIdleBreathing.md5anim
View file
Open in desktop

This file was deleted.

1,080 changes: 0 additions & 1,080 deletions assets/animations/gooeyLookRightLeft.md5anim
View file
Open in desktop

This file was deleted.

765 changes: 0 additions & 765 deletions assets/animations/gooeyLookRightUp.md5anim
View file
Open in desktop

This file was deleted.

110 changes: 55 additions & 55 deletions assets/prefabs/Gooeys/blueGooey.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"alwaysRelevant": true,
"DisplayName": {
"name": "blueGooey"
"name": "Blue Gooey"
},
"persisted": true,
"Color": {
Expand All @@ -12,35 +12,35 @@
255
]
},
"skeletalmesh": {
"skeletalMesh": {
"mesh": "gooey",
"heightOffset": -2.0,
"heightOffset": -0.5,
"material": "1b",
"animationPool": [
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyLookRightLeft",
"gooeyLookRightLeft",
"gooeyLookRightUp"
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction"
],
"loop": true,
"scale": [
Expand All @@ -49,40 +49,40 @@
0.25
]
},
"Behavior": {
"tree": "GooKeeper:gooey"
},
"Stand": {
"animationPool": [
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyLookRightLeft",
"gooeyLookRightLeft",
"gooeyLookRightUp"
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction"
]
},
"Behavior": {
"tree": "GooKeeper:gooey"
},
"Walk": {
"animationPool": [
"gooeyIdleBreathing"
"gooey#ArmatureAction"
]
},
"location": {},
Expand Down
159 changes: 88 additions & 71 deletions assets/prefabs/Gooeys/gooeyHatchling.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,76 +12,79 @@
255
]
},
"skeletalmesh": {
"mesh": "gooey",
"heightOffset": -2.0,
"material": "1b",
"animationPool": [
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyLookRightLeft",
"gooeyLookRightLeft",
"gooeyLookRightUp"
],
"loop": true,
"scale": [
0.25,
0.25,
0.25
]
},
"Stand": {
"animationPool": [
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyLookRightLeft",
"gooeyLookRightLeft",
"gooeyLookRightUp"
]
},
"Walk": {
"animationPool": [
"gooeyIdleBreathing"
]
},
"skeletalMesh": {
"mesh": "gooey",
"heightOffset": -0.5,
"material": "1b",
"animationPool": [
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction"
],
"loop": true,
"scale": [
0.25,
0.25,
0.25
]
},
"Stand": {
"animationPool": [
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction",
"gooey#ArmatureAction"
]
},
"Behavior": {
"tree": "GooKeeper:gooey"
},
"Walk": {
"animationPool": [
"gooey#ArmatureAction"
]
},
"location": {},
"Character": {},
"AliveCharacter": {},
Expand All @@ -97,6 +100,20 @@
"Network": {},
"MinionMove": {},
"Health": {},
"Follow": {},
"BoxShape": {
"extents": [
1.0,
1.0,
1.0
]
},
"Trigger": {
"detectGroups": [
"engine:debris",
"engine:sensor"
]
},
"Follow": {
},
"NPCMovement": {}
}
Loading