Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes

This commit is contained in:
Joshua Yanovski 2020-05-15 14:53:13 +02:00
commit 243d0837b8
273 changed files with 5511 additions and 2088 deletions

1
.dockerignore Normal file
View File

@ -0,0 +1 @@
**/target

4
.gitignore vendored
View File

@ -33,6 +33,10 @@ maps
screenshots
todo.txt
# Game data
*.sqlite
*.sqlite-journal
# direnv
/.envrc
*.bat

View File

@ -13,18 +13,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Added zoomable and rotatable minimap
- Added rotating orientation marker to main-map
- Added daily Mac builds
- Allow spawning individual pet species, not just generic body kinds.
- Allow spawning individual pet species, not just generic body kinds
- Configurable fonts
- Configurable keybindings from the Controls menu
- Tanslation status tracking
- Translation status tracking
- Added gamma setting
- Added new orc hairstyles
- Added sfx for wielding/unwielding weapons
- Added SFX for wielding/unwielding weapons
- Fixed NPCs attacking the player forever after killing them
- Added sfx for collecting, dropping and using inventory items
- Added SFX for collecting, dropping and using inventory items
- New attack animation
- weapon control system
- Game pauses when in singleplayer and pause menu
- Weapon control system
- Game pauses when in single player and pause menu
- Added authentication system (to play on the official server register on https://account.veloren.net)
- Added gamepad/controller support
- Added player feedback when attempting to pickup an item with a full inventory
@ -34,21 +34,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Added Turkish translation
- Complete rewrite of the combat system into a state machine
- Abilities like Dash and Triplestrike
- Armor can now be eqipped as items
- Armor can now be equipped as items
- Fireball explosions
- Inventory supports stacking
- Many new armors and weapons to find in chests
- Fleshed out "attack" animation into alpha, beta and spin type attacks
- Fleshed out range attack into charging and shooting anims for staff/bow
- Fleshed out range attack into charging and shooting animations for staff/bow
- Customized attack animation for hammers and axes
- German translation
- Added German translation
- Added a silhouette for players when they are occluded
- Added transparency to the player when zooming in
- Made armor and hotbar slots actually function
- Added dragging and right-click to use functionality to inventory, armor & hotbar slots
- Added capes, lanterns, tabards, rings, helmets & necklaces as equippable armor
- 6 new music tracks
- Added basic world and civilisation simulation
- Added basic world and civilization simulation
- Added overhauled towns
- Added fields, crops and scarecrows
- Added paths
@ -63,13 +63,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Added non-uniform block heights
- Added `/sudo` command
- Added a Level of Detail (LoD) system for terrain sprites and entities
- Added owl, hyena, parrot npcs
- Added owl, hyena, parrot, cockatrice, red dragon NPCs
- Added dungeon entrances
- Villagers tools and clothing
- Cultists clothing
- You can start the game by pressing "enter" from the character selection menu
- Added server-side character saving
- Player now starts with a lantern. Equipping/unequipping a lantern has the same effect as the `/lantern` command
- Added tab completion in chat for player names and chat commands
- Added server persistence for character stats
- Added a popup when setting your character's waypoint
### Changed
- The /give_item command can now specify the amount of items. Syntax is now `/give_item <name> [num]`
- Brighter / higher contrast main-map
- Removed highlighting of non-collectible sprites
- Fixed /give_exp ignoring player argument
@ -83,6 +90,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Rewrote the humanoid skeleton to be more ideal for attack animations
- Arrows can no longer hurt their owners
- Increased overall character scale
- `/sudo player /tp` is short for `/sudo player /tp me`
- The `/object` command can create any object in comp::object::Body
- The `/help` command takes an optional argument. `/help /sudo` will show you information about only the sudo command.
### Removed
@ -148,7 +158,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Moved computations to terrain fragment shaders
- Fixed title music
- Made rolling less violent when changing directions
- Fixed singleplayer crash
- Fixed single player crash
- Improved error information in client and server
- Store items as RON files
- Updated download info in readme
@ -185,7 +195,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Added adjustable FOV slider
- Added /explosion command
- Added first person switch
- Added singleplayer server settings
- Added single player server settings
- Added admin check for commands
- Started asset reloading system
- Added SRGB conversion in shaders
@ -237,7 +247,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Hang Gliding
- Pets: Pig and Wolf. They can be spawned with /pig and /wolf commands.
- Name tags: You can finally know who is this guy with the blue shirt!
- Singleplayer: No need to start a server just to play alone
- single player: No need to start a server just to play alone
- Character customization: It isn't fully complete but still allows you to look different than others
- Music!
- Major performance improvements related to the fact that we rewrote the entire game

74
Cargo.lock generated
View File

@ -1100,6 +1100,38 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "307dde1a517939465bc4042b47377284a56cee6160f8066f1f5035eb7b25a3fc"
[[package]]
name = "diesel"
version = "1.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33d7ca63eb2efea87a7f56a283acc49e2ce4b2bd54adf7465dc1d81fef13d8fc"
dependencies = [
"byteorder 1.3.4",
"diesel_derives",
"libsqlite3-sys",
]
[[package]]
name = "diesel_derives"
version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3"
dependencies = [
"proc-macro2 1.0.9",
"quote 1.0.3",
"syn 1.0.16",
]
[[package]]
name = "diesel_migrations"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf3cde8413353dc7f5d72fa8ce0b99a560a359d2c5ef1e5817ca731cd9008f4c"
dependencies = [
"migrations_internals",
"migrations_macros",
]
[[package]]
name = "directories"
version = "2.0.2"
@ -1166,6 +1198,12 @@ dependencies = [
"nom 4.2.3",
]
[[package]]
name = "dotenv"
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f"
[[package]]
name = "downcast-rs"
version = "1.1.1"
@ -2401,6 +2439,17 @@ dependencies = [
"winapi 0.3.8",
]
[[package]]
name = "libsqlite3-sys"
version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3711dfd91a1081d2458ad2d06ea30a8755256e74038be2ad927d94e1c955ca8"
dependencies = [
"cc",
"pkg-config",
"vcpkg",
]
[[package]]
name = "libssh2-sys"
version = "0.2.16"
@ -2550,6 +2599,27 @@ dependencies = [
"rustc_version",
]
[[package]]
name = "migrations_internals"
version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b4fc84e4af020b837029e017966f86a1c2d5e83e64b589963d5047525995860"
dependencies = [
"diesel",
]
[[package]]
name = "migrations_macros"
version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9753f12909fd8d923f75ae5c3258cae1ed3c8ec052e1b38c93c21a6d157f789c"
dependencies = [
"migrations_internals",
"proc-macro2 1.0.9",
"quote 1.0.3",
"syn 1.0.16",
]
[[package]]
name = "mime"
version = "0.2.6"
@ -4955,8 +5025,12 @@ dependencies = [
"authc",
"chrono",
"crossbeam",
"diesel",
"diesel_migrations",
"dotenv",
"hashbrown",
"lazy_static",
"libsqlite3-sys",
"log 0.4.8",
"portpicker",
"prometheus",

View File

@ -1,5 +1,12 @@
Item(
name: "Black Lantern",
description: "Used by city guards.",
kind: Lantern(Black0),
kind: Lantern(
(
kind: Black0,
color: (r: 255, g: 190, b: 75),
strength_thousandths: 3000,
flicker_thousandths: 300,
),
),
)

View File

@ -0,0 +1,12 @@
Item(
name: "Cool Blue Lantern",
description: "This lantern is surprisingly cold when lit.",
kind: Lantern(
(
kind: Blue0,
color: (r: 64, g: 127, b: 153),
strength_thousandths: 4000,
flicker_thousandths: 250,
),
),
)

View File

@ -1,5 +1,12 @@
Item(
name: "Lime Zest Lantern",
description: "It has an opening that could fit a ring...",
kind: Lantern(Green0),
kind: Lantern(
(
kind: Green0,
color: (r: 192, g: 255, b: 76),
strength_thousandths: 4000,
flicker_thousandths: 500,
),
),
)

View File

@ -0,0 +1,12 @@
Item(
name: "Red Lantern",
description: "Caution: contents hot",
kind: Lantern(
(
kind: Red0,
color: (r: 255, g: 127, b: 51),
strength_thousandths: 3500,
flicker_thousandths: 1000,
),
),
)

View File

@ -0,0 +1,10 @@
Item(
name: "Empty",
description: "",
kind: Tool (
(
kind: Empty,
equip_time_millis: 200,
)
),
)

View File

@ -243,9 +243,9 @@
]
},
"species": {
"wolf": {
"keyword": "wolf",
"generic": "Wolf"
"grolgar": {
"keyword": "grolgar",
"generic": "Grolgar"
},
"saber": {
"keyword": "sabertooth",
@ -475,6 +475,10 @@
"parrot": {
"keyword": "parrot",
"generic": "Parrot"
},
"cockatrice": {
"keyword": "cockatrice",
"generic": "Cockatrice"
}
}
},
@ -489,6 +493,10 @@
"ogre": {
"keyword": "ogre",
"generic": "Ogre"
},
"cyclops": {
"keyword": "cyclops",
"generic": "Cyclops"
}
}
},
@ -539,5 +547,19 @@
"generic": "Fungome"
}
}
},
"dragon": {
"body": {
"keyword": "dragon",
"names": [
"Smaug"
]
},
"species": {
"reddragon": {
"keyword": "reddragon",
"generic": "Reddragon"
}
}
}
}

