Commit Graph

3106 Commits

Author SHA1 Message Date
Sam
d2a85ba014 Touch file 2024-06-07 15:51:15 -04:00
Sam
a58530a38f Actually fixed 2024-06-07 15:48:04 -04:00
Sam
361c3f1400 Fixed migration 2024-06-06 20:13:32 -04: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
Marcel Märtens
0f84c5d6f0 remove CryptProvider code again, it seems to be nolonger possible when axum uses hyper-rustls with native-tokio and ring feature active 2024-06-04 14:43:25 +02: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
b6d08a8d24 Fixed migration 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
flo
8863ea53c4 worldboss_aggro_fix 2024-06-03 06:52:13 +00:00
Sylv
44a56be25b Fix Gnarling Speed 2024-05-30 10:41: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
Marcel
eeaa52f63e Merge branch 'xMAC94x/rustls_pemfile_update' into 'master'
update rustls_pemfile

See merge request veloren/veloren!4479
2024-05-29 08:32:21 +00:00
Marcel
82939a9971 Merge branch 'sam/projectile-rework' into 'master'
Rewrote projectile constructor

See merge request veloren/veloren!4457
2024-05-29 08:13:49 +00:00
Samuel Keiffer
4c35ef95f7 Merge branch 'crab/pickupitem-amount-overflow' into 'master'
Fix overflow in PickupItem::amount

See merge request veloren/veloren!4477
2024-05-29 01:53:59 +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
Sam
7a7e6391b4 Rewrote projectile constructor 2024-05-28 19:54:36 -04:00
flo
d920facfb2 Merge branch 'dagon_anticheese' into 'master'
dagon_anticheese

See merge request veloren/veloren!4478
2024-05-28 19:13:49 +00:00
flo
5c575484f2 dagon_anticheese 2024-05-28 19:13:49 +00:00
crabman
7dd2072ced
Fix overflow in PickupItem::amount and set persistence stack_size to i64 2024-05-28 19:06:11 +00:00
crabman
a2ea012f43
upgrade rustls 2024-05-28 12:56:18 +00:00
Sam
07220dfee8 Diminishing returns for certain crowd control debuffs 2024-05-27 20:25:12 -04:00
Samuel Keiffer
9264c10289 Merge branch 'srpapinha/parried-debuff-rework' into 'master'
Parried debuff rework

See merge request veloren/veloren!4416
2024-05-27 22:01:28 +00:00
Papinha
f17c5661ea Parried debuff rework 2024-05-27 22:01:28 +00:00
Marcel Märtens
2c138fc0eb update rustls_pemfile 2024-05-24 18:09:26 +02:00
Youser Nayme
6c79e5dd9a Rebalance cultist dungeon loot tables and distribution, and improve Mindflayer anticheese 2024-05-23 06:07:20 +00:00
Youser Nayme
2138b5cc8f
Update rusqlite 2024-05-20 13:04:20 -04:00
Marcel Märtens
b2998676cb in order to update quinn / rusttls, move config to workspace Cargo.toml 2024-05-20 16:43:45 +02: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 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
crabman
b2d7a9291a Merge branch 'curious-potion-naming' into 'master'
Curious potion naming fix (Issue #1896)

Closes #1896

See merge request veloren/veloren!4195
2024-05-15 12:12:16 +00:00
James Melkonian
dc50f67103 Reorder rocksnapper abilities 2024-05-14 18:23:38 -07:00
James Melkonian
505788abdf Change rocksnapper action counters to timers 2024-05-14 18:22:20 -07:00
James Melkonian
25ad114072 Rocksnapper AI and animation tweaks 2024-05-14 18:22:20 -07:00
flo
76628057b5 new_cultist 2024-05-12 18:33:11 +00:00
HEIEnthusiast
608195d17c
Fixed issue #1896 curious potion 2024-05-11 22:49:45 -04:00
Uniior
d7d2e69d7d Various tweaks to entities' EHP 2024-05-09 22:03:01 +00:00
crabman
e8a89b52bc
register server info system 2024-05-09 14:19:57 +00:00
crabman
6430091512
Remove ping and add request size test 2024-05-02 17:59:16 +00:00
crabman
4455c777ce
address review comments 2024-05-02 07:00:02 +00:00
crabman
4c0cadabcf
query server ratelimiting 2024-05-02 07:00:02 +00:00
crabman
419ee88cc2
add extra padding for future version information and remove pings 2024-05-02 07:00:02 +00:00
crabman
800480b082
export metrics 2024-05-02 07:00:02 +00:00
crabman
83d4c775e2
connect query server to gameserver 2024-05-02 07:00:01 +00:00
Sam
06728c1865 Static aura now uses Object::DeleteAfter instead of Projectile 2024-04-28 19:43:50 -04:00
Sam
b6fbcbb204 Fixed bugs with negative DR buffs bypassing admin tabard, auras only being cleared if entity had entered_auras component, and shockwaves with 0 combo cost resetting combo. Other balance feedback. 2024-04-28 19:43:50 -04:00
Sam
aeb887963e Hammer AI 2024-04-28 19:43:50 -04:00
Sam
85e9af4e08 Tenacity 2024-04-28 19:43:49 -04:00
Sam
7daa9a29eb Rampart 2024-04-28 19:43:49 -04:00