Commit Graph

752 Commits

Author SHA1 Message Date
flo666
e109f5c377 axebeak, tursus 2023-01-31 20:34:40 +01:00
flo666
75bfbff2c3 bristlemane 2023-01-31 20:34:40 +01:00
flo666
271b80b832 seal 2023-01-31 20:34:40 +01:00
Christof Petig
f306b6ee69 make lamps, embers and campfires use glowing indices for the brightest fiery colors 2023-01-29 18:53:18 +01:00
Marcel
c165d28e7d Merge branch 'wyvern_wings' into 'master'
wyverns

See merge request veloren/veloren!3720
2023-01-28 21:25:17 +00:00
flo
5e1fd02095 wyverns 2023-01-28 21:25:17 +00:00
Joshua Barretto
d9552f7ff4 Added support for glowing sprites 2023-01-19 21:59:02 +00:00
flo
0eba37ce6a dark_guitar & icy_talharpa 2023-01-13 13:37:45 +00:00
Joshua Barretto
f48e1ca951 Make wind sway change according to weather wind velocity 2022-12-31 17:40:40 +00:00
flo
466ed2c382 dagon_kit 2022-11-30 15:27:21 +00:00
Justin Shipsey
aa2fabcd45 Merge branch 'mossdrake' into 'master'
Moss Drake

See merge request veloren/veloren!3693
2022-11-12 13:00:44 +00:00
flo
0351bf1d63 Moss Drake 2022-11-12 13:00:42 +00:00
Christof Petig
a820eee289 Merge branch 'floppy-bat-wing-tweaks' into 'master'
tweak bat wing animation

See merge request veloren/veloren!3684
2022-11-12 10:18:11 +00:00
flo
df70381a7c tweak bat wing animation 2022-11-12 10:18:10 +00:00
Monty Marz
a763a865fe Musical Instruments part 2 2022-11-10 20:59:53 +00:00
flo
34eae80253 fix facegourd item name 2022-10-27 13:49:06 +00:00
IsseW
9a6a3a05a1 bat config 2022-10-25 00:31:04 +02:00
flo666
586d0f6dd8 add bat (created by Gemu) 2022-10-23 20:05:39 +02:00
flo666
60a48e450c facegourd and helmet offset (Female Orc) 2022-10-23 20:05:39 +02:00
flo666
1d98050f28 halloween npcs:
in forests, spawn harvester or dullahans or tricksters with custom halloween loot: facegourd, pumpkin_spice_brew, honeygourd
2022-10-23 20:05:39 +02:00
Monty Marz
3a63f210b2 fix drop model for chieftain mask 2022-10-21 00:20:15 +02:00
Monty Marz
2d8627c29b Add gnarling chieftain mask 2022-10-15 11:05:21 +00:00
flo
cfbadd36ea fix_desert_rock_animals 2022-09-22 18:42:34 +00:00
flo
dc688bccb9 fix_salamander_and_elbst 2022-09-13 17:32:53 +00:00
flo
e43608ce80 add guitar & instrument sample edits 2022-09-10 17:23:38 +00:00
flo
e4a3671345 Creature model updates 2022-09-06 10:35:10 +00:00
flo
9339971032 Music Instruments 2022-08-28 18:48:18 +00:00
flo
e882e62c08 seachapel 2022-08-24 21:50:53 +00:00
flo
5dd9991311 DesertCity 2022-08-08 09:58:18 +00:00
Youssef Fahmy
91c85dea22 Humanoid Model Overhaul 2022-07-16 11:13:24 +00:00
Imbris
6c8970f6fd Merge branch 'imbris/voxygen-compile-time' into 'master'
Improve voxygen compile time with small tweak

