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 Pokemon Sizing #44

Merged
merged 74 commits into from
Apr 17, 2024
Merged

Fix Pokemon Sizing #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
0e934f8
Delete models/entity/pokemon/carvanha.geo.json
AbstractJoker Apr 17, 2024
2c7cb9b
Scale
AbstractJoker Apr 17, 2024
c05b4ef
replace models/entity/pokemon/sharpedo.geo.json
AbstractJoker Apr 17, 2024
16d7f01
Add files via upload
AbstractJoker Apr 17, 2024
68d7007
Delete models/entity/pokemon/tauros.geo.json
AbstractJoker Apr 17, 2024
578205a
Add files via upload
AbstractJoker Apr 17, 2024
97a7641
Delete models/entity/pokemon/mareanie.geo.json
AbstractJoker Apr 17, 2024
329ac8d
scale
AbstractJoker Apr 17, 2024
39c00d9
Delete animations/pokemon/mareanie.animation.json
AbstractJoker Apr 17, 2024
5818720
scale
AbstractJoker Apr 17, 2024
fb1a602
replace textures/entity/pokemon/mareanie/mareanie.png
AbstractJoker Apr 17, 2024
37e83cc
replace
AbstractJoker Apr 17, 2024
5c8d525
Delete textures/entity/pokemon/mareanie/mareanie.png
AbstractJoker Apr 17, 2024
a10f2d0
Add files via upload
AbstractJoker Apr 17, 2024
5dbeb95
Delete textures/entity/pokemon/mareanie/shiny_mareanie.png
AbstractJoker Apr 17, 2024
8ebf7f2
Add files via upload
AbstractJoker Apr 17, 2024
e42154a
Delete models/entity/pokemon/toxapex.geo.json
AbstractJoker Apr 17, 2024
85a6ccb
Add files via upload
AbstractJoker Apr 17, 2024
ec12604
Delete animations/pokemon/toxapex.animation.json
AbstractJoker Apr 17, 2024
601b3e1
Add files via upload
AbstractJoker Apr 17, 2024
0ab48ca
Delete textures/entity/pokemon/toxapex/shiny_toxapex.png
AbstractJoker Apr 17, 2024
00ee660
Add files via upload
AbstractJoker Apr 17, 2024
26e8861
Delete textures/entity/pokemon/toxapex/toxapex.png
AbstractJoker Apr 17, 2024
c2e01c2
Add files via upload
AbstractJoker Apr 17, 2024
97528be
Delete models/entity/pokemon/mewtwo.geo.json
AbstractJoker Apr 17, 2024
4fdfe4b
Add files via upload
AbstractJoker Apr 17, 2024
38084b8
Delete animations/pokemon/mewtwo.animation.json
AbstractJoker Apr 17, 2024
8597189
Add files via upload
AbstractJoker Apr 17, 2024
a2e262f
Delete textures/entity/pokemon/mewtwo/mewtwo.png
AbstractJoker Apr 17, 2024
d025de7
Delete textures/entity/pokemon/mewtwo/shiny_mewtwo.png
AbstractJoker Apr 17, 2024
c03904b
Delete textures/entity/pokemon/mewtwo/shiny_armored_mewtwo.png
AbstractJoker Apr 17, 2024
a93ad33
Delete textures/entity/pokemon/mewtwo/armored_mewtwo.png
AbstractJoker Apr 17, 2024
dd8df55
Add files via upload
AbstractJoker Apr 17, 2024
7e8c8b7
Delete textures/entity/pokemon/mewtwo/shadow_mewtwo.png
AbstractJoker Apr 17, 2024
0c8c40c
Add files via upload
AbstractJoker Apr 17, 2024
6211582
Delete models/entity/pokemon/mew.geo.json
AbstractJoker Apr 17, 2024
1a8ae75
Add files via upload
AbstractJoker Apr 17, 2024
5434da8
Delete animations/pokemon/mew.animation.json
AbstractJoker Apr 17, 2024
0dbc9cc
Add files via upload
AbstractJoker Apr 17, 2024
f765a4f
Delete textures/entity/pokemon/mew/mew.png
AbstractJoker Apr 17, 2024
6b5d461
Add files via upload
AbstractJoker Apr 17, 2024
a9c6a34
Delete textures/entity/pokemon/mew/shiny_mew.png
AbstractJoker Apr 17, 2024
b9ae927
Add files via upload
AbstractJoker Apr 17, 2024
c055d9c
Delete models/entity/pokemon/xerneasneutral.geo.json
AbstractJoker Apr 17, 2024
1c656fc
Add files via upload
AbstractJoker Apr 17, 2024
b788264
Delete animations/pokemon/xerneasneutral.animation.json
AbstractJoker Apr 17, 2024
911a29f
Add files via upload
AbstractJoker Apr 17, 2024
13b1c92
Delete textures/entity/pokemon/xerneasneutral/shiny_xerneasneutral.png
AbstractJoker Apr 17, 2024
a106121
Add files via upload
AbstractJoker Apr 17, 2024
893daf7
Delete textures/entity/pokemon/xerneasneutral/xerneasneutral.png
AbstractJoker Apr 17, 2024
83bf3e1
Add files via upload
AbstractJoker Apr 17, 2024
18acab8
Delete models/entity/pokemon/xerneas.geo.json
AbstractJoker Apr 17, 2024
3183492
Add files via upload
AbstractJoker Apr 17, 2024
9fe8aa2
Delete animations/pokemon/xerneas.animation.json
AbstractJoker Apr 17, 2024
51a679c
Add files via upload
AbstractJoker Apr 17, 2024
17c23cc
Delete textures/entity/pokemon/xerneas/shiny_xerneas.png
AbstractJoker Apr 17, 2024
b343496
Add files via upload
AbstractJoker Apr 17, 2024
6bbd392
Delete textures/entity/pokemon/xerneas/xerneas.png
AbstractJoker Apr 17, 2024
275a174
Add files via upload
AbstractJoker Apr 17, 2024
1d92b20
Delete models/entity/pokemon/yveltal.geo.json
AbstractJoker Apr 17, 2024
70c4562
Add files via upload
AbstractJoker Apr 17, 2024
2bccc83
Delete animations/pokemon/yveltal.animation.json
AbstractJoker Apr 17, 2024
364a3e6
Add files via upload
AbstractJoker Apr 17, 2024
218fa01
Delete textures/entity/pokemon/yveltal/shiny_yveltal.png
AbstractJoker Apr 17, 2024
dcda5f7
Add files via upload
AbstractJoker Apr 17, 2024
d5b5457
Delete textures/entity/pokemon/yveltal/yveltal.png
AbstractJoker Apr 17, 2024
5bdedd1
Add files via upload
AbstractJoker Apr 17, 2024
7aa7425
Add files via upload
AbstractJoker Apr 17, 2024
a520c8f
Add files via upload
AbstractJoker Apr 17, 2024
d413540
Add files via upload
AbstractJoker Apr 17, 2024
4b70f69
Zekrom
AbstractJoker Apr 17, 2024
ed1075c
Delete textures/entity/pokemon/shiny_zekrom.png
AbstractJoker Apr 17, 2024
2b6a4b9
Delete textures/entity/pokemon/zekrom.png
AbstractJoker Apr 17, 2024
5fbf700
zekrom
AbstractJoker Apr 17, 2024
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
68 changes: 34 additions & 34 deletions animations/pokemon/mew.animation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"post": [1, 0.1, 1],
"lerp_mode": "catmullrom"
},
"0.16667": {
"0.1667": {
"post": [1, 1, 1],
"lerp_mode": "catmullrom"
}
Expand Down Expand Up @@ -1656,7 +1656,7 @@
"rotation": ["-math.cos((query.anim_time-0.2)*180)*4", 0, 0]
},
"upper_part": {
"rotation": ["10+7.510-math.cos(query.anim_time*180)*2", 0, 0]
"rotation": ["10+7.510.0568-math.cos(query.anim_time*180)*2", 0, 0]
},
"head": {
"rotation": ["-5-math.cos((query.anim_time-0.1)*180)*2", 0, 0],
Expand Down Expand Up @@ -1981,7 +1981,7 @@
"post": [-326.54189, 1.17788, 0.64185],
"lerp_mode": "catmullrom"
},
"1.54167": [-326.54189, 1.17788, 0.64185]
"1.5417": [-326.54189, 1.17788, 0.64185]
},
"position": {
"0.0": {
Expand Down Expand Up @@ -2016,7 +2016,7 @@
"post": [-1, -3, 5],
"lerp_mode": "catmullrom"
},
"1.54167": [-1, -3, 5]
"1.5417": [-1, -3, 5]
}
},
"upper_part": {
Expand All @@ -2029,7 +2029,7 @@
"post": [-20, 0, 0],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [-20, 0, 0],
"lerp_mode": "catmullrom"
}
Expand All @@ -2039,7 +2039,7 @@
"post": [0, 0, 0],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [0, 0, 0],
"lerp_mode": "catmullrom"
}
Expand Down Expand Up @@ -2071,7 +2071,7 @@
"post": [2.5, 0, 0],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [2.5, 0, 0],
"lerp_mode": "catmullrom"
}
Expand All @@ -2093,7 +2093,7 @@
"post": [0, -0.3, -0.2],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [0, -0.3, -0.2],
"lerp_mode": "catmullrom"
}
Expand All @@ -2117,7 +2117,7 @@
"post": [0, 0, 0],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [0, 0, 0],
"lerp_mode": "catmullrom"
}
Expand Down Expand Up @@ -2145,7 +2145,7 @@
"post": [1, 1, 1],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [1, 1, 1],
"lerp_mode": "catmullrom"
}
Expand Down Expand Up @@ -2181,7 +2181,7 @@
"post": [-2.5, 0, 0],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [-2.5, 0, 0],
"lerp_mode": "catmullrom"
}
Expand All @@ -2191,7 +2191,7 @@
"post": [0, 0, 0],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [0, 0, 0],
"lerp_mode": "catmullrom"
}
Expand Down Expand Up @@ -2227,7 +2227,7 @@
"post": [-2.5, 0, 0],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [-2.5, 0, 0],
"lerp_mode": "catmullrom"
}
Expand All @@ -2237,7 +2237,7 @@
"post": [0, 0, 0],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [0, 0, 0],
"lerp_mode": "catmullrom"
}
Expand Down Expand Up @@ -2273,7 +2273,7 @@
"post": [-2.5, 0, 0],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [-2.5, 0, 0],
"lerp_mode": "catmullrom"
}
Expand All @@ -2283,7 +2283,7 @@
"post": [0, 0, 0],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [0, 0, 0],
"lerp_mode": "catmullrom"
}
Expand Down Expand Up @@ -2319,7 +2319,7 @@
"post": [-2.5, 0, 0],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [-2.5, 0, 0],
"lerp_mode": "catmullrom"
}
Expand All @@ -2329,7 +2329,7 @@
"post": [0, 0, 0],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [0, 0, 0],
"lerp_mode": "catmullrom"
}
Expand Down Expand Up @@ -2357,7 +2357,7 @@
"post": [-2.5, 0, 0],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [-2.5, 0, 0],
"lerp_mode": "catmullrom"
}
Expand Down Expand Up @@ -2385,7 +2385,7 @@
"post": [5, 0, 0],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [5, 0, 0],
"lerp_mode": "catmullrom"
}
Expand Down Expand Up @@ -2413,7 +2413,7 @@
"post": [-7.5, 0, 0],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [-7.5, 0, 0],
"lerp_mode": "catmullrom"
}
Expand Down Expand Up @@ -2441,7 +2441,7 @@
"post": [-7.5, 0, 0],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [-7.5, 0, 0],
"lerp_mode": "catmullrom"
}
Expand Down Expand Up @@ -2469,7 +2469,7 @@
"post": [-2.5, 0, 0],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [-2.5, 0, 0],
"lerp_mode": "catmullrom"
}
Expand Down Expand Up @@ -2497,7 +2497,7 @@
"post": [-2.5, 0, 0],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [-2.5, 0, 0],
"lerp_mode": "catmullrom"
}
Expand Down Expand Up @@ -2525,7 +2525,7 @@
"post": [-5, 0, 0],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [-5, 0, 0],
"lerp_mode": "catmullrom"
}
Expand Down Expand Up @@ -2605,7 +2605,7 @@
"post": [5, 0, 0],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [5, 0, 0],
"lerp_mode": "catmullrom"
}
Expand All @@ -2629,7 +2629,7 @@
"post": [47.86, -30.53, -109.24],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [47.86, -30.53, -109.24],
"lerp_mode": "catmullrom"
}
Expand All @@ -2647,7 +2647,7 @@
"post": [-0.1, 0.7, 0],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [-0.1, 0.7, 0],
"lerp_mode": "catmullrom"
}
Expand All @@ -2671,7 +2671,7 @@
"post": [47.86, 30.53, 109.24],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [47.86, 30.53, 109.24],
"lerp_mode": "catmullrom"
}
Expand All @@ -2689,7 +2689,7 @@
"post": [0.1, 0.7, 0],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [0.1, 0.7, 0],
"lerp_mode": "catmullrom"
}
Expand All @@ -2701,7 +2701,7 @@
"post": [0, 0, -25],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [0, 0, -25],
"lerp_mode": "catmullrom"
}
Expand All @@ -2711,7 +2711,7 @@
"post": [1, 0.8, 1],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [1, 0.8, 1],
"lerp_mode": "catmullrom"
}
Expand All @@ -2723,7 +2723,7 @@
"post": [0, 0, 25],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [0, 0, 25],
"lerp_mode": "catmullrom"
}
Expand All @@ -2733,7 +2733,7 @@
"post": [1, 0.8, 1],
"lerp_mode": "catmullrom"
},
"1.54167": {
"1.5417": {
"post": [1, 0.8, 1],
"lerp_mode": "catmullrom"
}
Expand Down
8 changes: 4 additions & 4 deletions animations/pokemon/mewtwo.animation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"scale": {
"0.0": [1, 1, 1],
"0.0833": [1, 0.1, 1],
"0.16667": [1, 1, 1]
"0.1667": [1, 1, 1]
}
}
}
Expand Down Expand Up @@ -1439,15 +1439,15 @@
"mewtwo": {
"position": {
"0.0": {
"post": [0, -25, 0],
"post": [0, -30, 0],
"lerp_mode": "catmullrom"
},
"0.6667": {
"post": [0, -25.8, 0],
"post": [0, -30.8, 0],
"lerp_mode": "catmullrom"
},
"1.3333": {
"post": [0, -25, 0],
"post": [0, -30, 0],
"lerp_mode": "catmullrom"
}
}
Expand Down
14 changes: 7 additions & 7 deletions animations/pokemon/toxapex.animation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2835,15 +2835,15 @@
"toxapex": {
"position": {
"0.0": {
"post": [0, 0, 0],
"post": [0, 1, 0],
"lerp_mode": "catmullrom"
},
"1.0": {
"post": [0, 0.4, 0],
"post": [0, 1.4, 0],
"lerp_mode": "catmullrom"
},
"2.0": {
"post": [0, 0, 0],
"post": [0, 1, 0],
"lerp_mode": "catmullrom"
}
}
Expand Down Expand Up @@ -3882,10 +3882,10 @@
"0.25": [0, 1, 2],
"0.4583": [0, 0, 4],
"0.875": [0, 0, 4],
"1.2917": [0, -6, 4],
"1.375": [0, -6.7, 4],
"1.4583": [0, -6, 4],
"1.8333": [0, -6, 4]
"1.2917": [0, -8, 4],
"1.375": [0, -7.7, 4],
"1.4583": [0, -8, 4],
"1.8333": [0, -8, 4]
}
},
"head2": {
Expand Down
Loading