Commit Graph

5685 Commits

Author SHA1 Message Date
Sam
45b17feccd Deduplicated match statement 2024-06-17 18:51:56 -04: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
0bb07662e2 Merge branch 'xMAC94x/update_hyper' into 'master'
Update hyper/axum and dependent crates.

See merge request veloren/veloren!4491
2024-06-06 16:01:30 +00:00
Sam
4ef1be08ec Character animation restructuring 2024-06-05 22:31:17 -04:00
Marcel Märtens
75f2e0800a Update hyper/axum and dependent crates.
note this removes an old rustls, due to the new one we require to initialize our CryptoProvider.
also removed a very verbose trace.
2024-06-04 14:31:36 +02:00
Sam
d7f5c013ad Remove ItemVisualKey 2024-06-03 21:24:16 -04:00
James Melkonian
b40a14ae62 Initial recipe component work
Insert RecipeBook into ECS

Add recipe command

Fully functional recipes

Recipe items

Update item_image_manifest.ron

scroll item image/drop model

Colored recipe vox models

Reset recipes command

Move RecipeBook into Inventory

Persistence for recipe book

Recipe book migration

Recipe items can now be dynamically generated from the recipe book

Removed recipe items and recipe item generation bin

Fix rebase

Made recipes available in world

Fix rebase

Default recipes to manifest

Recipes now have prices in economy.

Changed recipes to go into kind before reaching item visual manifests.

Default recipes automatically added to recipe book on character load.

Loot table rebalancing

Addressed balance feedback

MR review feedback

Recipes are now unlocked in groups

Modular weapon component recipes now require learning recipes

Metal weapon recipes now also teach how to craft their requisite ingots

Added test for all recipes being valid
2024-06-03 21:24:15 -04:00
Samuel Keiffer
c065b689ac Merge branch 'sam/buff-split-stats' into 'master'
Damage and poise reduction stats now track split modifiers

See merge request veloren/veloren!4484
2024-05-29 15:52:55 +00:00
Samuel Keiffer
79d97cdc22 Merge branch 'sam/diminishing-cc' into 'master'
Diminishing returns for certain crowd control debuffs

See merge request veloren/veloren!4482
2024-05-29 15:50:09 +00:00
Samuel Keiffer
eeb68797e7 Merge branch 'new_sahagin' into 'master'
new_sahagin

See merge request veloren/veloren!4467
2024-05-29 00:01:46 +00:00
flo
ee608d3c25 new_sahagin 2024-05-29 00:01:46 +00:00
flo
5c575484f2 dagon_anticheese 2024-05-28 19:13:49 +00:00
Sam
8b24ca68a8 Damage and poise reduction stats now track split modifiers 2024-05-27 22:06:12 -04:00
Sam
07220dfee8 Diminishing returns for certain crowd control debuffs 2024-05-27 20:25:12 -04:00
Sylv
c9141f4c6b Fix #1806: Localize PromptDialog 2024-05-24 17:18:41 +00:00
Youser Nayme
fbe7db846e
Update treeculler 2024-05-20 13:04:21 -04:00
Youser Nayme
23afb9237f
Update rodio 2024-05-20 13:04:21 -04:00
Youser Nayme
d6f239832a
Update native-dialog 2024-05-20 13:04:21 -04:00
Youser Nayme
1fd72a93e1
Unpinned cmake version as the original issue has been fixed.
Also ran `cargo update` to actually update the crate.
2024-05-20 13:04:20 -04:00
Marcel
f5fc2294a6 Merge branch 'xMAC/update-toolchain' into 'master'
update toolchain to `2024-05-14`

See merge request veloren/veloren!4466
2024-05-19 00:40:55 +00:00
Marcel Märtens
e48fc4c2b2 additional cargo clippy for toolchain switch 2024-05-18 22:44:59 +02:00
Marcel Märtens
5f41aefacb update toolchain to 2024-05-14 2024-05-18 00:58:54 +02:00
Marcel
246d90cf22 Merge branch 'fotkurz/plugin-bookkeepingoptimization' into 'master'
Fix #1968: refactor missing_plugins check for better performance

Closes #1968