See merge request veloren/veloren!3449
2022-07-01 08:22:05 +00:00
Imbris
291a424b4e This seems to save at least 30 seconds (out of 90 to 120 secs) when tweaking TILE_SIZE in voxygen/src/mesh/greedy.rs (NOTE: I did some more timing, see associated MR description) 2022-06-30 00:11:04 -04:00
runrobdog
95148a9968 tweaks entity stats 2022-06-17 12:35:06 +02:00
Christof Petig
2bf8e1865f Skiing and ice skating 2022-05-27 17:19:52 +00:00
Chase Rozon
7dcee3eb23 Multiple Balance Tweaks & Miscellaneous Changes 2022-05-19 22:46:31 +00:00
Youssef Fahmy
080d8ef8b1 Tweaks for this week 2022-05-19 19:35:31 +00:00
Sam
aeca67443b Simplified item key (assets) 2022-05-18 16:28:10 -04:00
Sam
cbf5336343 Moved items from 'items.crafting_ing.modular' to 'items.modular.weapon' (assets). 2022-05-16 15:11:45 -04:00
Sam
13ea6dee93 Addressed second round of balance feedback (assets). 2022-05-16 15:11:40 -04:00
brunt
d46cdf60b5 renamed hilt voxels, adjusted secondary components in item image manifests [ci_skip] 2022-05-16 15:11:39 -04:00
Sam
9b078c3383 Addressed playtest feedback (assets). 2022-05-16 15:11:38 -04:00
brunt
fc28449703 rotate voxels and sceptre positioning [ci_skip] 2022-05-16 15:11:37 -04:00
UncomfySilence
1c626da66b loot tables and adding models 2022-05-16 15:11:36 -04:00
Sam
528b62c59a Rebase commit 2022-05-16 15:11:36 -04:00
Sam
3f2f0a7715 Fixed item drop manifest for secondary components. 2022-05-16 15:11:36 -04:00
brunt
5ab9c0f1ad sceptre positioning [ci_skip] 2022-05-16 15:11:32 -04:00
Sam
6ccc0b82f0 Models for sceptres and secondary components 2022-05-16 15:11:32 -04:00
Bryant Deters
af1a44264a add melee weapons to item_drop_manifest [ci skip] 2022-05-16 15:11:29 -04:00
Bryant Deters
4edd041056 add staffs to item_drop_manifest [ci skip] 2022-05-16 15:11:29 -04:00
Bryant Deters
1ce474adbb modular bow offset tweaks [ci skip] 2022-05-16 15:11:28 -04:00
Bryant Deters
f767e81133 modular staff offsets [ci skip] 2022-05-16 15:11:28 -04:00
Sam
e8c97f7a00 Staff models 2022-05-16 15:11:27 -04:00
Bryant Deters
f1940128bf modular bow offset adjustments [ci skip] 2022-05-16 15:11:27 -04:00
Snowram
f6343ff4f9 Modular bows offsets 2022-05-16 15:11:24 -04:00
Sam
558e2aefb7 Bow models 2022-05-16 15:11:23 -04:00
Snowram
74a3f4a7dc Modular 1h weapons offsets 2022-05-16 15:11:21 -04:00
Sam
ef5b2e4a1e Added method of differing names for 1h and 2h variants of a modular wepaon.
Added all 1h melee weapon models.
2022-05-16 15:11:19 -04:00
Sam
d7f5b907ff Gave modular items a pseudo item definition id that can be used when serializing ItemBase or when persisting items to the database. ONLY ASSETS 2022-05-16 15:11:14 -04:00
Sam
03ab68eb60 Added models for sword blade, axe head, and hammer head components. 2022-05-16 15:11:09 -04:00
Snowram
b01e816c0d Modular axes and hammers offsets 2022-05-16 15:11:08 -04:00
Snowram
e693b3132d Modular swords offsets 2022-05-16 15:11:07 -04:00
Sam
ac306bbec0 Added weapon models for 2h axe, hammer, and sword. 2022-05-16 15:11:07 -04:00
Sam
c6b5798cfd Inserted entries in item image and biped weapon manifests to aid in addition of models later. 2022-05-16 15:11:03 -04:00
Sam
38cb465722 Fixed loading of modular weapons from the loadout to work with nested components.
Modular weapons can now be correctly dispalyed when wielded.
2022-05-16 15:10:57 -04:00
Sam
c01fe655f1 Added wood 2022-05-16 15:10:55 -04:00
aflying pumpkin
c7f7e63495 Added Lionesses 2022-04-16 16:57:59 +00:00
flo
3d24b1d635 CliffTowns 2022-03-29 12:52:08 +00:00
ninefox
329051c6df removed extra fields from item_drop_manifest.ron
added TODO about applying non-random rotations in load.rs
2022-02-26 10:13:04 -08:00
Treeco
90fbadbd03 Fix ember z fighting, remove ember sway 2022-02-15 23:05:20 +00:00
Samuel Keiffer
6c7c0eefae Merge branch 'gnarlings' into 'master'
Gnarlings

