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,044 Commits 151 Branches 18 Tags
Commit Graph

9044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Swagazaki
b824c47d43 Just updated common.ron to correct a few French translations! 2021-07-07 10:55:15 +00:00
Samuel Keiffer
93af5e74a5 Merge branch 'snowram/dungeon-entraces-biomes' into 'master' 
Spawn dungeon entrances depending on the Site origin biome

See merge request veloren/veloren!2554
 2021-07-07 02:47:34 +00:00
Snowram
6d122c6ade Spawn dungeon entrances depending on the Site origin biome 2021-07-07 00:35:50 +02: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
8ee72466f2 Merge branch 'sam/fix-network-test' into 'master' 
Fix network test

See merge request veloren/veloren!2567
 2021-07-06 21:29:51 +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
f2b00f965e Fix test 2021-07-06 15:49:57 -05:00
Sam
572072608b Addressed review comments. Removed individual stat assignments. 2021-07-06 15:27:49 -05:00
Marcel
a466b305da Merge branch 'master' into 'master' 
Add Hungarian translation

See merge request veloren/veloren!2559
 2021-07-06 11:44:58 +00:00
Marcel
ffcf6360e8 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
1f100cd3ea Updated wgpu to 0.9.0 and egui to 0.13.0 2021-07-06 07:32:27 +01:00
Samuel Keiffer
9e4dde42ef 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
32ff7e62db 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
b7f7503602 Lowered ori_rate to 0.3 for BasicBeam abilities 2021-07-05 22:08:52 -05:00
Knightress Paladin
bd0f467b41 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
f729ec3d3d Formatted code to omit continue keyword 2021-07-05 19:41:25 -07:00
Knightress Paladin
a771bea612 Added check for exploding lava and glowing blocks 2021-07-05 19:41:25 -07:00
Knightress Paladin
f6b6470444 Added check for exploding lava and glowing blocks 2021-07-05 19:13:11 -07:00
Sam
aa60081ec7 Added range stat to weapons. 2021-07-05 20:32:12 -05:00
Marcel
bafdd1daa7 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
ab6105d789 Add a feature to optionnally disable hot-reloading 2021-07-06 00:27:09 +02:00
Marcel
b8961ce21b 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
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