gitlab.com/veloren/veloren commits | Ecosyste.ms: OpenCollective

Merge branch 'james/merchant-percentages' into 'master'

Floor merchant cost percentages and display as whole numbers

See merge request veloren/veloren!...

8998869395e66a0c65c8ade61f461cf3c8879403 authored about 3 years ago by Samuel Keiffer <[email protected]>

update cache_image_tag

dde6404af83d5e48a0c8dc2375fa47670a0f3510 authored about 3 years ago by Marcel Märtens <[email protected]>

update toolchain to `nightly-2021-11-24`

ef40ebe0c85497a2dfdb1842ea0dda5f2f11ce07 authored about 3 years ago by Marcel Märtens <[email protected]>

Merge branch 'aarch64' into 'master'

Aarch64

See merge request veloren/veloren!3013

f9089ac084aa869253fd80773feef015b7f79d03 authored about 3 years ago by Imbris <[email protected]>

Make sure to copy binaries from the right location in aarch CI

a54e4c5dd02064898931600af527d3b3630af113 authored about 3 years ago by Imbris <[email protected]>

Switch to new CI image set with aarch64 support and update changelog

3bf0ac1971d3c91ae3ee618fd75908a2c79e8fa3 authored about 3 years ago by Imbris <[email protected]>

Add aarch64 build to the gitlab CI yml

d137623dba62c129acdcc28e243370c282d24e70 authored about 3 years ago by Imbris <[email protected]>

Fix order of env var and time command in aarch CI script, remove duplicate release flag, reorder target flag to be in the same order as the target flag for windows

30df174c3dea54d1cfcb28966b9a8fb2def5a5d9 authored about 3 years ago by Imbris <[email protected]>

Try with: export PKG_CONFIG

0816624d2301c27f1f3d93b0e662577ce9a6806f authored about 3 years ago by Imbris <[email protected]>

Apply Add-CI-build-script-for-cross-compiling-Aarch64.patch from @linux4kix

4bbf5c7483c92e34c04346804209cec9fbb28105 authored about 3 years ago by Imbris <[email protected]>

Merge branch 'imbris/allow-incremental' into 'master'

Remove incremental disabling for crates that still had it disabled, the issues should be fixed

...

73531f771f2492d6aa59537ce36a5082b50f9fda authored about 3 years ago by Imbris <[email protected]>

Merge branch 'imbris/avoid-ci-incremental-delete' into 'master'

Remove deletion of incremental folder from the CI scripts

See merge request veloren/veloren!3026

4250a310facf5b7f1d11fe33b8dbba111ce3b132 authored about 3 years ago by Imbris <[email protected]>

Remove deletion of incremental folder from the CI scripts, the rustc incremental issue should be fixed

79128e1e4b5d46ef447dc0ca0d910eeebb02ddce authored about 3 years ago by Imbris <[email protected]>

Remove incremental disabling for crates that still had it disabled, the issues should be fixed

6feb2d53caefe1c1e3f1fb2ae2c3fec93f6ef44f authored about 3 years ago by Imbris <[email protected]>

Merge branch 'imbris/pin-cmake' into 'master'

Pin cmake crate to 0.1.45

See merge request veloren/veloren!3024

6e168f186b0936e903d1f9762515639d572154d6 authored about 3 years ago by Imbris <[email protected]>

Pin cmake crate to 0.1.45, since the newer version uses the --parallel argument which is not available on our CI's cmake version

0beee173706291627a39900ead3277d46939ee75 authored about 3 years ago by Imbris <[email protected]>

Merge branch 'xMAC94x/update-deps' into 'master'

updating dependencies,

See merge request veloren/veloren!3021

ecbe58eaab200a443d81519d71cc5a8f1d1caf70 authored about 3 years ago by Marcel <[email protected]>

remove additional restriction which is only necessary in egui 0.15

7a8944ac718ac3d8110facb0aa9807f22368fbb7 authored about 3 years ago by Marcel Märtens <[email protected]>

update other binaries

aa93b4b53c0d1e904ddeebbc2a6d8f9b45b92da7 authored about 3 years ago by Marcel Märtens <[email protected]>

undo egui upgrade try

7200cc4ad7b7a51eae5779ba9878f0e2c5ff36d6 authored about 3 years ago by Marcel Märtens <[email protected]>

updating dependencies,

cannot update the following dependencies:
- vek: Sharps SIMD isnt upstream
- tracing-subscriber...