See merge request veloren/veloren!3194
2022-02-15 00:22:37 +00:00
unvariant
9d98cd9e58 Render item drops instead of placeholder textures 2022-02-14 02:09:45 +00:00
jshipsey
2eee43865f chieftain anims 2022-02-11 02:18:48 -05:00
Sam
0031aa6f5f Chieftain AI and attacks 2022-02-10 14:58:35 -05:00
jshipsey
0c788997a4 anims 2022-02-10 14:58:34 -05:00
Sam
e044bf5091 Mandragora attacks and ai 2022-02-10 14:58:32 -05:00
Sam
82c976919e Darts are now darts. 2022-02-10 14:58:29 -05:00
Joshua Barretto
6263942041 Merge branch 'slipped/site2' into 'master'
new entities, frostpines

See merge request veloren/veloren!3193
2022-02-10 01:59:20 +00:00
jshipsey
786ae39fb4 new entities 2022-02-09 20:10:59 -05:00
jshipsey
6f8cadc847 wall contact, run anim tweaks 2022-02-09 19:34:22 -05:00
jshipsey
7827797106 weapon tweaks 2022-01-30 01:10:13 -05:00
jshipsey
4fbd3027a1 new mobs 2022-01-28 02:50:15 -05:00
floppy
fb316e8f66 SeaCrocodile spawning in tropical Oceans 2022-01-24 19:36:13 +01:00
Joshua Barretto
53574bb6ec Tweaked lantern offsets 2022-01-19 20:08:13 -05:00
Snowram
f6d7ba33ef Arthropods spawns and loots 2022-01-19 19:01:16 +01:00
Snowram
fd3ed89899 More arthropod animations 2022-01-19 19:01:15 +01:00
Snowram
02ed6ffd60 More arthropod work 2022-01-19 19:01:13 +01:00
Snowram
ae71f2e4f0 Adds poisoned debuff (energy change over time) 2022-01-19 19:01:13 +01:00
Snowram
fa549eece7 Adds new arthropod species 2022-01-19 19:01:12 +01:00
Snowram
f67bf2a539 Adds arthropod skeleton 2022-01-19 19:01:11 +01:00
jshipsey
475fc1631f akhlut 2022-01-13 23:20:58 -05:00
jshipsey
1fac6359de more gnarling weapons 2022-01-13 23:20:56 -05:00
jshipsey
7f928d0bc0 woodengolem, chieftain, icedrake, blowgun 2022-01-13 23:20:52 -05:00
Samuel Keiffer
4d85ae4f60 Merge branch 'ubruntu/dagger-ux' into 'master'
Dagger UX