View File

@ -27,37 +27,38 @@
files: [
"voxygen.audio.sfx.weapon.sword_out",
],
threshold: 1.0,
threshold: 0.5,
),
Unwield(Sword(BasicSword)): (
files: [
"voxygen.audio.sfx.weapon.sword_in",
],
threshold: 1.0,
threshold: 0.5,
),
Inventory(Collected): (
Inventory(Collected): (
files: [
"voxygen.audio.sfx.inventory.add_item",
],
threshold: 0.5,
threshold: 0.3,
),
Inventory(Swapped): (
files: [
"voxygen.audio.sfx.inventory.add_item",
],
threshold: 0.5,
threshold: 0.3,
),
Inventory(Given): (
files: [
"voxygen.audio.sfx.inventory.add_item",
],
threshold: 0.5,
threshold: 0.3,
),
Inventory(Dropped): (
files: [
"voxygen.audio.sfx.footsteps.stepgrass_4",
"voxygen.audio.sfx.inventory.drop_item",
],
threshold: 0.5,
threshold: 0.3,
),
Inventory(Consumed(Potion)): (
files: [

Binary file not shown.

BIN
assets/voxygen/audio/sfx/inventory/drop_item.wav (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/audio/sfx/inventory/open_inventory.wav (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
assets/voxygen/element/icons/lantern_blue-0.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/element/icons/lantern_red-0.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -136,6 +136,7 @@ https://account.veloren.net."#,
"main.login.already_logged_in": "You are already logged into the server.",
"main.login.network_error": "Network error",
"main.login.failed_sending_request": "Request to Auth server failed",
"main.login.invalid_character": "The selected character is invalid",
"main.login.client_crashed": "Client crashed",
/// End Main screen section
@ -146,6 +147,7 @@ https://account.veloren.net."#,
"hud.show_tips": "Show Tips",
"hud.quests": "Quests",
"hud.you_died": "You Died",
"hud.waypoint_saved": "Waypoint Saved",
"hud.press_key_to_show_keybindings_fmt": "Press {key} to show keybindings",
"hud.press_key_to_show_debug_info_fmt": "Press {key} to show debug info",
@ -180,7 +182,7 @@ Throw them away by clicking them once and clicking outside of the bag
Nights can get pretty dark in Veloren.
Light your lantern by typing /lantern into the chat
Equip your lantern and light it by pressing G.
Want to free your cursor to close this window? Press TAB!
@ -316,6 +318,7 @@ Enjoy your stay in the World of Veloren."#,
"gameinput.climb": "Climb",
"gameinput.climbdown": "Climb Down",
"gameinput.wallleap": "Wall Leap",
"gameinput.togglelantern": "Toggle Lantern",
"gameinput.mount": "Mount",
"gameinput.enter": "Enter",
"gameinput.command": "Command",
@ -336,11 +339,14 @@ Enjoy your stay in the World of Veloren."#,
/// Start chracter selection section
"char_selection.loading_characters": "Loading characters...",
"char_selection.delete_permanently": "Permanently delete this Character?",
"char_selection.deleting_character": "Deleting Character...",
"char_selection.change_server": "Change Server",
"char_selection.enter_world": "Enter World",
"char_selection.logout": "Logout",
"char_selection.create_new_charater": "Create New Character",
"char_selection.creating_character": "Creating Character...",
"char_selection.character_creation": "Character Creation",
"char_selection.human_default": "Human Default",

View File

@ -61,6 +61,12 @@
Lantern(Green0): Png(
"element.icons.lantern_green-0",
),
Lantern(Blue0): Png(
"element.icons.lantern_blue-0",
),
Lantern(Red0): Png(
"element.icons.lantern_red-0",
),
// Farming Equipment
Tool(Farming(Broom)): VoxTrans(
"voxel.weapon.tool.broom-0",

BIN
assets/voxygen/voxel/armor/lantern/blue-0.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/armor/lantern/red-0.vox (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -27,4 +27,32 @@
center: ("npc.ogre.female.torso_lower"),
)
),
(Cyclops, Male): (
head: (
offset: (-7.0, -7.0, -6.5),
center: ("npc.cyclops.male.head"),
),
torso_upper: (
offset: (-8.0, -6.0, -6.0),
center: ("npc.cyclops.male.torso_upper"),
),
torso_lower: (
offset: (-6.0, -5.5, -6.0),
center: ("npc.cyclops.male.torso_lower"),
)
),
(Cyclops, Female): (
head: (
offset: (-7.0, -7.0, -6.5),
center: ("npc.cyclops.female.head"),
),
torso_upper: (
offset: (-8.0, -6.0, -6.0),
center: ("npc.cyclops.female.torso_upper"),
),
torso_lower: (
offset: (-6.0, -5.5, -6.0),
center: ("npc.cyclops.female.torso_lower"),
)
),
})

View File

@ -25,11 +25,11 @@
lateral: ("npc.ogre.male.leg_r"),
),
foot_l: (
offset: (-3.0, -5.0, -3.0),
offset: (-3.0, -5.0, -2.5),
lateral: ("npc.ogre.male.foot_l"),
),
foot_r: (
offset: (-3.0, -5.0, -3.0),
offset: (-3.0, -5.0, -2.5),
lateral: ("npc.ogre.male.foot_r"),
)
),
@ -59,12 +59,80 @@
lateral: ("npc.ogre.female.leg_r"),
),
foot_l: (
offset: (-3.0, -5.0, -3.0),
offset: (-3.0, -5.0, -2.5),
lateral: ("npc.ogre.female.foot_l"),
),
foot_r: (
offset: (-3.0, -5.0, -3.0),
offset: (-3.0, -5.0, -2.5),
lateral: ("npc.ogre.female.foot_r"),
)
),
(Cyclops, Male): (
shoulder_l: (
offset: (-3.0, -4.0, -5.0),
lateral: ("npc.cyclops.male.shoulder_l"),
),
shoulder_r: (
offset: (-3.0, -4.0, -5.0),
lateral: ("npc.cyclops.male.shoulder_r"),
),
hand_l: (
offset: (-3.5, -3.5, -14.0),
lateral: ("npc.cyclops.male.hand_l"),
),
hand_r: (
offset: (-3.5, -3.5, -14.0),
lateral: ("npc.cyclops.male.hand_r"),
),
leg_l: (
offset: (-6.0, -3.5, -7.0),
lateral: ("npc.cyclops.male.leg_l"),
),
leg_r: (
offset: (0.0, -3.5, -7.0),
lateral: ("npc.cyclops.male.leg_r"),
),
foot_l: (
offset: (-3.0, -5.0, -5.0),
lateral: ("npc.cyclops.male.foot_l"),
),
foot_r: (
offset: (-3.0, -5.0, -5.0),
lateral: ("npc.cyclops.male.foot_r"),
)
),
(Cyclops, Female): (
shoulder_l: (
offset: (-3.0, -4.0, -5.0),
lateral: ("npc.cyclops.female.shoulder_l"),
),
shoulder_r: (
offset: (-3.0, -4.0, -5.0),
lateral: ("npc.cyclops.female.shoulder_r"),
),
hand_l: (
offset: (-3.5, -3.5, -14.0),
lateral: ("npc.cyclops.female.hand_l"),
),
hand_r: (
offset: (-3.5, -3.5, -14.0),
lateral: ("npc.cyclops.female.hand_r"),
),
leg_l: (
offset: (-6.0, -3.5, -7.0),
lateral: ("npc.cyclops.female.leg_l"),
),
leg_r: (
offset: (0.0, -3.5, -7.0),
lateral: ("npc.cyclops.female.leg_r"),
),
foot_l: (
offset: (-3.0, -5.0, -5.0),
lateral: ("npc.cyclops.female.foot_l"),
),
foot_r: (
offset: (-3.0, -5.0, -5.0),
lateral: ("npc.cyclops.female.foot_r"),
)
),
})

