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

formtaed code with cargo fmt

0ca2e64772bf974c1ffcb6ceebebe57a71392c81 authored over 2 years ago

Merge branch 'imbris/fifo-default' into 'master'

Make the present mode default to Fifo instead of Immediate

See merge request veloren/veloren!3558

73ed0965d5bed689cb737614164982dc220c9a4e authored over 2 years ago

tidied up code

e7f472059daf49cba9375b353e4791ebe92954c8 authored over 2 years ago

final cleanup for issue #1652

a3388bdd2e8fbe6d3dd7f119ba165b9bd021bff0 authored over 2 years ago

second cleaning pass after removing i18n.get

cf093483068f96cb63955c6f683aa08bd59dbae9 authored over 2 years ago

Merge branch 'zesterer/automod' into 'master'

Relaxed automod somewhat

See merge request veloren/veloren!3559

69e5c1424f664c531265d24f979105ac7e2ebb1f authored over 2 years ago

removed i18n.get

4a71698048633d3331a0bc692be7d8f3d1621a70 authored over 2 years ago

finished first pass removing i18n.get

9e22ae01a0151d5c6f091269a3ae2456a71fb2a4 authored over 2 years ago

Relaxed automod somewhat

51d90707b5fe1d1864b096c8a8cf24949dc52093 authored over 2 years ago

in the process of cleaning up i18n.gte calls

16a3794686d13af8f1db414512913a54e6582b7a authored over 2 years ago

Make the present mode default to Fifo instead of Immediate since it uses

less power and in my own experience is generally a better experience when
the GPU is under signif...

5e8adb3c80fc73b4962ebeb964c33faa4415383b authored over 2 years ago

Merge branch 'imbris/misc_fix' into 'master'

