b96bb6fc5d
Added combo scaling to healing aura and allowed cultists to use it
2021-07-10 20:02:36 -07:00
b4ec433509
Add healing aura for sceptre M2
2021-07-10 20:02:35 -07:00
286037166a
Update wasmer
2021-07-10 15:06:51 +02:00
351a68944b
Merge branch 'juliancoffee/skill_truth' into 'master'
...
Move skill boost modifiers to skills module
See merge request veloren/veloren!2540
2021-07-09 23:05:48 +00:00
32c2807ee0
Merge branch 'swrup/fix_melee_hit_count_increment' into 'master'
...
fix melee hit_count increment
See merge request veloren/veloren!2574
2021-07-09 16:17:51 +00:00
02151417f2
fix melee hit_count increment
2021-07-09 16:17:51 +00:00
c5c89e8662
Added check to prevent melee leaps from stalling in liquids
2021-07-08 23:52:00 -07:00
a8579670cf
make apply_attack() return if attack was actually applied
2021-07-08 21:05:32 +02:00
98800c5424
update depednencies
2021-07-08 12:21:02 +02:00
e6af005ed1
Merge branch 'pfau/stuff' into 'master'
...
Minimap modes, Danari customizations update & bald hairstyles
See merge request veloren/veloren!2576
2021-07-08 00:01:09 +00:00
7c8d73a0c6
Minimap modes, Danari customizations update & bald hairstyles
2021-07-08 00:01:08 +00:00
066e0a0323
Revert non-ui code changes
2021-07-07 17:53:17 +03:00
034b032954
Add tests
2021-07-07 17:51:30 +03:00
274acae939
Move skill boost modifiers to skills module
2021-07-07 17:51:30 +03:00
509461763b
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
2021-07-06 22:54:23 -05:00
01a8f53ba3
Merge branch 'aweinstock/improve-airship-pid' into 'master'
...
Fix integral error calculations in PID controller, and change coefficients for...
See merge request veloren/veloren!2568
2021-07-06 21:38:07 +00:00
e5a5d28246
Merge branch 'sam/range-stat' into 'master'
...
Added range stat to weapons.
See merge request veloren/veloren!2563
2021-07-06 21:18:47 +00:00
1a60ebd5db
Fix integral error calculations in PID controller, and change coefficients for airship and hot air balloon.
2021-07-06 16:52:12 -04:00
1c3bd13afa
Addressed review comments. Removed individual stat assignments.
2021-07-06 15:27:49 -05:00
e8e953ffab
Added range stat to weapons.
2021-07-05 20:32:12 -05:00
110b9742b7
Add a feature to optionnally disable hot-reloading
2021-07-06 00:27:09 +02:00
572a41b029
Merge branch 'juliancoffee/trade_rebalancing' into 'master'
...
Make trade_pricing great again
See merge request veloren/veloren!2546
2021-07-05 21:40:58 +00:00
15d83e65cc
Remove load_expect_dir as it's misused
...
- load_expect_dir while expected to fail on erros, fails only on
filesystem errors and only on root directory.
This commit replaces this function with `read_expect_dir` which returns iterator
which loads all files and panics if can't load them.
2021-07-05 20:14:26 +03:00
1e358e6f0c
Make ItemEquality work
...
+ Create own directory for trade_pricing `assets/common/trading`
+ Move fictive loot tables there
+ Mark sellable/non-sellable items in trade_pricing tests
2021-07-05 19:55:08 +03:00
f213ba138a
Fill trade_pricing with craftable items
2021-07-05 15:43:03 +03:00
3804c3d032
Implemented trading stackable items with a full inventory
2021-07-05 10:34:03 +00:00
d4c61ae2f3
(voxygen) Better support for multibuff items
...
+ change `effect` field in ItemKind::Consumable to `effects`, as it's
set of effects and not single effect.
2021-07-05 10:56:29 +03:00
c538a9696c
Use Food after Buildup
...
+ Remove Saturation effect by rolling
+ Remove Saturation effect if interrupted with poise
+ Rename Potion to Drink, add ComplexFood
2021-07-05 10:56:29 +03:00
21523de394
Merge branch 'sam/fix-roll' into 'master'
...
Fix first person backwards roll.
See merge request veloren/veloren!2558
2021-07-05 03:46:47 +00:00
1020fbe86a
Merge branch 'sam/fix-health-buffs' into 'master'
...
Fix interaction of max health and max health over time buffs causing infinite health scaling.
See merge request veloren/veloren!2557
2021-07-05 03:46:45 +00:00
d8f68668b1
Addressed potential for divide by zero.
2021-07-04 22:00:13 -05:00
d2cb0c76a7
Fix first person backwards roll.
2021-07-04 21:54:38 -05:00
4ac9d9e0a5
Fix interaction of max health and max health over time buffs causing infinite health scaling.
2021-07-04 21:43:29 -05:00
4bc54e0287
Fix oob panic in combo melee which can happen during desyncs.
2021-07-04 20:54:08 -05:00
5da8c70f48
Merge branch 'aweinstock/sprite-collectible-refactoring' into 'master'
...
Deduplicate data involved in sprite harvesting, making it harder to make mistakes with.
See merge request veloren/veloren!2542
2021-07-04 17:23:53 +00:00
f0f64a9fc0
Merge branch 'juliancoffee/fix_test_parse_ron' into 'master'
...
Split asset_tweak tests to separate command
See merge request veloren/veloren!2552
2021-07-04 17:14:14 +00:00
33a37a8857
Run asset_tweak tests separately
...
+ Make parse_all_ron_files_to_value panic-friendly. Remove unwraps
to unwrap_or_else with panic message.
2021-07-04 19:31:57 +03:00
b499cf2c58
Added egui debug UI - a 100% rust UI framework (similar to imgui) allowing for rapid development of debug interfaces to aid development. This is feature-gated behind the egui-ui feature which is enabled by default but removed for airshipper builds.
...
Included in the initial implementation is an entity browser which lists all entities in the client ECS, an entity component viewer which shows select components belonging to the selected entity including character state information, and a simple frame time graph.
This MR also includes an extraction of the animation hot reloading code which has been reused for egui to allow for hot-reloading of the egui interface to allow rapid development of the UI with realtime feedback upon save as is the case with aninmations. This is feature-gated behind the `hot-egui` feature which is not enabled by default due to the extra startup time that it adds.
2021-07-04 09:47:18 +00:00
836f10ae63
Remove allocation in SpriteKind::collectible_id.
2021-07-03 15:32:36 -04:00
4f66bff54a
Fix #1158 - Add a test that all the .ron manifests parse
2021-07-03 18:11:04 +00:00
a9767c40d1
Merge branch 'aweinstock/networktracy' into 'master'
...
Add some tracy plots about network usage to the client.
See merge request veloren/veloren!2510
2021-07-03 05:44:30 +00:00
b4c2bc14df
Deduplicate data involved in sprite harvesting, making it harder to make mistakes with.
2021-07-02 15:23:19 -04:00
c751ec1381
Merge branch 'aweinstock/blockstats' into 'master'
...
Add block statistics generator to world/examples.
See merge request veloren/veloren!2526
2021-07-02 17:10:26 +00:00
c2106e158f
Use approximate byte count for the terrain recv graph.
2021-07-02 12:43:34 -04:00
f9c263faf6
Add benchmark for color quantization using the rtree crate.
2021-07-01 13:41:37 -04:00
099ddea165
Merge branch 'juliancoffee/dungeon_rebalance' into 'master'
...
Make cultist great again
See merge request veloren/veloren!2513
2021-07-01 02:37:39 +00:00
110aa17642
Fix underwater campfires.
2021-06-30 18:36:43 -04:00
398b658524
Merge branch 'juliancoffee/better_item_tests' into 'master'
...
More informative item tests
See merge request veloren/veloren!2534
2021-06-30 20:12:21 +00:00
d92d54f8ad
Better error signaling in assets::load_dir_expect
2021-06-30 21:06:06 +03:00
a3bf073875
Use assets::load_dir to test item assets
2021-06-30 18:48:28 +03:00