View File

@ -195,4 +195,32 @@
center: ("npc.parrot.female.tail"),
)
),
(Cockatrice, Male): (
head: (
offset: (-2.5, -3.5, -8.0),
center: ("npc.cockatrice.male.head"),
),
torso: (
offset: (-3.5, -6.5, -7.5),
center: ("npc.cockatrice.male.torso"),
),
tail: (
offset: (-1.5, -3.5, -4.0),
center: ("npc.cockatrice.male.tail"),
)
),
(Cockatrice, Female): (
head: (
offset: (-2.5, -3.5, -8.0),
center: ("npc.cockatrice.female.head"),
),
torso: (
offset: (-3.5, -6.5, -7.5),
center: ("npc.cockatrice.female.torso"),
),
tail: (
offset: (-1.5, -3.5, -4.0),
center: ("npc.cockatrice.female.tail"),
)
),
})

View File

@ -251,4 +251,40 @@
lateral: ("npc.parrot.female.leg_r"),
)
),
(Cockatrice, Male): (
wing_l: (
offset: (-2.0, -3.0, -9.0),
lateral: ("npc.cockatrice.male.wing_l"),
),
wing_r: (
offset: (-2.0, -3.0, -9.0),
lateral: ("npc.cockatrice.male.wing_r"),
),
foot_l: (
offset: (-2.5, 0.0, -12.0),
lateral: ("npc.cockatrice.male.leg_l"),
),
foot_r: (
offset: (-2.5, 0.0, -12.0),
lateral: ("npc.cockatrice.male.leg_r"),
)
),
(Cockatrice, Female): (
wing_l: (
offset: (-2.0, -3.0, -9.0),
lateral: ("npc.cockatrice.female.wing_l"),
),
wing_r: (
offset: (-2.0, -3.0, -9.0),
lateral: ("npc.cockatrice.female.wing_r"),
),
foot_l: (
offset: (-2.5, 0.0, -12.0),
lateral: ("npc.cockatrice.female.leg_l"),
),
foot_r: (
offset: (-2.5, 0.0, -12.0),
lateral: ("npc.cockatrice.female.leg_r"),
)
),
})

