Avi Weinstock
f9c263faf6
Add benchmark for color quantization using the rtree crate.
2021-07-01 13:41:37 -04:00
Avi Weinstock
47b3b5e5d9
Generate palette info from block statistics, and benchmark how well it compresses.
2021-06-28 22:11:19 -04:00
Marcel
f063dcd939
Merge branch 'alphyr/assets_manager0_5' into 'master'
...
Update `assets_manager` to 0.5
See merge request veloren/veloren!2501
2021-06-27 15:50:16 +00:00
Snowram
b477eac816
Merge branch 'juliancoffee/fix_dismantle' into 'master'
...
Improve Dismantle UX
See merge request veloren/veloren!2498
2021-06-27 00:11:01 +00:00
juliancoffee
681fd37429
style
2021-06-27 02:44:19 +03:00
juliancoffee
12243bd0c0
Add is_recycling field to recipe book
2021-06-26 21:37:13 +03:00
Daan Vanoverloop
0076b8379c
Fixing #1169 - use strum macros for BlockKind conversion
2021-06-26 17:52:32 +02:00
Benoît du Garreau
1cba7db9b6
Update assets_manager to 0.5
2021-06-26 12:05:40 +02: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
Joshua Barretto
768e1c0d31
Merge branch 'aweinstock/site2dungeon' into 'master'
...
Convert dungeons to site2.
See merge request veloren/veloren!2499
2021-06-25 23:06:24 +00:00
Snowram
379e755006
Increases base damage of husk attack, rename some cultist weapons
2021-06-25 21:18:28 +02:00
Avi Weinstock
19979413d5
Convert dungeon lights to CSG, tweak pillars, convert the magic circle from lava to glowing rock, make enemies spawn in dungeons, and fix clippy warnings.
2021-06-24 23:03:24 -04:00
Snowram
ef6d6563ea
Ajust new npcs from feedback
2021-06-25 03:26:32 +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
645cc60dc0
Balance tweaks.
2021-06-23 22:38:37 -05:00
Sam
f0c5ed1397
Added sparseness field to sprite summon.
2021-06-23 22:38:16 -05:00
Sam
68c6a0a495
Balance tweaks for harvester.
2021-06-23 22:38:16 -05:00
Sam
aac24ad601
Added ensnared debuff icon.
2021-06-23 22:38:16 -05:00
Sam
0a32b676c8
Vines now ensnare you by applying a buff.
2021-06-23 22:38:16 -05:00
Sam
763461ebef
Ensnaring vines now ensnare you.
2021-06-23 22:38:16 -05:00
Sam
ed503236d6
Slightly functional sprite summon.
2021-06-23 22:38:16 -05:00
Snowram
15a2fbc555
3 attack anims done
2021-06-23 22:38:16 -05:00
Sam
879aafad5c
3 attacks done
2021-06-23 22:38:16 -05:00
Avi Weinstock
c6bb61f2e6
Add Primitive::Prefab and Fill::Prefab for coloring dungeon entrances.
2021-06-23 23:22:14 -04:00
jshipsey
81aaf30d00
stride speed backwardd-dependence
2021-06-22 22:08:34 -04:00
Dominik Broński
8356e2ffca
Merge branch 'aweinstock/lava' into 'master'
...
Lava
See merge request veloren/veloren!2482
2021-06-21 20:49:44 +00:00
Joshua Barretto
e930ff6779
Sanitise controller inputs
2021-06-21 21:13:49 +01:00
Joshua Barretto
90e5bac395
Made movement slower when strafing in non-forward directions
2021-06-21 20:32:20 +01:00
Joshua Barretto
288f2c13d4
Enable strafing in first-person mode
2021-06-21 13:27:19 +01:00
Marcel
ec7d3b5e37
Merge branch 'swilliams/give_item_fix' into 'master'
...
Fix for Issue 1210
See merge request veloren/veloren!2484
2021-06-20 23:26:59 +00:00
Marcel
b0574b4ddc
Merge branch 'imbris/tracy' into 'master'
...
Refactor Client message handling, improve use of tracy, increase coverage of profiling spans in voxygen
See merge request veloren/veloren!2479
2021-06-20 23:17:08 +00:00
Scott Williams
80c45b6396
Added another .replace
2021-06-20 22:55:58 +01:00
Avi Weinstock
0f9181cbcb
Address MR 2482 comments.
...
- Change lava density to 3x water density.
- Use `ServerEvent::Buff` instead of modifying the buff component directly.
- Revert commented-out changes to fluid shaders.
2021-06-20 11:32:05 -04:00
Avi Weinstock
f1a1160b80
Make lava solid w.r.t. rendering while still being liquid w.r.t. physics.
2021-06-19 16:52:21 -04:00
Avi Weinstock
2226a4c6a9
Add lava to caves, which sets you on fire if you swim in it. Currently requires uncommenting #define LAVA in the shaders, and only looks good with cheap fluid mode.
2021-06-19 16:31:21 -04:00
Samuel Keiffer
e7f54d6306
Merge branch 'juliancoffee/clay_golem_tweak' into 'master'
...
clay golem tweak
See merge request veloren/veloren!2478
2021-06-19 14:49:11 +00:00
Imbris
659b42e813
Remove tracy features that are no longer needed now that macros have been fixed
2021-06-19 04:27:50 -04:00
Imbris
2bb91e8d7d
Fix span macros by putting cfgs outside the macro (they are evaluated in the crate where the macro is used), add shorthand for common case of prof_span macro, add some spans to the client code and spiff bits of it
2021-06-19 04:27:50 -04:00
juliancoffee
57649a2e90
tweak clay_golem HP
2021-06-19 10:47:45 +03:00
Samuel Keiffer
2abd23ec64
Merge branch 'juliancoffee/not_explodable_sprites' into 'master'
...
Proof of concept non-explodable sprites
See merge request veloren/veloren!2475
2021-06-19 01:10:20 +00:00
Samuel Keiffer
0b8039c3b0
Merge branch 'juliancoffee/trade_pricing_refactor' into 'master'
...
Refactor trade_pricing.rs
See merge request veloren/veloren!2469
2021-06-19 01:10:16 +00:00
juliancoffee
384409a1ed
Load ori_rate for BasicBeam from assets
...
+ make fire turret ori_rate slower
2021-06-18 22:33:00 +03:00
juliancoffee
9a5f749bc7
use bg_main.jpg instead of bg_main.png
2021-06-18 20:41:18 +03:00
Joshua Barretto
46dfc119fb
Merge branch 'aweinstock/tighten_e2t' into 'master'
...
Make e2t hitboxes tighter by checking the floating point coordinates before looking up voxels.
See merge request veloren/veloren!2460
2021-06-18 16:27:20 +00:00
Joshua Barretto
05c375a8b0
Merge branch 'zesterer/meta' into 'master'
...
Optimising for size
See merge request veloren/veloren!2468
2021-06-18 12:35:16 +00:00