Trade canceling related tweaks, make kill_npcs not leave clutter (and actually remove entities i...

275b17be574ee7da2de80bf87443df58d9608b11 authored over 2 years ago

Update changelog, cargo fmt

ce8b8b6f1260796544d370e34775b117bd42d87a authored over 2 years ago

Miscellaneous audio fixes

656727ecbdcd1acdfe38b44d2461c083fa453143 authored over 2 years ago

Merge branch 'DaforLynx/misc-audio-fixes' into 'master'

Miscellaneous audio fixes

See merge request veloren/veloren!3550

a1fd50b198c8664291042bdae7ab58244e073246 authored over 2 years ago

changed/typo to generic masculine

055f40ddc6f4e5eaa4c96e02602ec8cde9cd3572 authored over 2 years ago

typo fix

467e85dca22f9eeed911c22b4db7907924be9938 authored over 2 years ago

Small/Cultural changes recommended by @jcezarms

3967501a03b5446bca430ab749358f80aa598b75 authored over 2 years ago

changed some words for better context

02d609043848234c35ad0be23880bb6a52eb4d03 authored over 2 years ago

Fix bug in Health::kill that caused Destroy event to never be emitted by preemptively setting `is_dead` to true

ca66a9f79b4109dcb256434c816749a9e295ee63 authored over 2 years ago

Remove outdated comments in handle_destroy and refactor `map_err` to `if let Err`

f1b6805c659faedd52f5099a6c5bb5b001a98d1e authored over 2 years ago

Use `send_fallible` in `notify_client` implementation to document that any errors are ignored (and use `if let` instead of `map`)

87815b4615cae5b6c1d93f84bc1046fee06630a4 authored over 2 years ago

Ensure that the client clears pending trades on its side when exiting to

the character screen (and similar actions). When any entity is
deleted cancel any existing trades...

7439d0970831162fd105423b72454509f92363a0 authored over 2 years ago

Make /kill_npcs delete entities instead of setting health to 0, to avoid drops or other undesired effects from occuring.

0ee0d446f1712529dd0381627c93b02133741885 authored over 2 years ago

Merge branch 'xMAC94x/slowjob_freeze_reproduction' into 'master'

Initial reproduction of the slowjob freezen with par_iter and slowjob,

See merge request velore...

3b87bf1e4a58686d209b929bfbe33f3e552bda85 authored over 2 years ago

Merge branch 'juliancoffee/body-cmd' into 'master'

Add /body command that allows you to switch body

See merge request veloren/veloren!3554

05805c2adb66708aada0849677b8ae35cbc63744 authored over 2 years ago

Added gameinput missing keys

fc9dca7e952869cd1938f92dc3532f6c7a39450f authored over 2 years ago

Added common missing keys

b662d9cce1c897d82e3e75fce0394203d90d0a3c authored over 2 years ago

Added char_selection missing keys

636dbc8a2298691229ff74ed3df1f7e996f375de authored over 2 years ago

Added and formatted npcs missing keys

b28821465065a542e4996b6117b04dcfe4c604d4 authored over 2 years ago

Added settings missing keys

00a13fd8932b33973ba42b40a91275995cf7ed54 authored over 2 years ago

Make comments to be doc-comments

69cea513eedae66d1df8414c8e84b5e7503d8d35 authored over 2 years ago

Add more components in /body

* Add mass
* Add density
* Add collider.
This one is strange as always, I don't know what's wron...

6319dcfc22c1167212f1e6871b70785d1ea09304 authored over 2 years ago

Merge branch 'juliancoffee/workaround-isolation-marks' into 'master'

Don't produce isolation marks in fluent

See merge request veloren/veloren!3553

e4c9634b767d44e1cb40c5c036d12bde15f9e66a authored over 2 years ago

Merge branch 'socksonme/fix_coverage_shell_script' into 'master'

Fix coverage shell script

See merge request veloren/veloren!3552

cafef52b017f74cb8fe31e84a3b08302c444bd33 authored over 2 years ago

Add /body command that allows you to switch body

a371aad05e6ee1e27c39320c31e9f1fb3abaa107 authored over 2 years ago

Don't produce isolation marks in fluent

64c909cba02147738c247d1ee5a67f34c81d6820 authored over 2 years ago

Merge branch 'juliancoffee/new-fluent-abilities' into 'master'

Use fluent attributes for abilities

See merge request veloren/veloren!3549

74e8dbf757486690c090eb3c0ea161506a39c010 authored over 2 years ago

Merge branch 'juliancoffee/add-ftl-files-ci-watcher' into 'master'

Make CI trigger on .ftl changes

See merge request veloren/veloren!3551

7048440cbbf66dbf86e19cb15321bf7bd14d8384 authored over 2 years ago

Fix sed regex

0e5b472d1d9f8048efa8e2d1bea63190114bd06c authored over 2 years ago

Use fluent attributes for abilities

* Better translation logic and ergonomics
* Cut two format!-s

e15c375cb58fb9b6979ff9c1d8f659e4f7f3c253 authored over 2 years ago

Make CI trigger on .ftl changes

a16af151400f1ca9d2b7b1bef6edc6cf8d557498 authored over 2 years ago

Merge branch 'tygyh/swedish-translation' into 'master'

Update swedish translations

See merge request veloren/veloren!3542

7587fb6e9652440ba4dbfa473b764ddc81836c24 authored over 2 years ago

all tests shows there is currently no way to keep rayon from work-stealing over scopes and doing really really weird stuff between the ECS threadpool and the slowjob Threadpool. so even if i dont like to have multiple threads i think there is no other workaround than just creating a second threapool for background tasks

3eac68000bf81d091f09e94b7d22c0a96165f0b7 authored over 2 years ago

also those dispatcher tricks wont help the test, it still sporadically fails

8ca458188d524edfe5af411f37392fabfeaaaafd authored over 2 years ago

workaround for https://github.com/rayon-rs/rayon/issues/969

Unfortuatly rayon has a bug that if you Threadpool.spawn from inside a parallel iterator from in...

25d9e5b27e9f9377ddbc7967fe7007e1630b0f3e authored over 2 years ago

Merge branch 'juliancoffee/fix-convert-to-unicode' into 'master'

Resurrect convert_utf8_to_ascii

See merge request veloren/veloren!3548

ca928a9fecb3095eda010117037026413c1aaaf6 authored over 2 years ago

Adress review

1) Add NOTE about brute-force deunicode
2) Fix ut8 -> utf8 typo in comment

f104085a8566d0ad94ff3bbf3fe9e525c6c03faa authored over 2 years ago

Resurrect convert_utf8_to_ascii

d26422dc293c0e749fb9a4d2fe5c935b45e4d255 authored over 2 years ago

Initial reproduction of the slowjob freezen with par_iter and slowjob,