View File

@ -0,0 +1,62 @@
({
(Reddragon, Male): (
upper: (
offset: (-6.5, -2.0, -6.0),
center: ("npc.reddragon.male.head_upper"),
),
lower: (
offset: (-2.5, -2.0, -5.0),
center: ("npc.reddragon.male.head_lower"),
),
jaw: (
offset: (-3.5, -2.0, -1.5),
center: ("npc.reddragon.male.jaw"),
),
chest_front: (
offset: (-6.5, -6.0, -7.5),
center: ("npc.reddragon.male.chest_front"),
),
chest_rear: (
offset: (-6.5, -7.0, -7.0),
center: ("npc.reddragon.male.chest_rear"),
),
tail_front: (
offset: (-2.5, -12.0, -3.5),
center: ("npc.reddragon.male.tail_front"),
),
tail_rear: (
offset: (-3.5, -16.0, -3.0),
center: ("npc.reddragon.male.tail_rear"),
)
),
(Reddragon, Female): (
upper: (
offset: (-6.5, -2.0, -6.0),
center: ("npc.reddragon.female.head_upper"),
),
lower: (
offset: (-2.5, -2.0, -5.0),
center: ("npc.reddragon.female.head_lower"),
),
jaw: (
offset: (-3.5, -2.0, -1.5),
center: ("npc.reddragon.female.jaw"),
),
chest_front: (
offset: (-6.5, -6.0, -7.5),
center: ("npc.reddragon.female.chest_front"),
),
chest_rear: (
offset: (-6.5, -7.0, -7.0),
center: ("npc.reddragon.female.chest_rear"),
),
tail_front: (
offset: (-2.5, -12.0, -3.5),
center: ("npc.reddragon.female.tail_front"),
),
tail_rear: (
offset: (-3.5, -16.0, -3.0),
center: ("npc.reddragon.female.tail_rear"),
)
),
})

