cf09348306
second cleaning pass after removing i18n.get
2022-08-23 13:14:29 +02:00
69e5c1424f
Merge branch 'zesterer/automod' into 'master'
...
Relaxed automod somewhat
See merge request veloren/veloren!3559
2022-08-23 09:44:54 +00:00
4a71698048
removed i18n.get
2022-08-23 11:19:39 +02:00
9e22ae01a0
finished first pass removing i18n.get
2022-08-23 11:17:21 +02:00
51d90707b5
Relaxed automod somewhat
2022-08-23 10:03:06 +01:00
16a3794686
in the process of cleaning up i18n.gte calls
2022-08-23 10:04:21 +02:00
5e8adb3c80
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 significant load.
2022-08-23 02:17:39 -04:00
275b17be57
Merge branch 'imbris/misc_fix' into 'master'
...
Trade canceling related tweaks, make kill_npcs not leave clutter (and actually remove entities in the first place), and misc tweaks
See merge request veloren/veloren!3555
2022-08-21 16:35:16 +00:00
ce8b8b6f12
Update changelog, cargo fmt
2022-08-21 12:10:20 -04:00
a1fd50b198
Merge branch 'DaforLynx/misc-audio-fixes' into 'master'
...
Miscellaneous audio fixes
See merge request veloren/veloren!3550
2022-08-21 05:32:02 +00:00
656727ecbd
Miscellaneous audio fixes
2022-08-21 05:32:02 +00:00
055f40ddc6
changed/typo to generic masculine
2022-08-21 02:43:09 +00:00
467e85dca2
typo fix
2022-08-21 02:28:36 +00:00
3967501a03
Small/Cultural changes recommended by @jcezarms
2022-08-21 03:26:32 +01:00
02d6090438
changed some words for better context
2022-08-21 01:42:12 +01:00
7439d09708
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 associated with it.
2022-08-20 18:47:09 -04:00
87815b4615
Use send_fallible in notify_client implementation to document that any errors are ignored (and use if let instead of map)
2022-08-20 18:47:09 -04:00
f1b6805c65
Remove outdated comments in handle_destroy and refactor map_err to if let Err
2022-08-20 18:47:09 -04:00
0ee0d446f1
Make /kill_npcs delete entities instead of setting health to 0, to avoid drops or other undesired effects from occuring.
2022-08-20 18:47:09 -04:00
ca66a9f79b
Fix bug in Health::kill that caused Destroy event to never be emitted by preemptively setting is_dead to true
2022-08-20 18:47:09 -04:00
3b87bf1e4a
Merge branch 'xMAC94x/slowjob_freeze_reproduction' into 'master'
...
Initial reproduction of the slowjob freezen with par_iter and slowjob,
See merge request veloren/veloren!3546
2022-08-20 20:44:07 +00:00
05805c2adb
Merge branch 'juliancoffee/body-cmd' into 'master'
...
Add /body command that allows you to switch body
See merge request veloren/veloren!3554
2022-08-20 20:11:42 +00:00
fc9dca7e95
Added gameinput missing keys
2022-08-20 20:48:52 +01:00
b662d9cce1
Added common missing keys
2022-08-20 20:48:36 +01:00
636dbc8a22
Added char_selection missing keys
2022-08-20 20:48:20 +01:00
b288214650
Added and formatted npcs missing keys
2022-08-20 20:48:04 +01:00
00a13fd893
Added settings missing keys
2022-08-20 20:47:37 +01:00
69cea513ee
Make comments to be doc-comments
2022-08-20 22:30:25 +03:00
6319dcfc22
Add more components in /body
...
* Add mass
* Add density
* Add collider.
This one is strange as always, I don't know what's wrong, but debug hitbox
changes only after death. Real one seems to work.
2022-08-20 17:02:08 +03:00
e4c9634b76
Merge branch 'juliancoffee/workaround-isolation-marks' into 'master'
...
Don't produce isolation marks in fluent
See merge request veloren/veloren!3553
2022-08-20 13:16:25 +00:00
cafef52b01
Merge branch 'socksonme/fix_coverage_shell_script' into 'master'
...
Fix coverage shell script
See merge request veloren/veloren!3552
2022-08-20 13:14:32 +00:00
a371aad05e
Add /body command that allows you to switch body
2022-08-20 15:20:27 +03:00
64c909cba0
Don't produce isolation marks in fluent
2022-08-20 13:36:16 +03:00
74e8dbf757
Merge branch 'juliancoffee/new-fluent-abilities' into 'master'
...
Use fluent attributes for abilities
See merge request veloren/veloren!3549
2022-08-20 03:21:16 +00:00
7048440cbb
Merge branch 'juliancoffee/add-ftl-files-ci-watcher' into 'master'
...
Make CI trigger on .ftl changes
See merge request veloren/veloren!3551
2022-08-19 17:22:29 +00:00
0e5b472d1d
Fix sed regex
2022-08-19 19:45:22 +03:00
e15c375cb5
Use fluent attributes for abilities
...
* Better translation logic and ergonomics
* Cut two format!-s
2022-08-19 18:35:44 +03:00
a16af15140
Make CI trigger on .ftl changes
2022-08-19 18:29:47 +03:00
7587fb6e96
Merge branch 'tygyh/swedish-translation' into 'master'
...
Update swedish translations
See merge request veloren/veloren!3542
2022-08-19 07:53:01 +00:00
3eac68000b
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
2022-08-19 09:50:00 +02:00
8ca458188d
also those dispatcher tricks wont help the test, it still sporadically fails
2022-08-19 09:30:56 +02:00
25d9e5b27e
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 inside a Threadpool.install, that the parallel iterator will BLOCK till the Threadpool.spawn finished, which causes many many lag spikes.
I assume this might be the case for the pictures in the gantt chart where a system took unusual long or had a long pause that was unexplained.
I also raise the number of threads by 1, as this rayon thread will prob be useless in all cases and have no real work to do.
EDIT: it turns out the tests are sporadicly failing and this soluction doesnt work
2022-08-19 09:30:00 +02:00
ca928a9fec
Merge branch 'juliancoffee/fix-convert-to-unicode' into 'master'
...
Resurrect convert_utf8_to_ascii
See merge request veloren/veloren!3548
2022-08-18 23:23:34 +00:00
f104085a85
Adress review
...
1) Add NOTE about brute-force deunicode
2) Fix ut8 -> utf8 typo in comment
2022-08-19 01:46:41 +03:00
d26422dc29
Resurrect convert_utf8_to_ascii
2022-08-19 00:09:39 +03:00
c968e5c748
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 executed
Next step is to do everything with plain rayon coding
2022-08-18 12:38:17 +02:00
c8a41e724c
Merge branch 'tormod/opportunistic-ambush' into 'master'
...
Tormod/opportunistic ambush
See merge request veloren/veloren!3441
2022-08-18 10:31:24 +00:00
9ede001d4a
Merge branch 'xmac94x/fix-default_publish' into 'master'
...
fix coverage
See merge request veloren/veloren!3544
2022-08-18 07:23:47 +00:00
fdaaa24338
fix coverage
2022-08-18 09:00:16 +02:00
e306b3bfe3
Have the ambushers say something.
...
Very unsure about the way I did this...
2022-08-17 23:50:09 +02:00
