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

Merge branch 'sharp/parallel-ingame' into 'master'

Parallelize ingame messages.

See merge request veloren/veloren!3627

57ea753bff94d11920f00665e08ab5ce772a5620 authored over 2 years ago

Parallelize ingame messages.

1c14ec7ee1c6e3de73539f52916d531c915f5277 authored over 2 years ago

Remove persistence loading error from SkillSet.

This is needed (for now) in order to parallelize ingame_chat, because
one of the handled message...

67231aff9096297d68e8fae42541623dc0016789 authored over 2 years ago

Merge branch 'mckol/mute-keybinds' into 'master'

Mute audio keybinds (and respective buttons in settings)

See merge request veloren/veloren!3361

f590e68f7e76571cd5c8b2dc408a2a05d4f2aaef authored over 2 years ago

Merge branch 'sam/hot-agent' into 'master'

Agent combat tactics hot reloading

See merge request veloren/veloren!3629

188db01a7b7bbd39168ffc9273e8dbe99ef3523d authored over 2 years ago

Merge branch 'Couls/TestBed' into 'master'

Extend item pickup UI to group members

Closes #1402

See merge request veloren/veloren!3521

1b48a3008c20f86275115c6cf02d7588a4462cc9 authored over 2 years ago

Extend item pickup UI to group members

4a4c061b558dc5547ad125e41a180552cffc5562 authored over 2 years ago

Merge branch 'MadirexRus/update-ru_RU' into 'master'

Update the Russian translation

See merge request veloren/veloren!3631

27a368defd8a7c379001438ad1416f6fd735864f authored over 2 years ago

Update the Russian translation

0ae7980a2a2a92ec08926c849e53c66bdfe6c3f5 authored over 2 years ago

Merge branch 'koboo/update-de_DE' into 'master'

Koboo/update de de

See merge request veloren/veloren!3620

dee565a325bef664c81a1aed7dd7e419dac129fc authored over 2 years ago

Koboo/update de de

bb0382e76c5da10fba10f1b6450323c652faeef6 authored over 2 years ago

Addressed comments

c228d9cc3f7a702e48e56d1061e88ce0100bd3c3 authored over 2 years ago

Moved some code around to put it in logical order

2d092635edd8e0b5baf5608a062c8e8fe7b5f6d7 authored over 2 years ago

Removed redundant package parameter from init function of hot reloading

3d6c9a780db4b2def904630a65b1b72b3a2f5c58 authored over 2 years ago

Removed duplicate crates added so there could be dynamic crates, now compiled with crate type specified instead.

cfeb197f853a6b8053074341ae9a798ea823734b authored over 2 years ago

Consolidated voxygen and server dynlibs into a common dynlib

23c51af4375e276e691f06bb33a9a15b5798e85e authored over 2 years ago

Dynamic library compiles, but still panics

ddb56bd560bcff7b07a74c5e7b28577093cf8f20 authored over 2 years ago

Hot reloading attack code in agent now functional

b632dbffdd95f9cceedbfc298cfed2b4146a6cba authored over 2 years ago

Moved some agent code into separate crate to facilitate hot reloading of that agent code.

525630c37a67ec92859d61393b73c37340f52575 authored over 2 years ago

Merge branch 'juliancoffee/loot_export_fix' into 'master'

Make loot export display all modulars

See merge request veloren/veloren!3598

5d8a708d6ba2ad2c89c07a18966ed997bcafc55e authored over 2 years ago

Added i18n stuff for volume muting keybinds for en and pl_PL locales

6ad02b1fb0635a5ea64e848401350b1e181e017c authored over 2 years ago