View File

@ -0,0 +1,70 @@
({
(Reddragon, Male): (
wing_in_l: (
offset: (-24.0, -3.0, 0.0),
lateral: ("npc.reddragon.male.wing_in_l"),
),
wing_in_r: (
offset: (0.0, -3.0, 0.0),
lateral: ("npc.reddragon.male.wing_in_r"),
),
wing_out_l: (
offset: (-29.0, -3.0, -4.0),
lateral: ("npc.reddragon.male.wing_out_l"),
),
wing_out_r: (
offset: (0.0, -3.0, -4.0),
lateral: ("npc.reddragon.male.wing_out_r"),
),
foot_fl: (
offset: (-5.5, -4.0, -1.5),
lateral: ("npc.reddragon.male.foot_fl"),
),
foot_fr: (
offset: (-5.5, -4.0, -1.5),
lateral: ("npc.reddragon.male.foot_fr"),
),
foot_bl: (
offset: (-5.5, -4.0, -3.0),
lateral: ("npc.reddragon.male.foot_bl"),
),
foot_br: (
offset: (-5.5, -4.0, -3.0),
lateral: ("npc.reddragon.male.foot_br"),
)
),
(Reddragon, Female): (
wing_in_l: (
offset: (-24.0, -3.0, 0.0),
lateral: ("npc.reddragon.female.wing_in_l"),
),
wing_in_r: (
offset: (0.0, -3.0, 0.0),
lateral: ("npc.reddragon.female.wing_in_r"),
),
wing_out_l: (
offset: (-29.0, -3.0, -4.0),
lateral: ("npc.reddragon.female.wing_out_l"),
),
wing_out_r: (
offset: (0.0, -3.0, -4.0),
lateral: ("npc.reddragon.female.wing_out_r"),
),
foot_fl: (
offset: (-5.5, -4.0, -1.5),
lateral: ("npc.reddragon.female.foot_fl"),
),
foot_fr: (
offset: (-5.5, -4.0, -1.5),
lateral: ("npc.reddragon.female.foot_fr"),
),
foot_bl: (
offset: (-5.5, -4.0, -3.0),
lateral: ("npc.reddragon.female.foot_bl"),
),
foot_br: (
offset: (-5.5, -4.0, -3.0),
lateral: ("npc.reddragon.female.foot_br"),
)
),
})

