UncomfySilence
c2bf1a5345
+ Created common.loot_tables.event directory for special item drop changes or for potential bosses.
...
+ Made yeti boss have a 5% chance to spawn in snow biomes.
+ New yeti entity has ~28.5% chance to drop 1 to 10 exclusive blue cheese, ~57.1% to drop 1 to 3 coal, and ~14.2% chance to drop 1 diamond.
+ Blue cheese heals 60hp over 20 seconds.
+Blue cheese has item_image_manifest and other necessities completed. (Model is current placeholder until Gemu or Hannibal have approved)
2021-12-20 18:03:52 +00:00
Ben Wallis
9a4e6b81d3
Merge branch 'Character-editting' into 'master'
...
Character editing
See merge request veloren/veloren!3059
2021-12-20 15:24:43 +00:00
Joshua Barretto
bd4796144a
Merge branch 'ubruntu/hide-zero-armor-stats' into 'master'
...
Hide empty stats on item tooltips
See merge request veloren/veloren!3067
2021-12-20 15:07:38 +00:00
ubruntu
59cb9ea7c2
Hide empty stats on item tooltips
2021-12-20 15:07:38 +00:00
Dr. Dystopia
9b407b8aef
Update warning message
2021-12-20 12:33:51 +01:00
Justin Shipsey
db2bd0a90d
Merge branch 'snowram/anim-hotreload-fix' into 'master'
...
Fixes animation hot reloading (credit to Imbris)
See merge request veloren/veloren!3063
2021-12-19 10:09:41 +00:00
Snowram
66a5f9fded
Fixes animation hot reloading (credit to Imbris)
2021-12-18 20:36:14 +01:00
Dr. Dystopia
1719ce8c16
Format
2021-12-18 15:58:17 +01:00
IsseW
65ab92eb78
button spacing
2021-12-18 15:41:11 +01:00
Dr. Dystopia
3329a8df61
Add 'pen' icons for edit buttons
2021-12-18 15:27:14 +01:00
Dr. Dystopia
d7f5c301f6
Extract 'check_response' function
2021-12-18 13:38:22 +01:00
Dr. Dystopia
9a7cc50898
Show current equipment during editing
2021-12-18 12:35:31 +01:00
Dr. Dystopia
48fd9e877d
Use 'confirm' button when finishing editing
2021-12-18 11:45:49 +01:00
Samuel Keiffer
1986d80a3c
Merge branch 'ubruntu/fix-stat-comparisons-tooltip' into 'master'
...
Fix stat comparisons in item tooltips
See merge request veloren/veloren!3062
2021-12-18 02:31:30 +00:00
ubruntu
333bc0bed8
Fix stat comparisons in item tooltips
2021-12-18 02:31:30 +00:00
Marcel
cba946c07b
Merge branch 'add-zh_TW-gameinput.greet' into 'master'
...
Add zh_TW gameinput.greet translate.
See merge request veloren/veloren!3061
2021-12-16 16:21:58 +00:00
Marcel
c4da241983
Merge branch 'add-zh_CN-gameinput.greet' into 'master'
...
Add gameinput.greet translate.
See merge request veloren/veloren!3060
2021-12-16 16:21:56 +00:00
EvanMeek
435d2ec8ae
Add zh_TW gameinput.greet translate.
2021-12-16 17:47:12 +08:00
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
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