See that we spawn 2 jobs in the first loop, the loop seems to NOT complete until those jobs are e...

c968e5c748c09c26bd8c246d9ae2e63d1dad230c authored over 2 years ago

Merge branch 'tormod/opportunistic-ambush' into 'master'

Tormod/opportunistic ambush

See merge request veloren/veloren!3441

c8a41e724c363ff04e334dfdc0ce0338dd618929 authored over 2 years ago

Merge branch 'xmac94x/fix-default_publish' into 'master'

fix coverage

See merge request veloren/veloren!3544

9ede001d4a0f80bfc56d3467f146cac41695922b authored over 2 years ago

fix coverage

fdaaa24338a66f4fa4e7679cf85f9fd46015b842 authored over 2 years ago

Make selfish bastards ambush people when they're alone.

753a51e6831c1c2128bcaf54b1f6f31223ce80c3 authored over 2 years ago

Have the ambushers say something.

Very unsure about the way I did this...

e306b3bfe35a5353e6985ae64436c651cb291385 authored over 2 years ago

Merge branch 'juliancoffee/i18n-tooling-fluent' into 'master'

Implement i18n-tooling

See merge request veloren/veloren!3536

c6bcdd7a2c09b5ab1f17346a3e6b12d989cdb4e8 authored over 2 years ago

Implement i18n-tooling

* Working csv export
* Working i18n-check

847ee1c1b1480292fb556a3f269e4dbf386b262d authored over 2 years ago

Remove template.ftl file

They are empty anyway

3860b3ece32592180aaff4b1d8c022fb6d2c8e89 authored over 2 years ago

Merge branch 'vacuum_database' into 'master'

Server: Vacuum database on startup

Closes #1610

See merge request veloren/veloren!3527

5a15611f3318b9a1765fc75d12acd9ae312d83e2 authored over 2 years ago

Server: Vacuum database on startup