Updated mute buttons to have less distracting borders (they don't have indexed color)

716d4e476ede254c771843c1fbe3dc0c1c84bc4e authored over 2 years ago

Now when master volume is muted other volume icons are grayed out.

22c99af9d10b2fa08be440a11734fae0d0b747a4 authored over 2 years ago

Merge branch 'xvar/better-voxygen-panic-messages' into 'master'

Reworked panic dialog to support displaying the likely cause of common panics

See merge request...

7aa1feea22919190e1f9d2da6d810d4b1aeaeb6c authored over 2 years ago

Merge branch 'revert-b4234523' into 'master'

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

See merge request veloren/veloren!3626

af3f9dcc3ef634a5ad20ffedcf98418c4a4eb3a4 authored over 2 years ago

Fix Cargo lock

5813861ab21db91422643bb73dea17ad72089076 authored over 2 years ago

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

This reverts merge request !3608

e9a463d4591edefd03d8bc71b37b82ac39e4e6d4 authored over 2 years ago

Merge branch 'sharp/fix-shaderc' into 'master'

Unrevert fix to shaderc.

See merge request veloren/veloren!3622

1b8ad88106e3847743697b5703479dc5e3111122 authored over 2 years ago

Unrevert fix to shaderc.

f481e8cd4fd791f5b0d977f39ade849476d74259 authored over 2 years ago

Merge branch 'xvar/update-ci-docker-image' into 'master'

Updated docker CI image to include cmake

See merge request veloren/veloren!3625

699493b656d1beafef02347a7f2982ab48c73e34 authored over 2 years ago

Temporarily disabled coverage build step due to issues building docker cache image

693e3be0665116b22cf9c5a85c77bb861f0045bc authored over 2 years ago

Updated docker CI image to include cmake

ec2d1b0388d7369604b5cb151021f6a4ba172e51 authored over 2 years ago

Merge branch 'tygyh/Swedish-translations' into 'master'

Update swedish translation

See merge request veloren/veloren!3623

705c72e5c5d1dbe4ee3554b593d4a78cca184998 authored over 2 years ago

Update swedish translation

a724c014c81ef441f977ae8f5e37d6dd7c84c686 authored over 2 years ago

Merge branch 'sharp/improve-msg' into 'master'

Improve some server system performance

See merge request veloren/veloren!3614

cafdcad8ce9425e25ebad8dbbe34b63b396da970 authored over 2 years ago

Reduce overhead of messaging systems.

2c15d0af560445c95a94fe4a5eaa5d299e4ccc2d authored over 2 years ago

Fix pet aggro

5d5cb28b59225de823d0b3568a1c38fd4fe34073 authored over 2 years ago

Merge branch 'james/fix-pet-aggro' into 'master'

Fix pet aggro

See merge request veloren/veloren!3619

23a8ac906ac0a511bea5be097db183c68a7cb1e3 authored over 2 years ago

Merge branch 'yusdacra/nix' into 'master'

!2951 with fixed runtime panic

See merge request veloren/veloren!3605

725fd09ed716cd88284a4614c3051e791f8965fb authored over 2 years ago

Merge branch 'koboo/update-de_DE' into 'master'

Koboo/update de de

See merge request veloren/veloren!3618

5249995ea0cb6d7d9b767c0ee631546daf623c24 authored over 2 years ago

Koboo/update de de

54e3b3e9f50ad1ea7a30bee14fb14cbf26f3d625 authored over 2 years ago

fix_salamander_and_elbst

dc688bccb98ffae0257f2f5955d972b7408b3e57 authored over 2 years ago

Merge branch 'fix_salamander_and_elbst' into 'master'

fix_salamander_and_elbst

See merge request veloren/veloren!3609

0d09d1f88ed3abd4ed0c83c8046d1ea2c2a72a18 authored over 2 years ago

Merge branch 'koboo/update-de_DE' into 'master'

Update the German translation (hud-skill-dodge resolve error)

See merge request veloren/veloren...

6ec7bc54277961f2c6309f8ed51795519c8d0247 authored over 2 years ago

Reworked panic dialog to support displaying the likely cause of common panics

f1a2031f22d713a6d12249b5f9ea8adc2506f887 authored over 2 years ago

Make loot export display all modulars

97900b109f0706421c6ad194e71dfc5368045f00 authored over 2 years ago

Remove csv_import of loot table

be1638e2e7aa043119f2864ce967c3f021f515ea authored over 2 years ago

Update the German translation (hud-skill-dodge resolve error)

71c2d99aef9f4f21e3bb4e9d0bdbb74659088bba authored over 2 years ago

Merge branch 'xmac94x/steal-sharps-clippy-improvements' into 'master'

Xmac94x/steal sharps clippy improvements

See merge request veloren/veloren!3612

aea4aca0571378d55045d576b9424723cab7d692 authored over 2 years ago

revert wgpu/shaderc changes

6c9deee4918072c9512a0b1cfadcadcf26b04259 authored over 2 years ago

steal sharps clippy improvements to the old nightly

a32b269252952c1b42afc83af90ae6aa99e972d7 authored over 2 years ago

add guitar & instrument sample edits

e43608ce80d7bf49d447211c33904b3922562da5 authored over 2 years ago

Merge branch 'floppy_instrument_sample_edits' into 'master'

add guitar & instrument sample edits

See merge request veloren/veloren!3574

513b135d5862e81907dfaf27905a5c385c05ff56 authored over 2 years ago

Merge branch 'zesterer/better_aa' into 'master'

HQX upscaling for lower internal resolutions, fixed FXAA at lower internal resolutions

See merg...

afc33bb22e91327b420a055dbc3f664e746b5ede authored over 2 years ago

Updated changelog

33b807c2372aad7c3e3a184e73054ba3b7c2dbfe authored over 2 years ago

Fixed FXAA at non-1.0x scales

b3b2f404e53001f5ed82b004db66a1a7a463d270 authored over 2 years ago

Better depth-aware HQX

85a1c06be65ea3cfbabdc0d298d765668de93e4c authored over 2 years ago

Added HQX anti-aliasing

80fa0baf09cc37310aa65cb3a7a80cfddad99335 authored over 2 years ago

Merge branch 'xvar/update-docker-compose-to-weekly' into 'master'

Updated docker-compose.yml to use weekly image instead of nightly

See merge request veloren/vel...

4939d5c1263fdc5e17ee357d9d8256e55e3dc579 authored over 2 years ago

Updated docker-compose.yml to use weekly image instead of nightly

943cfe2d8950abc12e0b8cc9f21b28c4bec9e3aa authored over 2 years ago

Added experimental BetterAA shader

03e8eb42ad2207d6634bfa0cfacbcc2efd9373bf authored over 2 years ago

Added the possibility to toggle muting of any volume category via a keybind

796a5f2f90b68229deb99f85a894f81ef0334016 authored over 2 years ago

Update Rust toolchain.

986d104faa28d6d1fb8983d3624a6237b160dfcd authored over 2 years ago

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

xmac94x/update deps

See merge request veloren/veloren!3608

b4234523cbfbc9ac4fc398127ef0d71c646e2869 authored over 2 years ago

run cargo update

f653c4f36ff291baa93be7850d87c6e1596f5d89 authored over 2 years ago

update dependencies

d9e6f106886e59c95c7e55b2406dda2420ec9e75 authored over 2 years ago

Merge branch 'sharp/fix-mismatched-server-info' into 'master'

Fix swallowed network error messages.

See merge request veloren/veloren!3606

fbb7d888fe8496beed741f821fa9cc5f8b0a0955 authored over 2 years ago

Fix swallowed network error messages.

5bb27d9292ffaa98f429919bc172b11fe6857052 authored over 2 years ago

fix: default to build detected git version / tag if we can't get runtime variables

812298cb632a5edc30abab052f05b396f79b59c1 authored over 2 years ago

Revert "Merge branch 'revert-441acd3e' into 'master'"

This reverts commit f170da4da6bb424c62846ab9aa4af04e698ebab6, reversing
changes made to aa756906...

58e74a26cda78741b395c356c29694e25629c763 authored over 2 years ago

Merge branch 'revert-441acd3e' into 'master'

Revert "Merge branch 'yusdacra/chore/nix' into 'master'"

See merge request veloren/veloren!3603

f170da4da6bb424c62846ab9aa4af04e698ebab6 authored over 2 years ago

Revert "Merge branch 'yusdacra/chore/nix' into 'master'"

This reverts merge request !2951

e55b541bccdfc136af93c7b6882b8b0248467fab authored over 2 years ago

Merge branch 'juliancoffee/more-buffs' into 'master'

Add Golden Cheese debug potion

See merge request veloren/veloren!3597

aa7569061b4721809d42efdc09412c0955f1262a authored over 2 years ago

Merge branch 'sharp/fix-full-server' into 'master'

Allow mods/admins to log in when server is full.

See merge request veloren/veloren!3600

c95c08ee541cdeff322d7471ba96656acb91a591 authored over 2 years ago

Allow mods/admins to log in when server is full.

As a side effect, this moves the initial game server sync message into
the login code, since tha...

f5aee1d2a7d2426953918b2c3546601f2b2591e8 authored over 2 years ago

Merge branch 'matheusclmb/update-pt_BR' into 'master'

pt_BR - Added all missing keys and formatted some old ones.

See merge request veloren/veloren!3556

411aa3b0d9c74f3a3717a31145e0972cfe29cac9 authored over 2 years ago

Merge branch 'yusdacra/chore/nix' into 'master'

build(nix): refactor and update nix flake

See merge request veloren/veloren!2951

441acd3e48af61cbdf2a9986ce916cc3c336a1fd authored over 2 years ago

build(nix): fix recompilation issues and improve build overhead

cdfb2ae040e97ab580330f3ff5036139c83cd5f9 authored over 2 years ago

Add Golden Cheese debug item

3cbfe02a8e1a687ee50b4564f680df3571727243 authored over 2 years ago

Extract buff executor into own function

54c48c71128a5983c5b13ed2b084c9cb1207743c authored over 2 years ago

Add Energy regen buff

* Fix broken i18n keys for health and energy increases
* Better handle buff descriptions
Calcula...

34c5e95d8a3e779639608d686edd776016be9c11 authored over 2 years ago

Merge branch 'creature_model_updates' into 'master'

Creature model updates

See merge request veloren/veloren!3584

7ea720b2eff14cb0db545a309c30dbe491a374e0 authored over 2 years ago

Creature model updates

e4a3671345621b40c5ac93573aea3330b9a3d611 authored over 2 years ago

Merge branch 'juliancoffee/bigger-kit' into 'master'

Make /kit use all weapons from possible modulars

See merge request veloren/veloren!3595

34fa03a425abcba225794c2b560d54ffbe8f4128 authored over 2 years ago

Adress review

* Make compatible_handndess check its own function and get back to
`match`

2b3cfe690d062597a5f821f38d906c31fda2e0f4 authored over 2 years ago

Merge branch 'juliancoffee/fix-wallstuck' into 'master'

Reduce traversal_config min dist

See merge request veloren/veloren!3596

f04a17b907df665f72774861e31b3be559544608 authored over 2 years ago

Merge branch 'zDrag0nG/update-es_ES' into 'master'

Update Spanish Translation

See merge request veloren/veloren!3594

c39be960a09e0d9a880c27b7e73b3a746bc4ff51 authored over 2 years ago

Update Spanish Translation

18e1b48006a68fd365efbaa187781d6e6436ca5f authored over 2 years ago

Reduce traversal_config min dist

* Fix LOS pillar cheesing

68da12ab6bb1177d2f809a5094da57ccabe9eea3 authored over 2 years ago

Assets work

* Remove endgame /kit, move cultist weapons to cultist, move legendaries
to tier-5
* Remove ro...

54a1adea318e116c119efd7e9fe16cbb1f9e06b6 authored over 2 years ago

Add functions to generate collection of modulars

0c5a33b031ff2c0683d6d51c9d51c1f9d00ce22d authored over 2 years ago

Make kit generate all possible modulars

421aa44d5f0b6961c2e3347ee2fca70e432fbd5a authored over 2 years ago

Merge branch 'imbris/server-arg-for-airshipper' into 'master'

Add `--server` argument to specify the server when launching voxygen.

See merge request veloren...

81b85217103f26a2a66941787308ec03b8841804 authored over 2 years ago

build(nix): use correct linker in main derivation compile

511922baa5f3817286671a8570e1012f46b38340 authored over 2 years ago

[voxygen] Disable editing server address if it is supplied via CLI and hide server list button (with an unlock button to re-enable editing)

9dbff4c342b51eaaf37554f8bdbeb388848326d4 authored over 2 years ago

build(nix): refactor flake with new nci

960aac307d1b87066e82d4d558b097cec0e40d4c authored over 2 years ago

Add CLI argument to voxygen that allows specifying a value to place into the server field in the main menu.

18888639151962c9546b589643249bd5112f6cee authored over 2 years ago

Improved mute button assets (TODO merge with a5f446a7)

33ded63da919a15b269fcc59afb5aa8ba6d91b8a authored over 2 years ago

Renamed some files, added missing img_ids.

36167f2e3a7932ac3ec63058086a700afa8d5018 authored over 2 years ago

Updated the code to use the new hover icons

24c50fab3b6a2958b4130531ee605be188e87430 authored over 2 years ago