View File

@ -12,5 +12,13 @@
vox_spec: ("armor.lantern.black-0", (-2.0, -2.0, -7.0)),
color: None
),
Red0: (
vox_spec: ("armor.lantern.red-0", (-2.0, -2.0, -7.0)),
color: None
),
Blue0: (
vox_spec: ("armor.lantern.blue-0", (-2.0, -2.0, -7.0)),
color: None
),
},
))

BIN
assets/voxygen/voxel/npc/cockatrice/female/head.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cockatrice/female/leg_l.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cockatrice/female/leg_r.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cockatrice/female/tail.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cockatrice/female/torso.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cockatrice/female/wing_l.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cockatrice/female/wing_r.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cockatrice/male/head.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cockatrice/male/leg_l.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cockatrice/male/leg_r.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cockatrice/male/tail.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cockatrice/male/torso.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cockatrice/male/wing_l.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cockatrice/male/wing_r.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cyclops/female/foot_l.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cyclops/female/foot_r.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cyclops/female/hammer.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cyclops/female/hand_l.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cyclops/female/hand_r.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cyclops/female/head.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cyclops/female/leg_l.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cyclops/female/leg_r.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cyclops/female/shoulder_l.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cyclops/female/shoulder_r.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cyclops/female/torso_lower.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cyclops/female/torso_upper.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cyclops/male/foot_l.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cyclops/male/foot_r.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cyclops/male/hammer.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cyclops/male/hand_l.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cyclops/male/hand_r.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cyclops/male/head.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cyclops/male/leg_l.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cyclops/male/leg_r.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cyclops/male/shoulder_l.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cyclops/male/shoulder_r.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cyclops/male/torso_lower.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/npc/cyclops/male/torso_upper.vox (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
assets/voxygen/voxel/npc/dragon/head.vox (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More