See merge request veloren/veloren!4463
2024-05-17 22:15:40 +00:00
fotkurz
13a3c53307 Fix #1968: refactor missing_plugins check for better performance 2024-05-16 13:22:11 -03:00
Marcel Märtens
b770665fb9 new toolchain lints helped us to find issues, backporting the bugfixes here.
NOTE: we havent had world enabled in server/agent, this MR now enables this, might have some (hopefully positive) effects on our agent code
2024-05-16 10:40:15 +02:00
James Melkonian
25ad114072 Rocksnapper AI and animation tweaks 2024-05-14 18:22:20 -07:00
James Melkonian
7a23314e3b bowser spin animation 2024-05-14 18:22:20 -07:00
flo
76628057b5 new_cultist 2024-05-12 18:33:11 +00:00
Isse
6c0da4beeb
allow searching in both selected language and fallback langauage in crafting 2024-04-29 13:33:11 +02:00
Sam
38df083e0c Changelog entry, better placeholder UI, remove test changes 2024-04-28 20:04:07 -04:00
Sam
0dc261c70a Judgement 2024-04-28 19:43:50 -04:00
Sam
244ffcf03e Earthshaker 2024-04-28 19:43:49 -04:00
Sam
171125e73e Seismic shock 2024-04-28 19:43:49 -04:00
Sam
caac8025c6 Thunderclap 2024-04-28 19:43:49 -04:00
Sam
85e9af4e08 Tenacity 2024-04-28 19:43:49 -04:00
Sam
7daa9a29eb Rampart 2024-04-28 19:43:49 -04:00
Sam
e1ce09e0a1 Upheaval 2024-04-28 19:40:12 -04:00
Sam
b25e91e79a Iron tempest 2024-04-28 19:40:12 -04:00
Sam
b8de5e414b Helm Crusher 2024-04-28 19:40:12 -04:00
Sam
38c74bf182 Finish rooted debuff impl and Lung Pummel 2024-04-28 19:40:12 -04:00
Sam
76dc196996 Pile Driver 2024-04-28 19:40:12 -04:00
Sam
90f3b671c3 Breach 2024-04-28 19:40:12 -04:00
Sam
7ed66f29bf Spine Cracker 2024-04-28 19:40:12 -04:00
Sam
c9c14c9202 Retaliate 2024-04-28 19:40:12 -04:00
Sam
e858b84427 Intercept 2024-04-28 19:40:11 -04:00
Sam
e24ebc381b Heavy whorl 2024-04-28 19:40:11 -04:00
Sam
909363d33c Vigorous bash 2024-04-28 19:40:11 -04:00
Sam
89048e9530 Tremor 2024-04-28 19:36:17 -04:00
Sam
cc70685f7a Scornful swipe 2024-04-28 19:36:17 -04:00
Sam
af755197bb Wide wallop 2024-04-28 19:36:16 -04:00
Sam
bddced1ab7 Solid smash 2024-04-28 19:36:16 -04:00
Sam
fcfff367c9 Cleanup stuff from old hammer 2024-04-28 19:36:14 -04:00
Sam
78acdcf767 Placeholder UI for skill tree 2024-04-28 19:35:12 -04:00
Sam
09b25d4f74 Initial setup 2024-04-28 19:35:12 -04:00
flo
961f49e2af mine-implementation 2024-04-28 19:31:18 +00:00
miocore
8710aaa07b remove keybind_mode, instead use left click(m1) for set and right click(m2) for unset 2024-04-20 00:57:30 +03:00
crabman
a970b307f8
address review comments 2024-04-16 12:19:12 +00:00
crabman
4781134d7e
Define different sprite configurations per-attributes 2024-04-15 16:07:35 +00:00
Treeco
8a9ba69bae Fix Rodio panic 2024-04-08 13:18:07 +01:00
Kira Lu
5e88b67e0b newclarityex/petting animals 2024-04-07 15:05:18 +00:00
flo
f8f2684810 easter_and_april_fools_stuff 2024-04-01 06:46:43 +00:00
crabman
47438dd9f5
Fix rope shader panic 2024-03-31 16:30:52 +01:00
Marcel
27cc08909a Merge branch 'feature/sign_lighting_translations' into 'master'
Allow translation for hanging sign & lights

See merge request veloren/veloren!4402
2024-03-31 09:18:03 +00:00
Thomas S
eaecbef5a8 Allow translation for hanging sign & lights 2024-03-31 09:18:02 +00:00
Marcel
a955871f60 Merge branch 'gamer-kold/update-rodio-v2' into 'master'
Updated Rodio

