Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,121 Commits 151 Branches 18 Tags
Commit Graph

2956 Commits

Author SHA1 Message Date
holychowders
a1db073af5 Make Guards Defend Villagers 2021-07-14 07:40:43 +00:00
Marcel Märtens
2cb27be0c6 clippy fixes in tests 2021-07-12 13:35:26 +02:00
Marcel Märtens
e2cd431908 fmt after applying clippy fixes after toolchain update 2021-07-12 12:09:27 +02:00
Marcel Märtens
7153e8879d fix clippy warnings 2021-07-12 12:09:09 +02:00
Sam
192078c6fb Added buff strength stat to weapons. 2021-07-11 12:50:38 -05:00
Sam
61a18a671d Renamed poise_strength to effect_power to allow it to be used more generally with other weapons in the future. 2021-07-10 23:22:00 -05:00
Benoît du Garreau
2a14509640 Update wasmer 2021-07-10 15:06:51 +02:00
Samuel Keiffer
7cc4a7b593 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
Samuel Keiffer
439404988e 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
swrup
83ecf7bd32 fix melee hit_count increment 2021-07-09 16:17:51 +00:00
Knightress Paladin
b1cb8bdd1f Added check to prevent melee leaps from stalling in liquids 2021-07-08 23:52:00 -07:00
Swrup
48bf083efa make apply_attack() return if attack was actually applied 2021-07-08 21:05:32 +02:00
Marcel Märtens
e2e1f15cff update depednencies 2021-07-08 12:21:02 +02:00
Dominik Broński
3a2d615fe5 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
Monty Marz
2a1efb4b2b Minimap modes, Danari customizations update & bald hairstyles 2021-07-08 00:01:08 +00:00
juliancoffee
308348e1dc Revert non-ui code changes 2021-07-07 17:53:17 +03:00
juliancoffee
8b032d661b Add tests 2021-07-07 17:51:30 +03:00
juliancoffee
9f8faad329 Move skill boost modifiers to skills module 2021-07-07 17:51:30 +03:00
Sam
0b22953f05 Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive. 2021-07-06 22:54:23 -05:00
Samuel Keiffer
80fb4fc530 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
Samuel Keiffer
9460d76a06 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
Avi Weinstock
fdb5dedac1 Fix integral error calculations in PID controller, and change coefficients for airship and hot air balloon. 2021-07-06 16:52:12 -04:00
Sam
572072608b Addressed review comments. Removed individual stat assignments. 2021-07-06 15:27:49 -05:00
Sam
aa60081ec7 Added range stat to weapons. 2021-07-05 20:32:12 -05:00
Benoît du Garreau
ab6105d789 Add a feature to optionnally disable hot-reloading 2021-07-06 00:27:09 +02:00
Marcel
4f87576482 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
juliancoffee
63aa4219c5 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
juliancoffee
0640902b7f 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
juliancoffee
28c9ea029b Fill trade_pricing with craftable items 2021-07-05 15:43:03 +03:00
AldanTanneo
b50188d69f Implemented trading stackable items with a full inventory 2021-07-05 10:34:03 +00:00
juliancoffee
3c20c4383b (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
juliancoffee
4f75e98cfa 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
Samuel Keiffer
ac5bc5a217 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
Samuel Keiffer
dfd57d3c43 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
Sam
70cfeb3e65 Addressed potential for divide by zero. 2021-07-04 22:00:13 -05:00
Sam
ddcaf98f03 Fix first person backwards roll. 2021-07-04 21:54:38 -05:00
Sam
09d1cd68d7 Fix interaction of max health and max health over time buffs causing infinite health scaling. 2021-07-04 21:43:29 -05:00
Sam
d7e90dccd6 Fix oob panic in combo melee which can happen during desyncs. 2021-07-04 20:54:08 -05:00
Marcel
404dc50fb9 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
Marcel
f8cc483228 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
juliancoffee
5157b84f2f 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
Ben Wallis
9464a45783 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
Avi Weinstock
9aa1985172 Remove allocation in SpriteKind::collectible_id. 2021-07-03 15:32:36 -04:00
eckso
43bc40c7d5 Fix #1158 - Add a test that all the .ron manifests parse 2021-07-03 18:11:04 +00:00
Imbris
4013a10c0e 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
Avi Weinstock
aba2f232e4 Deduplicate data involved in sprite harvesting, making it harder to make mistakes with. 2021-07-02 15:23:19 -04:00
Marcel
426ed0a8cc 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
Avi Weinstock
6e525783bc Use approximate byte count for the terrain recv graph. 2021-07-02 12:43:34 -04:00
Avi Weinstock
058a832d37 Add benchmark for color quantization using the rtree crate. 2021-07-01 13:41:37 -04:00
Samuel Keiffer
70d52e9495 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