e29ede7c970c109305aba356650ec5fa937bc934 authored about 3 years ago by Marcel Märtens <[email protected]>

Merge branch 'scaling_lower_tier_dungeons' into 'master'

Scaling dungeons

See merge request veloren/veloren!2991

5274bf9eb3ac3e879f5169d446b2ec453e20c7a2 authored about 3 years ago by Samuel Keiffer <[email protected]>

Ok just call it without

7eaddcafaddf561ccc393b56d43fc4f823b05885 authored about 3 years ago by IsseW <[email protected]>

+ T1 & T4 chest loot table fix

5dca7f9515cfed5802a5f0f7f176ba759ffd4d71 authored about 3 years ago by UncomfySilence <[email protected]>

Merge branch 'juliancoffee/resizeable_map' into 'master'

Add size parameter to map_file opts

See merge request veloren/veloren!2975

3018942291a70bea63ed016f7871ec79447ff4aa authored about 3 years ago by Treeco <[email protected]>

Change "and_not" and "diff" to "subtract"

88840fe58d3993c233bc6ac89ae94222db5dc4f0 authored about 3 years ago by IsseW <[email protected]>

Merge branch 'xMAC94x/harden_network_tests' into 'master'

those sleeps cannot be easily included in the code, as they simulate 2...

See merge request vel...

933b31392776b0eda238148ecef769124faeca35 authored about 3 years ago by Marcel <[email protected]>

Merge branch 'kemper/hitboxes' into 'master'

Adjust hitboxes of husk and medium birds

See merge request veloren/veloren!3019

0d779a754afaacc993b1036266d0c8050d01ec56 authored about 3 years ago by Joshua Barretto <[email protected]>

those sleeps cannot be easily included in the code, as they simulate 2 participants on 2 different computers.

