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
Monty Marz
7aae35f286
bench
2021-10-27 17:02:31 -04:00
Doctor Kompot
51f8aa06df
DoctorKompot - New Necklaces
2021-10-22 05:24:20 +00:00
Monty Marz
14ed73ec12
cavern sprites
2021-10-10 13:41:56 +01:00
Seth
d42d9166a1
Reduce duplication in glider asset identifiers
2021-09-26 13:49:49 +00:00
Snowram
9acae9fca0
More wyvern anim work
2021-09-21 15:30:42 +02:00
Snowram
834749353a
Adds flame wyvern npc
2021-09-21 15:30:42 +02:00
Monty Marz
1d94adc2e1
0.11 Background images and more
2021-09-10 08:34:01 +00:00
jshipsey
523a15e5cc
more spots
2021-09-04 00:18:58 -04:00
Monty Marz
13c15b3840
fix witch hut smoke
2021-08-30 12:03:13 +02:00
Monty Marz
7ced7e184e
witch lantern
2021-08-28 14:53:31 +01:00
Monty Marz
a8aaeaebec
emergency single voxel window fix
2021-08-28 14:53:30 +01:00
Monty Marz
771a380e6c
witch stuff
2021-08-28 14:53:30 +01:00
Monty Marz
14eb0f9aa2
Remove sceptre, add swords
2021-07-29 22:38:35 +00:00
Snowram
09cbb90f61
Make the mounter animations dependant of the mountee animation
2021-07-18 15:03:57 -04:00
Avi Weinstock
13fc4de561
Add per-species head offsets.
2021-07-16 19:22:28 -04:00
Avi Weinstock
0a33c98268
Basic implementation of hat visuals.
2021-07-16 18:49:40 -04:00
Monty Marz
7c8d73a0c6
Minimap modes, Danari customizations update & bald hairstyles
2021-07-08 00:01:08 +00:00
juliancoffee
21a29ecf74
Add CorruptionSpores
...
- New lootable food which you can find as husk or darkhound drop
2021-06-30 03:33:06 +03:00
Justin Shipsey
f983295318
Merge branch 'swilliams/jewellery' into 'master'
...
Gem Rings and small change to trading.
See merge request veloren/veloren!2500
2021-06-26 02:44:04 +00:00
Scott Williams
8d0a1ad7b4
Gem Rings and small change to trading.
2021-06-26 02:44:02 +00:00
Snowram
379e755006
Increases base damage of husk attack, rename some cultist weapons
2021-06-25 21:18:28 +02:00
Snowram
d7f25627ab
Ajustments to new npcs
2021-06-24 19:31:21 +02:00
Snowram
8760b69345
Husk brute animations
2021-06-24 19:31:19 +02:00
Snowram
58b95d12d4
Adds alpaca and llama npcs
2021-06-24 19:30:15 +02:00
Snowram
fef0f407d3
Removes warlord and warlock armours
2021-06-24 19:30:11 +02:00
Snowram
87ca00fac0
Adds new species
2021-06-24 19:29:44 +02:00
Sam
ed503236d6
Slightly functional sprite summon.
2021-06-23 22:38:16 -05:00
Snowram
97ce50e5d4
Add troll variants and roc npcs
2021-06-15 09:49:13 +02:00
Monty
c17e3ad996
Cactus Colada
...
Made cacti lootable
Cactus colada recipe and item
price balance
fmt
"make it 8 and drop it to 20 or 25? Not really sure tbh"
2021-06-13 13:52:56 +02:00
jshipsey
4deeb42155
cave adjustments
2021-06-07 11:02:34 +02:00
jshipsey
1d23b7aebf
finalize stats
...
t
2021-06-07 11:02:03 +02:00
jshipsey
9034d0f25d
comment addressing, cave tweaks
2021-06-07 11:01:46 +02:00
jshipsey
5fdb2ac01d
migration
2021-06-07 11:01:04 +02:00
jshipsey
7a573efab7
proper recipes, tanning racks, various fixes
2021-06-07 11:00:14 +02:00
jshipsey
8acd3832e3
more loot tables, overworld ores, more items
2021-06-07 11:00:00 +02:00
jshipsey
05de96c94b
ore deposits, flower drops
2021-06-07 10:59:50 +02:00
jshipsey
1c17d8fe5e
cave changes
2021-06-07 10:59:44 +02:00
jshipsey
754b60d810
crafting stations
2021-06-07 10:59:35 +02:00
jshipsey
58bd51a9e8
icon work, more models
2021-06-07 10:58:27 +02:00
jshipsey
18e9b5b890
recipes, re-organization, cleanup
2021-06-07 10:58:05 +02:00
jshipsey
74fbe9a123
cloth/metallic armor
2021-06-07 10:56:54 +02:00
jshipsey
ffc9a0ae22
more drops, armors
2021-06-07 10:56:16 +02:00
jshipsey
f387b8d259
hides/leathers
2021-06-07 10:56:04 +02:00
jshipsey
451ccf8d73
more meat
2021-06-07 10:55:50 +02:00
jshipsey
ca907f1b87
added some meat
2021-06-07 10:55:34 +02:00
Marcel
521e1eacf3
Merge branch 'aweinstock/add-models-20210603' into 'master'
...
Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty.
See merge request veloren/veloren!2371
2021-06-06 16:56:21 +00:00
Snowram
edfe713076
Cyclops, basilisk, air balloon offsets
2021-06-06 14:12:08 +02:00
Sam
81f7e690fd
Snowball attack.
2021-06-04 18:17:15 -05:00
Sam
5bf99eac11
Added totem ability, totem ai, totem ability set, particles for totem abilities, and totem voxel model.
2021-06-03 21:39:15 -05:00
Avi Weinstock
05c699878f
Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty.
2021-06-03 19:24:34 -04:00
juliancoffee
940655dcb6
Adding different chests for each dungeon
2021-05-24 23:00:44 +03:00
Monty Marz
30bcc6aaa3
Ferocious armour for t5-dungeon minibosses
2021-05-22 10:55:36 +00:00
Marcel
7d5ca0e7bf
Revert "Merge branch 'snowram/hacky-mount' into 'master'"
...
This reverts merge request !2219
2021-05-14 13:43:20 +00:00
Snowram
8745fb803a
Use Body to determine mountee offsets
2021-05-14 00:11:54 +02:00
jshipsey
770d07ac90
anims
2021-05-10 18:54:03 -05:00
Snowram
47a2bf7de8
Adds haniwa sentry object
2021-05-10 18:53:48 -05:00
Sam
5fa4358e74
Clay golem attacks done.
2021-05-10 18:53:01 -05:00
Monty Marz
fab3794bf3
Fix 1h-axes
2021-05-10 20:44:09 +00:00
Snowram
ec3fa365d0
Fixes object manifest
2021-05-07 22:04:57 +02:00
Snowram
831bfd0be9
Snowram/craft mats
2021-05-07 17:03:45 +00:00
jshipsey
c886accaf1
anims
2021-05-04 08:45:08 -04:00
Sam
91bb6392bb
Removed old 2h variants of 1h weapons.
2021-04-29 13:18:04 -04:00
Ludvig Böklin
34660462e9
Glider physics
2021-04-27 14:41:48 +00:00
Snowram
8f54a0bf31
More phoenix AI work
...
More phoenix AI work
2021-04-25 04:07:12 +02:00
Snowram
8cf8e51962
Phoenix npc + AI (WIP)
2021-04-25 04:07:11 +02:00
Snowram
ab26efa970
Improves bird_large anims
2021-04-25 04:07:09 +02:00
Snowram
fd177c9669
Breathe and stun anims
2021-04-25 02:14:50 +02:00
Snowram
eb98360183
Cockatrice bird_large conversion
2021-04-25 02:14:50 +02:00
Snowram
bc95484863
Swaps bird_small skeleton to a new bird_large
2021-04-25 02:14:49 +02:00
Monty Marz
b69eb61e7b
Add handles to lanterns, fix cooking pot scale
2021-04-22 17:12:07 +00:00
Monty
a4d56e7843
more sprite stuff and crafting UI update
...
fix item images
fix CR display
2021-04-20 02:46:06 +02:00
Monty
a1fe7c12c3
fmt, add sprites
2021-04-20 02:46:04 +02:00
jshipsey
ea9b871374
loot tables, clippy, animation tweaks
2021-04-13 20:18:59 -04:00
jshipsey
9a26024acb
alpha attacks
2021-04-13 20:18:59 -04:00
jshipsey
b53e1653f6
initial wield testing
2021-04-13 20:18:58 -04:00
Monty Marz
6772e71aaa
UI fixes and more
2021-04-11 03:49:47 +00:00
Samuel Keiffer
8d9f63404e
Merge branch 'sam/combat-ratings' into 'master'
...
Tweaks to Combat Rating Calculation
See merge request veloren/veloren!2051
2021-04-03 17:33:34 +00:00
Sam
ca1a93ba21
Actually committed bone staff fix.
2021-04-03 10:26:32 -04:00
Sam
27f178286d
Removed all rng matches in code to determine loot tables, and moved to loot tables specific for each sprite, creature, or dungeon.
2021-04-02 23:24:55 -04:00
Snowram
606dd64741
Fix a staff icon, some offset fixes, lower wolf spawn rate
2021-03-30 00:27:03 +02:00
Sam
f6e4626887
Fix emerald sceptre. Remove duplicate asset.
2021-03-28 21:19:01 -04:00
Snowram
5295894105
Add new batch of starves and scepter (by Gemu)
2021-03-29 01:27:55 +02:00
jshipsey
558c82ee54
flayer anims
2021-03-27 21:05:16 -04:00
Sam
50e832b6d0
Mindflayer summons husks instead of dogs now
2021-03-27 21:05:10 -04:00
Snowram
39c8efe11f
Adds husk npc
2021-03-27 21:05:09 -04:00
Lippy13
ff2583b3b9
Add missing seashells to the sprite manifest
2021-03-25 04:37:27 +00:00
Joshua Barretto
347e1022a0
Initial implementation of pickaxe
2021-03-21 16:09:16 +00:00
Snowram
cb3bf0c884
Fix a missing dwarf hairstyle
2021-03-19 12:45:08 +01:00
Snowram
e5afb2fcf7
Various visual fixes
2021-03-18 22:53:06 +01:00
Sarra
eaaf65127d
cleaning up some tools
2021-03-18 22:52:50 +01:00
Sarra
d1e16a2a00
tweaking glow and shine
2021-03-18 22:52:40 +01:00
Monty Marz
e9cbac387e
new loading bg, staff models
...
item images
fix paths
loot tables, adjustments
Update main.ron
2021-03-16 23:23:24 +00:00
Snowram
60dd47cdea
Theropod charge attack
2021-03-14 18:10:40 +01:00
Snowram
9d7e8957bb
Add new npcs
2021-03-14 14:24:35 +01:00
jshipsey
49f496e290
intitial values
2021-03-12 00:58:12 -05:00
Joshua Barretto
09e32cb952
Initial implementation of glow/shininess
2021-03-10 18:58:25 +00:00
Marcel
e29964ead1
Merge branch 'sarrakitty/fireworks' into 'master'
...
added a white firework
See merge request veloren/veloren!1856
2021-03-07 18:37:35 +00:00
Joshua Barretto
0c302bb020
Lanterns in trees
2021-03-07 14:25:01 +00:00
Sarra
db3bc1b9bb
added a white firework
2021-03-07 03:48:50 -05:00
Snowram
2b7b9f887b
Fixes leather sets
2021-03-02 19:28:29 +01:00
jshipsey
308045cfc9
final asset corrections, fix glider anim
2021-03-01 17:37:47 -05:00
jshipsey
8944115f8e
more asset organization
2021-02-28 22:18:43 -05:00
jshipsey
16720a6826
weapon/manifest tweaks
2021-02-27 10:44:55 -05:00
jshipsey
0a353576dc
address comments
2021-02-27 01:42:47 -05:00
Snowram
17112926e7
Adds harvester npc
2021-02-27 01:42:47 -05:00
jshipsey
51bc74b2a5
visual weapon variation, adjust minotaur dash, keyframed golem quake
2021-02-27 01:42:47 -05:00
jshipsey
16a44cd532
minotaur moves, added claygolem
2021-02-27 01:42:47 -05:00
jshipsey
e06ebf3507
initial balance
2021-02-27 01:42:47 -05:00
Snowram
858fbe1a6c
Adds yeti npc
2021-02-27 01:42:46 -05:00
Snowram
1b9815dc34
Adds 3 new npcs, tusk ram new design
2021-02-27 01:42:46 -05:00
jshipsey
ce3b2141e1
theropod retrofit, some more moves
2021-02-27 01:42:46 -05:00
jshipsey
5792faa992
some new moves, combine biped weapons into one file
2021-02-27 01:42:46 -05:00
jshipsey
57d5e90ddd
full bipedsmall armor swaps
2021-02-27 01:42:46 -05:00
jshipsey
cb59c8017e
anim tweaks, more loadout setup
2021-02-27 01:42:46 -05:00
jshipsey
aa4237b019
BL improvements, various fixes
2021-02-27 01:42:45 -05:00
jshipsey
0dc8b2e482
rendering
2021-02-27 01:42:45 -05:00
jshipsey
ca3248cc93
new dungeon setups, new npcs, weapon specific loadouts, anims
2021-02-27 01:42:45 -05:00
jshipsey
ac16a8900d
bow
2021-02-27 01:42:45 -05:00
jshipsey
66664f3f89
the stabs
2021-02-27 01:42:45 -05:00
jshipsey
6a57dd25d0
wielding
2021-02-27 01:42:45 -05:00
jshipsey
31208e29ee
run anim tweaks
2021-02-27 01:42:45 -05:00
unknown
559ece5ede
More npcs work
2021-02-27 01:42:45 -05:00
unknown
6f18d16aa2
Add new quadmeds npcs with rough offsets
2021-02-27 01:42:44 -05:00
Snowram
f48fea57f4
Sahagin, Adlet npcs
2021-02-27 01:42:43 -05:00