Sam
1c3bd13afa
Addressed review comments. Removed individual stat assignments.
2021-07-06 15:27:49 -05:00
Marcel
0a57bf4367
Merge branch 'master' into 'master'
...
Add Hungarian translation
See merge request veloren/veloren!2559
2021-07-06 11:44:58 +00:00
Knightress Paladin
98dc0f19b7
Merge branch 'knightresspaladin/sceptre-ai' of https://gitlab.com/veloren/dev/veloren into knightresspaladin/sceptre-ai
2021-07-06 01:48:11 -07:00
Knightress Paladin
2d1799e6f1
Added sceptre tactic and sceptre cultists
2021-07-06 01:47:22 -07:00
Knightress Paladin
510591dee3
Added sceptre tactic and sceptre cultists
2021-07-06 01:29:11 -07:00
Marcel
fc835f675e
Merge branch 'xvar/wgpu-0.9' into 'master'
...
Updated wgpu to 0.9.0 and egui to 0.13.0
See merge request veloren/veloren!2566
2021-07-06 07:27:45 +00:00
Ben Wallis
88bb160336
Updated wgpu to 0.9.0 and egui to 0.13.0
2021-07-06 07:32:27 +01:00
Samuel Keiffer
1fa586f3f9
Merge branch 'caldog20/fix-beam-turning-rate-#1088' into 'master'
...
Fixed fast turning rate for BasicBeam abilities
See merge request veloren/veloren!2565
2021-07-06 04:23:33 +00:00
Samuel Keiffer
5cfe701914
Merge branch 'knightresspaladin/fix-block-discoloration' into 'master'
...
Added check for exploding lava and glowing blocks
See merge request veloren/veloren!2564
2021-07-06 03:28:11 +00:00
Caleb
559111283f
Lowered ori_rate to 0.3 for BasicBeam abilities
2021-07-05 22:08:52 -05:00
Knightress Paladin
0cf92321f1
Merge branch 'knightresspaladin/fix-block-discoloration' of https://gitlab.com/veloren/dev/veloren into knightresspaladin/fix-block-discoloration
2021-07-05 19:43:19 -07:00
Knightress Paladin
2bcfa0df7a
Formatted code to omit continue keyword
2021-07-05 19:41:25 -07:00
Knightress Paladin
5c5b8ed94e
Added check for exploding lava and glowing blocks
2021-07-05 19:41:25 -07:00
Knightress Paladin
081c8bed77
Added check for exploding lava and glowing blocks
2021-07-05 19:13:11 -07:00
Sam
e8e953ffab
Added range stat to weapons.
2021-07-05 20:32:12 -05:00
Marcel
af8ced310f
Merge branch 'alphyr/disable_hot_reloading' into 'master'
...
Add a feature to optionnally disable hot-reloading
See merge request veloren/veloren!2562
2021-07-06 00:11:21 +00:00
Benoît du Garreau
110b9742b7
Add a feature to optionnally disable hot-reloading
2021-07-06 00:27:09 +02:00
Marcel
c86118ee2c
Merge branch 'aweinstock/fix-keyedjobs-warning' into 'master'
...
Fix spurious warning in KeyedJobs.
See merge request veloren/veloren!2561
2021-07-05 21:41:00 +00:00
Marcel
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
Marcel
cc996a63f6
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
86f5564dc7
Fix spurious warning in KeyedJobs.
2021-07-05 13:52:34 -04:00
juliancoffee
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
Samuel Keiffer
a8447fd62d
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
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
juliancoffee
2c714dadad
(fix) spawn HaniwaSentry in T3
2021-07-05 18:49:25 +03:00
juliancoffee
1ed9d8d455
(fix) Use backpack item for merchant's ingredients
2021-07-05 18:49:25 +03:00
Enrico Marconi
8106ac492a
Actually check if entity is alive
2021-07-05 16:09:39 +02:00
Enrico Marconi
7e97b9e495
Check if entity is alive before applying a buff
2021-07-05 16:09:39 +02:00
Ács Zoltán
9fbd8ae5ce
Add Hungarian translation
2021-07-05 15:14:35 +02:00
Ács Zoltán
5f3251ce60
Add support for ő and ű to the haxrcorp font
2021-07-05 15:12:27 +02:00
juliancoffee
f213ba138a
Fill trade_pricing with craftable items
2021-07-05 15:43:03 +03:00
Marcel
3ee123b745
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
3804c3d032
Implemented trading stackable items with a full inventory
2021-07-05 10:34:03 +00:00
Samuel Keiffer
370e0f8f24
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
47aa371965
Update CHANGELOG with food rework
2021-07-05 10:57:11 +03:00
juliancoffee
b70e191483
Bump some food duration to 10 seconds
2021-07-05 10:56:29 +03:00
juliancoffee
21d10b641b
Add new food to consumables /kit
2021-07-05 10:56:29 +03:00
juliancoffee
e6ed0137e8
Add descriptions to the potions
2021-07-05 10:56:29 +03:00
juliancoffee
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
juliancoffee
eb61b23d04
Rebalance food for new consumables changes
2021-07-05 10:56:29 +03:00
juliancoffee
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
juliancoffee
8b9316a2c6
Change Mortar and Pestle crafting recipe
...
- Make it require bowl instead of coconut
2021-07-05 10:56:29 +03:00
Ben Wallis
e05a79e6c4
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
dcdf1c83a3
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
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
Samuel Keiffer
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
Samuel Keiffer
d97db508ff
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
d8f68668b1
Addressed potential for divide by zero.
2021-07-04 22:00:13 -05:00
Sam
d2cb0c76a7
Fix first person backwards roll.
2021-07-04 21:54:38 -05:00
Sam
4ac9d9e0a5
Fix interaction of max health and max health over time buffs causing infinite health scaling.
2021-07-04 21:43:29 -05:00
