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

9121 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marcel
db9d178b92 Merge branch 'juliancoffee/small_fixes' into 'master' 
Remove `load_expect_dir` as it's misused

See merge request veloren/veloren!2560
 2021-07-05 20:57:30 +00:00
Avi Weinstock
a974f1b443 Fix spurious warning in KeyedJobs. 2021-07-05 13:52:34 -04: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
Samuel Keiffer
b4b92ecacb Merge branch 'UMR1352/fix#1223' into 'master' 
Fix issue #1223: Check if entity is alive before applying a buff

Closes #1223

See merge request veloren/veloren!2541
 2021-07-05 16:55:17 +00: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
a33900437f (fix) spawn HaniwaSentry in T3 2021-07-05 18:49:25 +03:00
juliancoffee
1f800f2b9b (fix) Use backpack item for merchant's ingredients 2021-07-05 18:49:25 +03:00
Enrico Marconi
bd503de294 Actually check if entity is alive 2021-07-05 16:09:39 +02:00
Enrico Marconi
9ec2bf9eb7 Check if entity is alive before applying a buff 2021-07-05 16:09:39 +02:00
Ács Zoltán
e278f69574 Add Hungarian translation 2021-07-05 15:14:35 +02:00
Ács Zoltán
8c72d7815f Add support for ő and ű to the haxrcorp font 2021-07-05 15:12:27 +02:00
juliancoffee
28c9ea029b Fill trade_pricing with craftable items 2021-07-05 15:43:03 +03:00
Marcel
3c1dc4c762 Merge branch 'AldanTanneo/trade_space_calculation_changes' into 'master' 
Implemented trading stackable items with a full inventory

See merge request veloren/veloren!2491
 2021-07-05 10:34:04 +00:00
AldanTanneo
b50188d69f Implemented trading stackable items with a full inventory 2021-07-05 10:34:03 +00:00
Samuel Keiffer
2f6daa47a0 Merge branch 'juliancoffee/food_rework' into 'master' 
Post-potion-animation food rework

See merge request veloren/veloren!2535
 2021-07-05 08:39:44 +00:00
juliancoffee
2eff965241 Update CHANGELOG with food rework 2021-07-05 10:57:11 +03:00
juliancoffee
da44b81d7f Bump some food duration to 10 seconds 2021-07-05 10:56:29 +03:00
juliancoffee
c89cf7eec1 Add new food to consumables /kit 2021-07-05 10:56:29 +03:00
juliancoffee
3a4ea2611d Add descriptions to the potions 2021-07-05 10:56:29 +03: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
b828492040 Rebalance food for new consumables changes 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
juliancoffee
af9a279371 Change Mortar and Pestle crafting recipe 
- Make it require bowl instead of coconut
 2021-07-05 10:56:29 +03:00
Ben Wallis
4aac84141a Merge branch 'yusdacra/chore/nix' into 'master' 
build(nix): use default-publish for release builds of voxygen

See merge request veloren/veloren!2556
 2021-07-05 06:26:50 +00:00
Samuel Keiffer
3eb44bd171 Merge branch 'swrup/fix_combo_decay_on_death' into 'master' 
fix combo not reset at respawn

See merge request veloren/veloren!2553
 2021-07-05 03:56:24 +00: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
Samuel Keiffer
a71b035b05 Merge branch 'juliancoffee/yeti_nerf' into 'master' 
Adjust Yeti difficulty

See merge request veloren/veloren!2550
 2021-07-05 03:46:42 +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
Samuel Keiffer
a049419a10 Merge branch 'sam/fix-combo-melee' into 'master' 
Fix oob panic in combo melee which can happen during desyncs.

See merge request veloren/veloren!2555
 2021-07-05 02:28:21 +00:00
Yusuf Bera Ertan
22b3a56595
build(nix): use default-publish for release builds of voxygen 2021-07-05 05:06:41 +03: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
Swrup
d9d9bc90e4 fix combo not reset at respawn 2021-07-04 17:28:11 +02:00
Ben Wallis
0ca636612d Merge branch 'xvar/wgpu-egui' into 'master' 
Added egui debug UI

See merge request veloren/veloren!2252
 2021-07-04 09:47:19 +00: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
Samuel Keiffer
3eeb43deb2 Merge branch 'master' into 'master' 
Correct spelling for glowing remains description

See merge request veloren/veloren!2551
 2021-07-04 04:41:54 +00:00
steanne
29d5f16b0c Update assets/common/items/crafting_ing/mindflayer_bag_damaged.ron 2021-07-04 01:44:33 +00:00
juliancoffee
cc27ce00fe Adjust Yeti difficulty 
Frost breath:
    - ori_rate reduced from 0.6 to 0.1
    - time of breath increased from 1 second to 2 seconds
    - buildup increased from 0.4 to 0.8
    - make it more gentle, with less damage per tick, but faster tick rate
    (50 * 1 to 10 * 5)
    - make Frozen debuff strength smoler, 1.5 to 0.5 and make it chance to
    apply debuff.
    - make him use it when closer range (10 and not 15)
Ice spikes:
    - increase recovery_duration from 0.3 to 1.0
    - make him slower while doing ice spikes, make ice spikes move
    slower
    - make him use it when closer range (15 and not 20)
Snowball:
    - increase recover_duration from 0.4 to 0.9
Strike:
    - increase buildup_duration fron 0.6 to 0.8
    - increase recover_duration from 0.5 to 1.0
    - increase knockback from 40.0 to 70.0
 2021-07-04 03:44:17 +03:00
Marcel
88a0048d21 Merge branch 'juliancoffee/merchants_ux' into 'master' 
Improve Merchant loadout from UX perspective

See merge request veloren/veloren!2544
 2021-07-03 20:25:49 +00:00
Avi Weinstock
9aa1985172 Remove allocation in SpriteKind::collectible_id. 2021-07-03 15:32:36 -04:00
juliancoffee
4a10800de8 Improve Merchant inventory from UX perspective 
Changes:
- Make it use red bags with 18 slots (2 rows * 9)
- Sort items by quality
- Stack ingredients, food, potions
- Move coins to ingedients bag and put it first
- Filter unconsumed good (case when you saw 16 rugged shirts)

Refactoring:
- Split bag creation to separate functions
 2021-07-03 22:16:06 +03:00
Marcel
3e9219ce27 Merge branch '1158-parse-all-rons-to-value' into 'master' 
Fix #1158 - Add a test that all the `.ron` manifests parse

Closes #1158

See merge request veloren/veloren!2533
 2021-07-03 18:11:04 +00: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