Runs after the migrations. In some cases, it can reclaim a significant amount of space (reported...

021a8be62eb036786c4e6a3ef243d2e11ea78aa7 authored over 2 years ago

Update swedish translations

1ce4cb4901cfa02a025bbea6ebb90911f9e2ecc3 authored over 2 years ago

Merge branch 'temp_merchant_fix' into 'master'

Temporary invincible merchants

See merge request veloren/veloren!3541

5e5665ea19bbce67f8f132d8d43de915010e1edd authored over 2 years ago

Temporary invincible merchants

50701620e634579ac4fdd73da779dacf15b9d277 authored over 2 years ago

Merge branch 'AldanTanneo/discord-presence' into 'master'

Discord Activity

See merge request veloren/veloren!3529

dfe2e1c085ba3c8f9266b821b6c25841b3090cbf authored over 2 years ago

Discord Activity

ba87a405af1a0d7ce525e919d21b4e98b79ffdbd authored over 2 years ago

Merge branch 'isse/spectator-fixes' into 'master'

Various spectator fixes.

See merge request veloren/veloren!3534

6c17f7b95b591e49b972f747a37d20b9375111d5 authored over 2 years ago

fix viewpoint meshing

f77cce68d5a3f8452e0ead2894b085cfea935f99 authored over 2 years ago

camera movement changes

911be0113db197c791c9341b1aa1e5646d993099 authored over 2 years ago

fix viewpoint rotation

9b7a67c80e82e2893c3a44dd9c781239af1b92ec authored over 2 years ago

save spectate position

689376ec70ae03e413d58f3576546f955fda64c4 authored over 2 years ago

Merge branch 'campfires_for_clifftown_and_desertcity' into 'master'

add campfires to clifftown and desertcity

See merge request veloren/veloren!3538

14aad5fde74f296203c084b13faa0dbd7c79f4a0 authored over 2 years ago

add campfires to clifftown and desertcity

4c49cb933ef733f333dd073ef7a4101ed0a1e52d authored over 2 years ago

Merge branch 'DaforLynx/audio-additions' into 'master'

Gnarling Fort music; more specific sites; fix music spacing; new sfx

See merge request veloren/...

4ddd7ff4c9dcbce6a8f239ba3a0e707401bf086a authored over 2 years ago

Gnarling Fort music; more specific sites; fix music spacing; new sfx

daadf3abdb0138eca58bbdf6833f77fa55ea4fc8 authored over 2 years ago

Merge branch 'fix-flashing-lights' into 'master'

Fix experimental shaders

See merge request veloren/veloren!3537

3e5f04cb40c95004b95acd6aba3cf9b366aca4e9 authored over 2 years ago

add newline to flashing lights option

50274fbc0c78ae25609408dbc57a954c58d931cb authored over 2 years ago

DesertCity small fix

4ccec12dc788c282abb3dce073074ace7138a7f5 authored over 2 years ago

Merge branch 'floppy-desertcity-fixes' into 'master'

DesertCity small fix

See merge request veloren/veloren!3530

7ad52ba901e0e26f23eda3809ff385fd2e597edb authored over 2 years ago

Craft all

9315482fc473297b3a8129ea4018105c07ffbe8f authored over 2 years ago

Merge branch 'craft-all' into 'master'

Craft all

See merge request veloren/veloren!3525

a1b5f53d156288562b927b39a5a5f2d04812b59f authored over 2 years ago

Merge branch 'vfoulon80/agent-behavior-tree' into 'master'

Refactor agent's behavior tree

See merge request veloren/veloren!3500

9112e2177ab5886f7ccfe05dd43acd5ea7db773c authored over 2 years ago

Fix compilation with worldgen turned off.

e81dade43fc920d5ad7eea63d17df878a06301d6 authored over 2 years ago

Merge branch 'isse/test-world-fix' into 'master'

Fix compilation with worldgen turned off.

See merge request veloren/veloren!3531

9f9bfc8fb3f19f2da433af97b629970fa098678c authored over 2 years ago

Address review comments

b1baa09815ccd4e641289b3a434bea48c80b7203 authored over 2 years ago

Merge branch 'zesterer/automod' into 'master'

Automod

See merge request veloren/veloren!3513

900454552a4531ffcf6a04548e96834a4225aa58 authored over 2 years ago

Perform validation on all kinds of chat message

602de267b1f5d9acce33158a96996716372f3275 authored over 2 years ago

Simplified and improved alias validation

4e103c433fab4d841915d2f815756b59640b4b73 authored over 2 years ago

Improved banned words loading

4d110a542c61bd419b88def73f7e8ed5fcc0d22f authored over 2 years ago

Added automod

52bd7b2485b48c508ba91af3ee5920c3245743ec authored over 2 years ago

Fix crash when Gap Between Songs is set to 0.0; changed name to Music Spacing

258feee6340d1f489477449840e4d53f6123ec02 authored over 2 years ago

Merge branch 'DaforLynx/music-gap-fix' into 'master'

Fix crash when Gap Between Songs is set to 0.0; changed name to Music Spacing

See merge request...

2d2d6b5c64bf9160ea1eba4e3cb69509493ade93 authored over 2 years ago

Login screen's first detected tab triggers username focus

177fbcb0bc3812e37004de02230c351bec006012 authored over 2 years ago

Merge branch 'airshipper_field_acessibility' into 'master'

Login screen's first detected tab triggers username focus

See merge request veloren/veloren!3526

ce52e53033790b27d2979288194b265856aafc27 authored over 2 years ago

Merge branch 'isse/town-music-fix' into 'master'

Add town music to cliff towns and desert cities

See merge request veloren/veloren!3524

099ed62a69904e1f6542735e1220f2479106b282 authored over 2 years ago

Add town music to cliff towns and desert cities

0cd4d71d001206d43320390818b21d9f96b63078 authored over 2 years ago

Merge branch 'juliancoffee/boost-skills-ui' into 'master'

Force no digits after dot printing for boosts

See merge request veloren/veloren!3523

c2847bbbf28b6dbd7278bdc86d577cebf10892ea authored over 2 years ago

Merge branch 'isse/spectate' into 'master'

Spectate mode

Closes #1379

See merge request veloren/veloren!3457

877b4b06d72da9f3d75ad8ed862b17521c6fb982 authored over 2 years ago

Force no digits after dot printing for boosts

02c78c28f43aa703724ff57f9350ae4c69734795 authored over 2 years ago

Add to changelog

e2368075599ed1953e12cb36963b732b07726e43 authored over 2 years ago

force update counter

87821d5c1d504e70e25c646b1e54ebb5219bf23f authored over 2 years ago