Avi Weinstock
7b0dcad68f
Generate palette info from block statistics, and benchmark how well it compresses.
2021-06-28 22:11:19 -04:00
Snowram
eb0a8efad1
Merge branch 'snowram/death-outcome' into 'master'
...
Adds an outcome to death with SFX and VFX
See merge request veloren/veloren!2519
2021-06-28 23:18:45 +00:00
Snowram
64045ed7bd
Adds an outcome to death with SFX and VFX
2021-06-29 00:14:05 +02:00
Dr. Dystopia
a47780fdc8
Extract 'swap_equipment' and 'swap_armor' functions
2021-06-28 16:17:18 +02:00
Marcel
9e47c177d2
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
1c7c70c1bf
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
641aa921bf
style
2021-06-27 02:44:19 +03:00
juliancoffee
f533e3433c
Add is_recycling field to recipe book
2021-06-26 21:37:13 +03:00
Daan Vanoverloop
7d39c14481
Fixing #1169 - use strum macros for BlockKind conversion
2021-06-26 17:52:32 +02:00
Benoît du Garreau
ab3c8cf764
Update assets_manager to 0.5
2021-06-26 12:05:40 +02:00
Justin Shipsey
dbc3243691
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
14f16a3a47
Gem Rings and small change to trading.
2021-06-26 02:44:02 +00:00
Joshua Barretto
9c746f7867
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
a81c71b461
Increases base damage of husk attack, rename some cultist weapons
2021-06-25 21:18:28 +02:00
Avi Weinstock
f74506038d
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
3b393a9c5c
Ajust new npcs from feedback
2021-06-25 03:26:32 +02:00
Snowram
f518aebe81
Ajustments to new npcs
2021-06-24 19:31:21 +02:00
Snowram
38c9ff5225
Husk brute animations
2021-06-24 19:31:19 +02:00
Snowram
080328941b
Adds alpaca and llama npcs
2021-06-24 19:30:15 +02:00
Snowram
78afaf32a2
Removes warlord and warlock armours
2021-06-24 19:30:11 +02:00
Snowram
21b526856d
Adds new species
2021-06-24 19:29:44 +02:00
Sam
cd1ede0131
Balance tweaks.
2021-06-23 22:38:37 -05:00
Sam
4d5ab5c374
Added sparseness field to sprite summon.
2021-06-23 22:38:16 -05:00
Sam
e93c981ed5
Balance tweaks for harvester.
2021-06-23 22:38:16 -05:00
Sam
5dc1f8f8ae
Added ensnared debuff icon.
2021-06-23 22:38:16 -05:00
Sam
d93d0aa4f5
Vines now ensnare you by applying a buff.
2021-06-23 22:38:16 -05:00
Sam
cc748c0a3f
Ensnaring vines now ensnare you.
2021-06-23 22:38:16 -05:00
Sam
c326df0b88
Slightly functional sprite summon.
2021-06-23 22:38:16 -05:00
Snowram
129b6cb30c
3 attack anims done
2021-06-23 22:38:16 -05:00
Sam
7406e557e8
3 attacks done
2021-06-23 22:38:16 -05:00
Avi Weinstock
fc2d0225d3
Add Primitive::Prefab and Fill::Prefab for coloring dungeon entrances.
2021-06-23 23:22:14 -04:00
jshipsey
50df5a7fca
stride speed backwardd-dependence
2021-06-22 22:08:34 -04:00
Dominik Broński
1d55cb9c15
Merge branch 'aweinstock/lava' into 'master'
...
Lava
See merge request veloren/veloren!2482
2021-06-21 20:49:44 +00:00
Joshua Barretto
2cebfa7db5
Sanitise controller inputs
2021-06-21 21:13:49 +01:00
Joshua Barretto
e210ced4f0
Made movement slower when strafing in non-forward directions
2021-06-21 20:32:20 +01:00
Joshua Barretto
8e13e53abb
Enable strafing in first-person mode
2021-06-21 13:27:19 +01:00
Marcel
5288b2982e
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
1de3dd515c
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
326ecf868c
Added another .replace
2021-06-20 22:55:58 +01:00
Avi Weinstock
5662ba98b8
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
a831a4fb69
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
e09c5adc02
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
0c85a4e7ea
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
156e2e86b5
Remove tracy features that are no longer needed now that macros have been fixed
2021-06-19 04:27:50 -04:00
Imbris
fa5b3dead5
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
08ae31fb8b
tweak clay_golem HP
2021-06-19 10:47:45 +03:00
Samuel Keiffer
d3195b4ead
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
6949716649
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
97167a94d0
Load ori_rate for BasicBeam from assets
...
+ make fire turret ori_rate slower
2021-06-18 22:33:00 +03:00
juliancoffee
9bffa6f9e1
use bg_main.jpg instead of bg_main.png
2021-06-18 20:41:18 +03:00
