EvanMeek
3a66c5a91a
Add gameinput.greet translate.
2021-12-16 17:43:33 +08:00
Justin Shipsey
e847763eb5
Merge branch 'slipped/cleanup2' into 'master'
...
skillset simplification
See merge request veloren/veloren!3058
2021-12-16 06:52:10 +00:00
jshipsey
88b4035729
last tweaks
2021-12-16 01:16:51 -05:00
Samuel Keiffer
9684fe09b7
Merge branch 'holychowders/allow_most_npcs_to_flee_again' into 'master'
...
Re-allow and Improve Agents' Fleeing
See merge request veloren/veloren!2950
2021-12-16 01:12:03 +00:00
Dr. Dystopia
3a52599e49
Clean up
2021-12-15 21:55:53 +01:00
Dr. Dystopia
62f9bc5059
Fix redundant pattern matching
2021-12-15 21:05:49 +01:00
Dr. Dystopia
e2f4499d45
Remove debug prints
2021-12-15 20:56:44 +01:00
IsseW
8b258e4e81
Non editable data
2021-12-15 20:40:01 +01:00
Marcel
cbdf56e800
Merge branch 'a1phyr/assets_manager_0.7' into 'master'
...
Upgrade `assets_manager` to 0.7
See merge request veloren/veloren!3056
2021-12-15 18:05:30 +00:00
jshipsey
2f2c171a4a
cherrypick
2021-12-15 02:55:28 -05:00
Benoît du Garreau
8cf871f449
Edit log message as suggested
2021-12-13 18:54:30 +01:00
Benoît du Garreau
287896facd
Remove common_assets::path_of`
2021-12-13 18:17:23 +01:00
Joshua Barretto
dd95d69dc4
Fixed character editing
2021-12-13 00:55:25 +00:00
Dr. Dystopia
408fe1e6b6
Begin creating character editing
2021-12-13 01:13:33 +01:00
Benoît du Garreau
aca088388b
Update assets_manager to 0.7
2021-12-12 22:11:47 +01:00
notoria
81f28bc3cc
Use debug_map to implement Debug
2021-12-12 21:46:06 +01:00
Samuel Keiffer
182d5cf971
Merge branch 'james/optional-armor-stats' into 'master'
...
Convert Armor Stats to Options
See merge request veloren/veloren!3054
2021-12-12 00:25:35 +00:00
James Melkonian
5f6d1c3438
Convert Armor Stats to Options
2021-12-12 00:25:35 +00:00
holychowders
b40d94dd53
Re-allow and improve fleeing.
2021-12-07 20:18:03 -06:00
Marcel
de5ca67615
Merge branch 'evanmeek/friendly_error_message' into 'master'
...
Add friendly error message for override assets.
See merge request veloren/veloren!2983
2021-12-07 15:35:40 +00:00
Evan
6bc8bbb4ed
Add friendly error message for override assets.
2021-12-07 15:35:40 +00:00
Marcel
2d0c9ca156
Merge branch '1396-get-veloren-url' into 'master'
...
update Get Veloren Url in README
Closes #1396
See merge request veloren/veloren!3000
2021-12-07 15:20:23 +00:00
Marcel
34b3f0c7d9
Merge branch 'Remove-unused-clippy-suppressions' into 'master'
...
Remove unused clippy suppressions
See merge request veloren/veloren!3046
2021-12-05 17:59:03 +00:00
Jonathan Berglin
596307c9b7
Remove unused clippy suppressions
2021-12-05 17:59:02 +00:00
Samuel Keiffer
c265102367
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--eval_order_dependence)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::eval_order_dependence)]' error supressions
See merge request veloren/veloren!3044
2021-12-03 19:19:20 +00:00
Dr. Dystopia
c002e5e749
Resolve all '#[allow(clippy::eval_order_dependence)]' error supressions
2021-12-03 19:44:41 +01:00
Joshua Barretto
7e50a7de94
Merge branch 'Resolve-all-'#-allow(clippy--redundant_static_lifetimes)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::redundant_static_lifetimes)]' error supressions
See merge request veloren/veloren!3041
2021-12-03 16:14:24 +00:00
Joshua Barretto
d7b907a6bd
Merge branch 'Resolve-all-'#-allow(clippy--needless_range_loop)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::needless_range_loop)]' error supressions
See merge request veloren/veloren!3042
2021-12-03 16:03:54 +00:00
Dr. Dystopia
5d1d510d54
Resolve all '#[allow(clippy::redundant_static_lifetimes)]' error supressions
2021-12-03 10:43:09 +01:00
Dr. Dystopia
f4c5abf36b
Resolve all '#[allow(clippy::needless_range_loop)]' error supressions
2021-12-03 10:38:30 +01:00
Imbris
dde1bacad7
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--manual_saturating_arithmetic)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::manual_saturating_arithmetic)]' error supressions
See merge request veloren/veloren!3038
2021-11-30 20:41:39 +00:00
Dr. Dystopia
a0dfb2e8ad
Resolve all '#[allow(clippy::manual_saturating_arithmetic)]' error supressions
2021-11-30 13:57:47 +01:00
Ben Wallis
636a24e8f2
Merge branch 'aweinstock/fix-lake-minimap' into 'master'
...
Bodies of water no longer contain black chunks on the voxel minimap.
See merge request veloren/veloren!3036
2021-11-29 20:28:15 +00:00
Avi Weinstock
cb4c3eb34e
Bodies of water no longer contain black chunks on the voxel minimap.
...
The heuristic for pruning dungeon ceilings depended on detecting an
air-to-not-air edge, which was not present for chunks whose topmost
layer was water. Sampling 1 layer of the `above` block introduces such
an edge, allowing the water surface to be detected.
2021-11-29 14:39:56 -05:00
Marcel
55be707c7b
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--needless_update)]'-error-supressions' into 'master'
...
Tygyh/resolve all '# allow(clippy needless update)]' error supressions
See merge request veloren/veloren!3034
2021-11-29 09:32:55 +00:00
Jonathan Berglin
d9dd49552b
Tygyh/resolve all '# allow(clippy needless update)]' error supressions
2021-11-29 09:32:55 +00:00
Marcel
8613cdfe36
Merge branch 'imbris/redundant-closure' into 'master'
...
Remove redundant closures
See merge request veloren/veloren!3033
2021-11-28 18:13:01 +00:00
Imbris
7760210824
Remove redundant closures
2021-11-28 12:24:57 -05:00
Treeco
3a998ca5b9
Merge branch 'isse/primitive-fixes' into 'master'
...
Primitive fixes
See merge request veloren/veloren!3016
2021-11-27 19:02:12 +00:00
Marcel
724e3bcdfd
Merge branch 'capucho/tracing-bump' into 'master'
...
Bump tracing-subscriber to 0.3.2
See merge request veloren/veloren!3032
2021-11-27 11:11:47 +00:00
João Capucho
8b89903d57
Bump tracing-subscriber to 0.3.2
...
We were pulling two versions of it. Causing some compilation errors
2021-11-26 17:41:51 +00:00
Marcel
3fa2dab3aa
Merge branch 'xMAC94x/update-toolchain' into 'master'
...
xMAC94x/update toolchain
See merge request veloren/veloren!3027
2021-11-26 16:52:51 +00:00
Marcel
8a3ec3e401
Merge branch 'Swedish-translation' into 'master'
...
Translate to swedish
See merge request veloren/veloren!3029
2021-11-26 14:16:10 +00:00
Jonathan Berglin
58881d4cfc
Translate to swedish
2021-11-26 14:16:10 +00:00
Samuel Keiffer
8998869395
Merge branch 'james/merchant-percentages' into 'master'
...
Floor merchant cost percentages and display as whole numbers
See merge request veloren/veloren!3028
2021-11-25 01:32:20 +00:00
James Melkonian
ab99126a7b
Floor merchant cost percentages and display as whole numbers
2021-11-25 01:32:20 +00:00
Marcel Märtens
dde6404af8
update cache_image_tag
2021-11-24 22:17:08 +01:00
Marcel Märtens
ef40ebe0c8
update toolchain to nightly-2021-11-24
2021-11-24 10:09:22 +01:00
Imbris
f9089ac084
Merge branch 'aarch64' into 'master'
...
Aarch64
See merge request veloren/veloren!3013
2021-11-24 02:55:28 +00:00
Imbris
3bf0ac1971
Switch to new CI image set with aarch64 support and update changelog
2021-11-23 21:27:23 -05:00