See merge request veloren/veloren!3072
2021-12-28 22:09:34 +00:00
ubruntu
65f9d18fb7 Dagger UX 2021-12-28 22:09:34 +00:00
DoctorKompot
5a196f1684 another shot at fixing turbans 2021-12-27 03:01:25 +02:00
DoctorKompot
d312452941 changed Magic Lantern kind: to "Magic" 2021-12-27 03:01:24 +02:00
DoctorKompot
44f6e3888b updated mortar and pestle, fixed GR and cheese rotation, fixed offsets of Pfau's turbans 2021-12-27 03:01:21 +02:00
DoctorKompot
1cc69bbca1 fixed Pfau's turbans and manually added back mod.rs files that got deleted previously 2021-12-27 03:01:19 +02:00
DoctorKompot
9eedb024fe added new cheese, glowing remains and mortar and pestle files, updated collar and mushroom curry 2021-12-27 03:01:18 +02:00
DoctorKompot
e83446811a fixed apple offset 2021-12-27 03:01:16 +02:00
DoctorKompot
ca93284294 updated sewing set, ice shard and sunflower tea models with the ones provided by Gemu 2021-12-27 03:01:13 +02:00
DoctorKompot
1060693d16 changed the scaling and offset of some items, replaced Raptor feather, sunflower tea, ice shard and sewing set PNGs with .vox files, updated the image manifest 2021-12-27 03:01:10 +02:00
DoctorKompot
7fb9ac121e updated item models with the ones provided by Gemu, (bags and food), some leather items, and honey, then updated item_image_manifest and sprite_manifest accordingly 2021-12-27 03:01:09 +02:00
DoctorKompot
0242552492 added mushroom stick, changed apple and apple stick models, made phoenix feather legendary rarity 2021-12-27 03:01:07 +02:00
DoctorKompot
84b85d6ae5 fixed coconut, added apple stick 2021-12-27 03:01:06 +02:00
DoctorKompot
daad02ae60 changed the index from the highlight color of these necklaces, since the voxels were invisible in-game 2021-12-27 03:01:04 +02:00
DoctorKompot
ac15e556f5 added vox files for apple, coconut, collar, mushroom curry and admin tabard, update item image manifest accordingly 2021-12-27 03:01:02 +02:00
DoctorKompot
e5408c69b5 changed color of MF bag to a darker tone 2021-12-27 03:01:00 +02:00
DoctorKompot
d7ddb3ae04 updated bag displays 2021-12-27 03:00:59 +02:00
DoctorKompot
3c60bd1929 made lanterns slightly brighter, changed lantern color for green and red to match their names, changed display of Common items to fit the item frames of other qualities, updated item image manifest 2021-12-27 03:00:54 +02:00
Youssef Fahmy
04a37ba29c Christmas tweaks 2021-12-21 22:58:41 +00:00
Christof Petig
f3c1a69b12 make christmas wreaths hang to the wall, not float [ci skip] 2021-12-20 18:09:42 +00:00
Christof Petig
cbd2a422f3 Add Chrismas wreath (25% chance) and make the towns go wild with illumination 2021-12-20 18:06:58 +00:00
Christof Petig
47a6cf8ee3 Add Sarra_Kitty's Christmas wreath model [ci skip] 2021-12-20 18:06:58 +00:00
Christof Petig
920874146a remove the unintended black pixels at the bottom point [ci skip] 2021-12-20 18:06:58 +00:00
Christof Petig
c695d607d3 revise the snowflake shape [ci skip] 2021-12-20 18:06:57 +00:00
Christof Petig
201101c059 Add glowing christmas ornaments 2021-12-20 18:06:57 +00:00
Christof Petig
f097be4366 correct hanging star orientation 2021-12-20 18:06:57 +00:00
Christof Petig
207943aaa6 The snowflake is less deep than the star 2021-12-20 18:06:57 +00:00
Christof Petig
343ad8dfd9 Add mounting to Ornaments 2021-12-20 18:06:56 +00:00
Christof Petig
a314afdf04 Glowing snowflake model (Xmas decoration) 2021-12-20 18:06:55 +00:00
Christof Petig
1877bd5a57 Moravian Star (Xmas) decoration 2021-12-20 18:06:55 +00:00
UncomfySilence
065da20812 + Finished hat offsets for all races
+ Villagers only wear christmas hat
+ Guards wear boreal_warhelm
+ Gave guards christmas color lanterns
+ Grave_robbers now wear hood and hood_dark too while also dropping them at a higher rate than previously.
+ Christmas event now starts at 20th and goes till 30th of december
+ item_image_manifest.ron manifest fix
+ Created a potential boss loot table which allows the player to get the winter_cap, the boreal_warhelm, polaris lantern, and more blue cheese.
+ Updated hood_dark with another index 17 layer to prevent hair clip.
2021-12-20 18:06:21 +00:00
UncomfySilence
f9b4b55494 + working on hat offset 2021-12-20 18:06:21 +00:00
floppy
ff4c0460e6 - add Polaris Lantern, created by Gemu and Uncomfy for Christmas 2021-12-20 18:06:21 +00:00
floppy
aa81f2522d - add Polaris Lantern, created by Gemu and Uncomfy 2021-12-20 18:06:21 +00:00
UncomfySilence
e70fd8d397 + Added Gemu models
+ Created manifest files for each
+ Created stats and other needs
+ Changed Event date from (24..=25) to (20..=30)
2021-12-20 18:06:19 +00:00
UncomfySilence
d641245388 + Added updated blue_cheese model. 2021-12-20 18:03:52 +00:00
UncomfySilence
c2bf1a5345 + Created common.loot_tables.event directory for special item drop changes or for potential bosses.
+ Made yeti boss have a 5% chance to spawn in snow biomes.
+ New yeti entity has ~28.5% chance to drop 1 to 10 exclusive blue cheese, ~57.1% to drop 1 to 3 coal, and ~14.2% chance to drop 1 diamond.
+ Blue cheese heals 60hp over 20 seconds.
+Blue cheese has item_image_manifest and other necessities completed. (Model is current placeholder until Gemu or Hannibal have approved)
2021-12-20 18:03:52 +00:00
Monty Marz
ec07dbb05e Merchant Outfit 2021-11-18 16:31:12 +00:00
Oolnokk
5643cea4ba The long orc beard was painted with index 17 thus rendering parts invisible after the hat update, creating an infamous 'goatee' look. Copied the colors to much higher indexes, and now it looks as intended ingame. 2021-11-13 19:08:06 -05:00
Joshua Barretto
c0bf9503bd Addressed review issues, added cloning docs to BodySpec::Manifests 2021-11-13 17:20:23 +00:00
Joshua Barretto
edf9c59e7d Added bomb sprites 2021-11-13 17:12:16 +00:00
Joshua Barretto
dbfbdcdacd Added golf club 2021-11-13 17:11:02 +00:00
Benjam Soule H. Walker
9011ed3a77 Update assets/voxygen/voxel/armor/misc/head/wanderers_hat.vox 2021-11-13 16:30:03 +00:00
Oolnokk
c6383ca5a4 Models have been cleaned up and approved by Gemu 2021-11-12 18:46:01 -05:00
DemonicOnPc
b7ac542ebb fixes to branch after my whoops 2021-11-08 17:09:19 -05:00
DemonicOnPc
7fc57c027b Fixes to jungle sprites and lillypads 2021-11-08 17:09:15 -05:00
DemonicOnPc
c6dd425203 Update sprite_manifest.ron 2021-11-08 17:09:12 -05:00
DemonicOnPc
9514cd71c6 Jungle and River update
-Added Lillypads to rivers
-Added new types of reeds
-Added reeds to water
-Added more Ferns/Flowers/Plants to jungles
2021-11-08 17:09:11 -05:00
Oolnokk
b6f137bb7a Changes to formatting 2021-10-31 23:49:46 -04:00
Oolnokk
3618a0e5f5 Changes to formatting 2021-10-31 23:44:29 -04:00
Oolnokk
b67558c1ba 2 new beards, four new hairstyles and 1 new eye option for dwarf males 2021-10-31 22:58:25 -04:00
jshipsey
b1e9d9664b adjust models, last fixes 2021-10-30 23:42:18 -04:00
jshipsey
f69e3c9fbc more hats 2021-10-30 23:42:17 -04:00
jshipsey
97a3c1e713 simple hats 2021-10-30 23:42:15 -04:00
jshipsey
5cc54b34bd headbands 2021-10-30 23:42:13 -04:00
Evelyn
91477f7a5c Add new gliders 2021-10-30 20:48:04 +00:00
Monty Marz
727295aec1 text and alignment WIP 2021-10-27 17:02:35 -04:00
Monty Marz
a97cc95496 crafting station model, explanatory text part 1 2021-10-27 17:02:34 -04:00