Commit Graph

15779 Commits

Author SHA1 Message Date
horblegorble
9187c37ab1 woodgolem broad update; minor fix for harvester mixup attack 2024-06-28 15:25:17 +10:00
horblegorble
557f2ae53f cargo fmt 2024-06-28 15:25:17 +10:00
horblegorble
d8ea2c2689 clippy code-quality conformance 2024-06-28 15:25:17 +10:00
horblegorble
d81676a3a1 added 'Nothing' to chieftain bonus loot roll 2024-06-28 15:25:17 +10:00
horblegorble
493b4b8fd3 renamed vine summon abilities; brief comments for body_dist and it usage for harvester 2024-06-28 15:25:17 +10:00
horblegorble
789379f44e remove readability macros from harvester attack ai 2024-06-28 15:24:52 +10:00
horblegorble
3e23205640 mandragora changes; mask & glider adjustments; modified in-fort spawning; chieftain & harvester loot table adjustments; misc. tweaks 2024-06-28 15:24:52 +10:00
horblegorble
4300dd11f4 minor range tweaks; body_dist and macro refactorings of harvester attack code 2024-06-28 15:24:52 +10:00
horblegorble
0fd5548346 changelog entry 2024-06-28 15:24:44 +10:00
horblegorble
962eb1f40f misc. syntax errors 2024-06-28 15:22:32 +10:00
horblegorble
67c79a5759 broad updates to gnarling forts 2024-06-28 15:22:32 +10:00
Marcel
3ece56eb4a Merge branch 'horblegorble/recipe-pricing' into 'master'
recipe pricing adjustments; changed sea cleric drop

See merge request veloren/veloren!4515
2024-06-27 20:03:05 +00:00
Marcel
6a4fcbe412 Merge branch 'neura/update-noise' into 'master'
Update noise

See merge request veloren/veloren!4512
2024-06-26 12:12:15 +00:00
horblegorble
ef81ec1fdd scaling tweaks 2024-06-26 17:04:02 +10:00
horblegorble
37bfc7581f changelog entry 2024-06-26 16:52:36 +10:00
horblegorble
f9651a1289 recipe pricing adjustments; changed sea cleric drop 2024-06-26 16:45:24 +10:00
Youser Nayme
ce7732674a
Update noise 2024-06-26 00:59:36 -04:00
Marcel
5e41b34dc2 Merge branch 'neura/update-crates' into 'master'
Update various crates

See merge request veloren/veloren!4513
2024-06-24 04:58:20 +00:00
Youser Nayme
a145b0ea2c
Update dispatch 2024-06-23 21:50:46 -04:00
Youser Nayme
a12c320f8c
Update ordered-float 2024-06-23 21:50:45 -04:00
Youser Nayme
ca6bcaab7d
Update strum and itertools 2024-06-23 21:50:33 -04:00
Youser Nayme
36d192a2f6
Update chrono-tz 2024-06-23 11:17:07 -04:00
Youser Nayme
a1930b81d0
Update image 2024-06-23 11:07:15 -04:00
Youser Nayme
48dfac6f8b
Update hashbrown 2024-06-23 10:40:04 -04:00
Samuel Keiffer
2d3303384a Merge branch 'uniior/armor-pricing' into 'master'
Saner pricing for worker/linen clothing

See merge request veloren/veloren!4511
2024-06-23 01:04:13 +00:00
Uniior
c399a549f8 Merge branch 'master' into 'uniior/armor-pricing'
# Conflicts:
#   CHANGELOG.md
2024-06-22 17:57:23 +00:00
uniior
92a2e5da8b Resolve merge conflict 2024-06-22 13:56:09 -04:00
Marcel
46ab1cb11e Merge branch 'james/prevent-vertical-scaling-crash' into 'master'
Limit vertical scaling UI minimum to 0.1

See merge request veloren/veloren!4510
2024-06-22 16:04:20 +00:00
uniior
b3c5c4b48a Changelog 2024-06-22 11:27:38 -04:00
uniior
ad62d5f9a3 Hotfix for worker/linen clothing pricing 2024-06-22 11:26:22 -04:00
James Melkonian
b3ae2abbd2 Limit vertical scaling UI minimum to 0.1 2024-06-22 00:25:25 -07:00
Samuel Keiffer
92af46c08f Merge branch 'sam/fix-anims' into 'master'
Fix anims

See merge request veloren/veloren!4508
2024-06-22 00:54:01 +00:00
Sam
907c469afa Fix anims 2024-06-21 18:03:57 -04:00
Marcel
d6d9c2ca57 Merge branch 'muphblu/fix-item-img-export' into 'master'
Fixes img-export #1761 set square dimensions for image

Closes #1761

See merge request veloren/veloren!4505
2024-06-19 07:19:59 +00:00
flo
790aeff27a Merge branch 'wood-price-hotfix' into 'master'
Hotfix for log prices

See merge request veloren/veloren!4506
2024-06-19 03:57:58 +00:00
uniior
61193939fc Hotfix for log prices 2024-06-18 21:17:56 -04:00
Samuel Keiffer
2f968095c7 Merge branch 'sam/anim-restructure' into 'master'
Character animation restructuring

See merge request veloren/veloren!4504
2024-06-18 00:27:01 +00:00
Sam
b168fea0b8 Fix cardinal steam beam animation 2024-06-17 19:09:39 -04:00
Sam
45b17feccd Deduplicated match statement 2024-06-17 18:51:56 -04:00
Aidar Shaikhiev
7dcc559f51 Fills CHANGELOG.md 2024-06-18 01:13:50 +05:00
Aidar Shaikhiev
623e3aef93 Fix images that used hollow cells
Reused item_imgs.rs for image loading and preprocessing, because it is removes hollow cells.
Example: assets/voxygen/voxel/armor/misc/head/bear_bonnet.vox
2024-06-18 01:08:42 +05:00
Aidar Shaikhiev
8221a11fe5 Fixes #1761 set square dimensions for image
Images rendered by veloren_voxygen::ui::graphic::renderer::draw_vox have equal width and height, because of camera settings. Needed just to set square dims for result image instead of calculating its rotated dims.
2024-06-18 00:31:25 +05:00
Aidar Shaikhiev
226913d5f5 Fix old compilation bug 2024-06-18 00:31:24 +05:00
Aidar Shaikhiev
5f0fedadb5 Fix old compilation bug 2024-06-18 00:31:24 +05:00
Marcel
12726cf58c Merge branch 'weblate-translation' into 'master'
Update translation files (Weblate)

See merge request veloren/veloren!4503
2024-06-16 22:11:44 +00:00
Otto Richter
7cca60031b Update translation files (Weblate) 2024-06-16 22:11:44 +00:00
flo
e4cd939eb8 Merge branch 'adjust_large_bird_routes' into 'master'
adjust_large_bird_routes

See merge request veloren/veloren!4492
2024-06-11 22:02:37 +00:00
flo
998a8a8273 adjust_large_bird_routes 2024-06-11 22:02:37 +00:00
Marcel
8589e8f9f6 Merge branch 'sam/fix-pr-typo' into 'master'
Fix typo

See merge request veloren/veloren!4500
2024-06-09 16:04:22 +00:00
Sam
a4485d9914 Fix typo 2024-06-08 17:56:13 -04:00