Increase the timeouts from 1000 -> 3000 ms if there are some internal messages send (e.g. network...

258da1bedf54cac222ced976364a4bbd7647904c authored about 3 years ago by Marcel Märtens <[email protected]>

Adjust hitboxes for husk and medium birds

The hitbox of the husk did not include the head and the hitboxes
of the medium birds were far to...

d37dbf5d24ffe097814efe7de9c7dd7c9efa643b authored about 3 years ago by Kemper <[email protected]>

+ CHANGELOG.md message "Dungeons have somewhat proper scaling. The higher the dungeon the harder it gets, Cultist staying unchanged while Mino is now at its level."

7c560cc6b926a7078483be8d9422879a18d1e8da authored about 3 years ago by UncomfySilence <[email protected]>

+ Rebase and fixes (kill me)

f88a3df0406d7aaea5e900bbbc73e524a9ef594b authored about 3 years ago by UncomfySilence <[email protected]>

+ Small fix to boss loot table. Boss drops gear from same tier and slight chance from one above.

2fa0abf23d3ccc50019641b878d1fb5715367fbe authored about 3 years ago by UncomfySilence <[email protected]>

+ Fixed pathing for coal in T0 boss loot table, was mineral.coal is mineral.ore.coal now

05997262808becead91219b67428bfd368594b32 authored about 3 years ago by UncomfySilence <[email protected]>

+ Reducing attack speed of minions

77b74091a988e596a737a377acfe97594c296c86 authored about 3 years ago by UncomfySilence <[email protected]>

+ Adjusted damage, crit chance, and attack speed of weapons

+ Adjusted boss and chest loot table to match it's new intended tier of difficulty while providin...

10e6de3e8971a691a1ee3a347c98f4f8351b4744 authored about 3 years ago by UncomfySilence <[email protected]>

+ Made sure that abilities in staff simple match abilities in the staff skillset.

+ If anything happened to chests then no more! (Don't question it)
+ Bosses have a ~4% chance to ...

b92d104ca0a677feb5f3be21117ce3b845f11e43 authored about 3 years ago by UncomfySilence <[email protected]>

+ Gnarling armor count - 7 previous being 7

+ Adlet-bow armor count - 39 previous being 62
+ Sahagin armor count - 71 previous being 88
+ Han...

0461178cd8c38f2175762ca0f446a73980f4acca authored about 3 years ago by UncomfySilence <[email protected]>

+ Updating item_image_manifest to Master (was behind)

1b1fee4f0b09a6b3bcad1ae63c6aa8626dd1180a authored about 3 years ago by UncomfySilence <[email protected]>

+ Updating item_image_manifest to Master (was behind)

e69a6b82dc96ab84f6718db53c0833e69db576ef authored about 3 years ago by UncomfySilence <[email protected]>

+ Fixing spelling msitake in T0 Boss craftin_ing.sticky_thread to crafting_ing.sticky_thread

518099b92c59fccb7957788d4e678d72f05e0347 authored about 3 years ago by UncomfySilence <[email protected]>

+ Reducing attack speed of minions

c1d318f7eed56d6a97044e6b59374b424bbeba55 authored about 3 years ago by UncomfySilence <[email protected]>

+ Adjusted damage, crit chance, and attack speed of weapons

+ Adjusted boss and chest loot table to match it's new intended tier of difficulty while providin...

34d3cc836e647a79fda54a125a7517496b1497aa authored about 3 years ago by UncomfySilence <[email protected]>

+ Made sure that abilities in staff simple match abilities in the staff skillset.

+ If anything happened to chests then no more! (Don't question it)
+ Bosses have a ~4% chance to ...

90f29ce277cd226ef125e18ffc9ef507b0c8b29c authored about 3 years ago by UncomfySilence <[email protected]>

+ Lowered drop rate of extra extra tier armor and weapons from ~1.7% to ~0.8%

+ Organized T2 boss ron

9e28d889aff71791d8f67890fb64382f96efb520 authored about 3 years ago by UncomfySilence <[email protected]>

+ All bosses ranging from T0 to T3 have a ~4% chance of dropping equipment one tier higher than normal, while having a ~1.7% chance to drop equipment even higher than that.

+ All chests have a ~2% chance to drop better equipment than their tier.

3debaf2ded880c8b06d9cea816fe730d95617d31 authored about 3 years ago by UncomfySilence <[email protected]>

+ Gnarling armor count - 7 previous being 7

+ Adlet-bow armor count - 39 previous being 62
+ Sahagin armor count - 71 previous being 88
+ Han...

2163dc73b4d127d84da386c4f1b6ba7b61c1a8fc authored about 3 years ago by UncomfySilence <[email protected]>

+ Updating item_image_manifest to Master (was behind)

4e19f2444b18343d8e67cc12b77f6687f053e0d6 authored about 3 years ago by UncomfySilence <[email protected]>

+ Updating item_image_manifest to Master (was behind)

8d86f62f2edf64eede91d8755cbd4c2d275b841f authored about 3 years ago by UncomfySilence <[email protected]>

Merchant Outfit

ec07dbb05ea4fa6e765283bc2320a98752197b5a authored about 3 years ago by Monty Marz <[email protected]>

Merge branch 'pfau/armour' into 'master'

Merchant Outfit

See merge request veloren/veloren!3018

81846f313fc31173c7c264f9fdc24ef7231640fa authored about 3 years ago by Monty Marz <[email protected]>

Merge branch 'Limofeus/russian_translation_updates' into 'master'

Upd #4 - some other translations

See merge request veloren/veloren!3011

e426c1997b54f52bb4a6607dd93ecd0e8edcd2c4 authored about 3 years ago by Marcel <[email protected]>

Upd #4 - some other translations

7d50af8b7d2fcbb44fcb4689a7c03021e443f270 authored about 3 years ago by Limofeus <[email protected]>

Intersect instad of union in pyramid

4b6f3ddeea4a67f6fa033a1962a5f2bd57581098 authored about 3 years ago by IsseW <[email protected]>

Rename 'and' to 'intersect' and 'or' to 'union'

07da6a927168f8b94e0d1bb3503db0d53a78afd3 authored about 3 years ago by IsseW <[email protected]>

Merge branch 'changes_to_staff_m3_ability' into 'master'

Smol balance changes

See merge request veloren/veloren!3008

2d89e298df2c05b573ed949ba2fab6050a6bc0c9 authored about 3 years ago by Samuel Keiffer <[email protected]>

Smol balance changes

871859b09b1b8ea6d9590b6c4904dae0196bfcfe authored about 3 years ago by Youssef Fahmy <[email protected]>

Merge branch 'xMAC94x/airship_voxels_common' into 'master'

move server.voxel for airship to common

See merge request veloren/veloren!3012

82c867d95e893968acd5276f416116e5a3343e3e authored about 3 years ago by Marcel <[email protected]>

move server.voxel for airship to common

086f9737e4c906d1cc335b15c868e23ea6ffa8d5 authored about 3 years ago by Marcel Märtens <[email protected]>

Merge branch 'tim74' into 'master'

fix(AppData): Update screenshots due 404

See merge request veloren/veloren!2834

3801ead342e42d7f1116af3679aef94a8e2fa865 authored about 3 years ago by Marcel <[email protected]>

Merge branch 'xMAC94x/fix_torvus_and_other_client_only' into 'master'

move ship_manifest to common assets until its properly included in servers ECS...

See merge req...

e218ec2b440f733d4c98f8ed92f6cc72df20e1fb authored about 3 years ago by Marcel <[email protected]>

name it just manifests rather then tmp_manifests

cd516d09125725e8bde99b95800005b2b92eb85f authored about 3 years ago by Marcel Märtens <[email protected]>

move ship_manifest to common assets until its properly included in servers ECS and pushed to clients

d24b90456359394aea879e48465d9c3c793b77d2 authored about 3 years ago by Marcel Märtens <[email protected]>

Merge branch 'solved_orc_beard_mystery' into 'master'

Oolnokk/ "Goatee" orc beard glitched fixed

See merge request veloren/veloren!3005

dd52695917a989b336595c1a5c3231df107b2909 authored about 3 years ago by Samuel Keiffer <[email protected]>

The long orc beard was painted with index 17 thus rendering parts invisible after the hat update, creating an infamous 'goatee' look. Copied the colors to much higher indexes, and now it looks as intended ingame.

5643cea4ba94d4d49159afdd1268a2d297664ce4 authored about 3 years ago by Oolnokk <[email protected]>

Merge branch 'xvar/fix-tooltip-floating-point-rounding' into 'master'

Added formatting to round tooltip values for consumables to 1 decimal place

See merge request v...

b1915622b5b421152376113c23df15ad33534023 authored about 3 years ago by Joshua Barretto <[email protected]>

Merge branch 'xvar/exp-sharing' into 'master'

Implemented EXP sharing based on damage contribution

See merge request veloren/veloren!2986

8d356d14a3b92e432155b1cb90b8fb4b0d24bacc authored about 3 years ago by Ben Wallis <[email protected]>

EXP on kill is now shared between damage contributors. A "damage contributor" is either an individual entity, or a group - depending if the attacker is in a group. This means that not only does the "killing blow" no longer get 100% of EXP, but multiple groups and individuals all receive their fair share of EXP on death (assuming they are still within range of the entity when it dies).

Damage from a given individual or group only counts towards a kill for 10 minutes since that ind...

022c1417b6f8718200a52830a94f89163f4c5232 authored about 3 years ago by Ben Wallis <[email protected]>

Added formatting to round tooltip values for consumables to 1 decimal place

b4c7af1ad113fd6a018ded80fb02441953331ec5 authored about 3 years ago by Ben Wallis <[email protected]>

Merge branch 'zesterer/fun-things' into 'master'

Fun Things

See merge request veloren/veloren!2987

4b3aa7e8fa14dcb11defcca4fa76af2dc3da9a5a authored about 3 years ago by Joshua Barretto <[email protected]>

Addressed review issues, added cloning docs to BodySpec::Manifests

c0bf9503bd11c06b958a9bbdf5232ff674f24b86 authored about 3 years ago by Joshua Barretto <[email protected]>

Updated changelog

657ac45288f1118cbc03cc227af55293f837077e authored about 3 years ago by Joshua Barretto <[email protected]>

Toned down golf club knockback

0f56ebe82b427a20958d99f944230293be422510 authored about 3 years ago by Joshua Barretto <[email protected]>

Added waypoints to towns

db741fe4c092ff13e6ebbc44b47c72711cc6d5a1 authored about 3 years ago by Joshua Barretto <[email protected]>

Arbitrary volume airships

46ec4203a256c0e50d942f685a4ba54059d42433 authored about 3 years ago by Joshua Barretto <[email protected]>

Made explosions bonk sprites

026a4a07bb89cd4e0d725a201e4c8839fc71527f authored about 3 years ago by Joshua Barretto <[email protected]>

Added bomb sprites

edf9c59e7df5598aafb17227e3958abee41421cc authored about 3 years ago by Joshua Barretto <[email protected]>

Added golf club

dbfbdcdacdd9b7377b211d90a51b8d6e68f7e3d6 authored about 3 years ago by Joshua Barretto <[email protected]>

Merge branch 'Oolnokk/wanderers_hat_capitalization_fix_3' into 'master'

Oolnokk/wanderers hat capitalization fix 3

See merge request veloren/veloren!3002

006edb92989a9af7dea169b6779156401e9eee0a authored about 3 years ago by Joshua Barretto <[email protected]>

Update assets/voxygen/voxel/armor/misc/head/wanderers_hat.vox

9011ed3a77ab405e86cb0d91e6fb253d0fd07ce5 authored about 3 years ago by Benjam Soule H. Walker <[email protected]>

update Get Veloren Url in README

8d15239d30dab63863a2423c04bc11e7777332cc authored about 3 years ago by William Hetherington <[email protected]>

Merge branch 'Oolnokk/three_new_hats_edited_and_approved_by_gemu' into 'master'

Three new hats. Models have been cleaned up and approved by Gemu.

See merge request veloren/vel...

32e3161d33114f039ed736daf0bc825c1c75341e authored about 3 years ago by Justin Shipsey <[email protected]>

Fixed drop chances in village crates to better resemble prior odds

de0072bbc17d6dbface6d5d871c3b89ad4b993c9 authored about 3 years ago by Oolnokk <[email protected]>

Changed drop location from boars to T2 Chests

a71f2204d9dba31327e11aa3f27648cbcd096b6b authored about 3 years ago by Oolnokk <[email protected]>

Models have been cleaned up and approved by Gemu

c6383ca5a4a99ae800d0c45222f667d87c8cac34 authored about 3 years ago by Oolnokk <[email protected]>

Merge branch 'sam/ability-pool-and-hotbar' into 'master'

Ability pool

See merge request veloren/veloren!2996

6e57380735115ae45e4969c47c7f9d4a21cf5ea5 authored about 3 years ago by Samuel Keiffer <[email protected]>

Changed fallback ability icon.

b901b9719155a3415c0266b264d3f770d09df462 authored about 3 years ago by Sam <[email protected]>

Final fixes.

040d70c7505e57c88f5e15186f5785fc4580bf37 authored about 3 years ago by Sam <[email protected]>

Removed vec allocation with an impl Iterator.

f65c89862cf0705622fef735ca845fbd7ce142ad authored about 3 years ago by Sam <[email protected]>

Addressed further review.

a288f9ee438920348e2f6ee20134753cfd657bd4 authored about 3 years ago by Sam <[email protected]>

Addressed review feedback.

dfcb8c851902f04a84962f7d1b9b356fc47931e7 authored about 3 years ago by Sam <[email protected]>

Added some client methods for changing abilities to hook into.

b678f7f46e2ccc53d9ab0782ad6b33cf0fe3c2fd authored about 3 years ago by Sam <[email protected]>

Abilities can now be referred to by the asset id.

da677e8ea6699762682337cb49a05620c311b589 authored about 3 years ago by Sam <[email protected]>

Merge branch 'imbris/leak-fix' into 'master'

Potential fix for leak when inventory is open

See merge request veloren/veloren!2995

ee6b8b6828ae9c5abe4093d788a6fdfc3546de8e authored about 3 years ago by Imbris <[email protected]>

Did voxygen stuff for ability pool.

4309e1ff9bbb8c2bec124e281b51625740940e9e authored about 3 years ago by Sam <[email protected]>

Ability pool updates after switching weapons now.

d33ff9f17e673f613ed9798cf3e08c201e18a843 authored about 3 years ago by Sam <[email protected]>

+ Fixed pathing for coal in T0 boss loot table, was mineral.coal is mineral.ore.coal now

debbc1e4c6b9d01ffda2e1d2c4b30f818135ea45 authored about 3 years ago by UncomfySilence <[email protected]>

Merge remote-tracking branch 'origin/scaling_lower_tier_dungeons' into scaling_lower_tier_dungeons

0f949f1b201ef6fe7fbadcfaa08ef3b52ef1bcb5 authored about 3 years ago by UncomfySilence <[email protected]>

+ Fixing spelling msitake in T0 Boss craftin_ing.sticky_thread to crafting_ing.sticky_thread

027664f1c0b10c9bbf054eae3b48e049199571cb authored about 3 years ago by UncomfySilence <[email protected]>

+ Reducing attack speed of minions

7a49f26568cec1bc2c3b331607d4635585988e15 authored about 3 years ago by UncomfySilence <[email protected]>