Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

small corrections

Browse Source
This commit is contained in:
jshipsey 2020-09-21 23:56:03 -04:00
parent fa2dd28587
commit 4f0faf4c56
7 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -17,6 +17,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fullscreen modes now show two options (exclusive and borderless)
- Added banlist and `/ban`, `/unban`, and `/kick` commands for admins
- A new dungeon boss (venture there and discover it yourself)
- Adaptive stride setup for more dynamic run behavior
- Theropod body
- Several new animals
### Changed

BIN
assets/voxygen/voxel/npc/gecko/male/foot_bl.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/gecko/male/foot_br.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/odonto/male/neck.vox (Stored with Git LFS)
View File

Binary file not shown.

8
assets/voxygen/voxel/theropod_central_manifest.ron
View File

@ -5,7 +5,7 @@
central: ("npc.archaeos.male.head"),
),
jaw: (
offset: (-5.5, 0.0, -3.0),
offset: (-5.5, -2.0, -3.0),
central: ("npc.archaeos.male.jaw"),
),
neck: (
@ -35,7 +35,7 @@
central: ("npc.archaeos.male.head"),
),
jaw: (
offset: (-5.5, 0.0, -3.0),
offset: (-5.5, -2.0, -3.0),
central: ("npc.archaeos.male.jaw"),
),
neck: (
@ -69,7 +69,7 @@
central: ("npc.odonto.male.jaw"),
),
neck: (
offset: (-5.5, 0.0, -6.5),
offset: (-3.5, 0.0, -6.5),
central: ("npc.odonto.male.neck"),
),
chest_front: (
@ -99,7 +99,7 @@
central: ("npc.odonto.male.jaw"),
),
neck: (
offset: (-5.5, 0.0, -6.5),
offset: (-3.5, 0.0, -6.5),
central: ("npc.odonto.male.neck"),
),
chest_front: (

10
voxygen/src/anim/src/quadruped_small/mod.rs
View File

@ -142,7 +142,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Frog, _) => (-2.0, 4.5),
(Rat, _) => (6.0, 5.0),
(Axolotl, _) => (3.0, 5.0),
(Gecko, _) => (7.5, 3.0),
(Gecko, _) => (7.5, 4.0),
(Turtle, _) => (1.0, 6.0),
(Squirrel, _) => (4.0, 5.0),
(Fungome, _) => (4.0, 4.0),
@ -168,7 +168,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Frog, _) => (4.5, 6.5, 0.0),
(Rat, _) => (5.0, 2.5, -1.0),
(Axolotl, _) => (2.0, 2.0, -2.0),
(Gecko, _) => (2.0, 4.0, 0.0),
(Gecko, _) => (2.0, 4.0, -0.5),
(Turtle, _) => (5.0, 4.0, -2.0),
(Squirrel, _) => (3.5, 3.0, -1.0),
(Fungome, _) => (3.0, 2.0, -1.0),
@ -194,7 +194,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Frog, _) => (5.0, -3.5, 0.0),
(Rat, _) => (5.0, -2.0, 1.0),
(Axolotl, _) => (2.0, -3.0, -2.0),
(Gecko, _) => (1.5, -1.0, 0.0),
(Gecko, _) => (1.5, -2.0, -0.5),
(Turtle, _) => (5.5, -2.5, -2.0),
(Squirrel, _) => (3.5, -3.0, 0.0),
(Fungome, _) => (3.0, -3.5, -1.0),
@ -350,7 +350,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Frog, _) => (2.5),
(Rat, _) => (1.0),
(Axolotl, _) => (0.8),
(Gecko, _) => (1.0),
(Gecko, _) => (0.6),
(Turtle, _) => (0.7),
(Squirrel, _) => (1.0),
(Fungome, _) => (0.8),
@ -376,7 +376,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Frog, _) => (0.7),
(Rat, _) => (1.0),
(Axolotl, _) => (0.8),
(Gecko, _) => (1.0),
(Gecko, _) => (0.8),
(Turtle, _) => (0.7),
(Squirrel, _) => (1.0),
(Fungome, _) => (0.7),

4
voxygen/src/anim/src/theropod/mod.rs
View File

@ -116,7 +116,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
Self {
head: match (body.species, body.body_type) {
(Archaeos, _) => (8.0, 4.0),
(Odonto, _) => (6.0, 5.0),
(Odonto, _) => (2.0, 2.0),
},
jaw: match (body.species, body.body_type) {
(Archaeos, _) => (1.0, -7.0),
@ -124,7 +124,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
},
neck: match (body.species, body.body_type) {
(Archaeos, _) => (4.5, -2.0),
(Odonto, _) => (3.0, -3.0),
(Odonto, _) => (4.0, 0.0),
},
chest_front: match (body.species, body.body_type) {
(Archaeos, _) => (0.0, 20.0),