See merge request veloren/veloren!4399
2024-03-31 09:05:18 +00:00
Marcel Märtens
35afd20b63 Change the version number to 0.16 2024-03-30 00:10:54 +01:00
Talha Qamar
43b0adddc6 Ran clippy and rustfmt 2024-03-28 22:14:32 +05:00
Talha Qamar
028ca816b7 Updated Rodio 2024-03-28 22:11:12 +05:00
crabman
8c7f99371b
New default singleplayer world 2024-03-28 09:33:42 +00:00
crabman
b2e38d7e6d
starting site tweaks 2024-03-28 09:33:42 +00:00
Treeco
c2bf7c3fc1 Merge branch 'treeco/lod-models' into 'master'
Add airship dock and coast town LOD

See merge request veloren/veloren!4396
2024-03-27 22:29:10 +00:00
Treeco
948e7e646f Further LOD object additions
- Airship dock
- Coastal house
- Coastal workshop
2024-03-27 20:19:12 +00:00
Kay Hemme
f1e1271c7e Fixes #1865 -Item label gets cut-off when trading with Merchant 2024-03-27 14:55:12 +00:00
Treeco
79bd3182eb Added terracotta LOD 2024-03-27 01:48:24 +00:00
Treeco
9d83b046a6 Added savannah settlement lod 2024-03-27 01:42:11 +00:00
crabman
89af8facbe
fix frozen aura particles 2024-03-25 19:56:08 +00:00
crabman
af4f147fda
FriendlyFire and ForcePvP auras 2024-03-25 19:56:08 +00:00
Treeco
36cab14859 Addressed comments 2024-03-23 17:32:54 +00:00
Treeco
954cede352 Add new LOD trees and objects 2024-03-23 17:32:54 +00:00
Treeco
62a99f2466 Use real colours for LOD trees and rooftops, lay groundwork for further additions 2024-03-23 17:32:54 +00:00
Marcel
fbca6d852b Merge branch 'juliancoffee/remove-general-st' into 'master'
Remove health, energy and roll skills

See merge request veloren/veloren!4382
2024-03-20 22:12:47 +00:00
juliancoffee
7e4dcfd95a Re-shape General ST UI 2024-03-20 23:11:33 +02:00
juliancoffee
90454b1287 Remove roll skills 2024-03-20 23:11:31 +02:00
juliancoffee
55ae460d1d Remove health/energy increase skills 2024-03-20 23:08:45 +02:00
juliancoffee
1e6e595a87 Comment-out health/energy skills 2024-03-20 23:08:45 +02:00
Marcel Märtens
1ed2895a49 cargo upgrade all 2024-03-20 09:39:13 +01:00
Isse
5abc8e3a1d fix voxygen disabling plugins on server even if plugins are on 2024-03-14 21:57:50 +01:00
Christof Petig
f0194e6d9b more elaborate error handling 2024-03-14 00:46:18 +01:00
Christof Petig
166653b355 report plugin errors to the user 2024-03-14 00:46:18 +01:00
Christof Petig
8dd4729965 make missing plugins a set 2024-03-14 00:46:18 +01:00
Christof Petig
3e0ca7d6d4 Load missing plugins from the server
individual commits combined here:
send active plugins
compute plugin sha hash
single position for defining Hash type
request plugins from the server
Server sending the plugin to the client
store received plugin in file and use it
handle plugin data at the right place
pass config_dir to client init
load local plugins
operational plugin caching
simplify the interface
clippy suggestions
remove artifacts
fix compilation of test world
ChangeLog entry
code quality fixes
improve readability
adapt to multiple systems
2024-03-14 00:46:18 +01:00
Javier Pérez
30d924274c Update English translation 2024-03-06 18:36:07 +00:00
Illia Denysenko
840e95f21c Merge branch 'juliancoffee/glider-ability' into 'master'
Vroom Glider

See merge request veloren/veloren!4282
2024-03-06 13:13:49 +00:00
juliancoffee
9b1d074b27 Make all_available_abilities charstate-independent
+ Fix wrong index bug with Auxiliary abilities
2024-03-06 03:11:07 +02:00
Illia Denysenko
4e4c35f936 Merge branch 'juliancoffee/broom-tweak-v2' into 'master'
Made broom even better

See merge request veloren/veloren!4365
2024-03-06 01:07:25 +00:00
juliancoffee
79c2deb38c Made broom even better
+ Proper particle positioning
+ Set ori from velocity
2024-03-06 01:24:57 +02:00
crabman
feecd6ea2b
Dynamic merging of dropped items 2024-03-05 20:59:32 +00:00