Commit Graph

12330 Commits

Author SHA1 Message Date
flo666
e55eaf1782 put seachapel in unrealesed in changelog 2022-08-25 15:49:48 +02:00
juliancoffee
49e8cec5eb Fix i18n keys 2022-08-25 16:30:26 +03:00
Marcel
cfec8b5e9d Merge branch 'juliancoffee/stricter-localization-tests' into 'master'
Improve i18n analytic tools

See merge request veloren/veloren!3566
2022-08-25 13:26:48 +00:00
juliancoffee
ae399b3c7c Remove cfg(feature = stat) for localization test 2022-08-25 14:23:27 +03:00
juliancoffee
f2eb1fe7c8 Make i18n csv own binary
* Put file that needs care back into csv
2022-08-25 14:23:26 +03:00
juliancoffee
9a0ac8dcce Make test_all_localizations run at unittest 2022-08-25 13:18:06 +03:00
Isse
d90ec725cf Merge branch 'remove_common_ron' into 'master'
remove common_ron

See merge request veloren/veloren!3565
2022-08-25 09:01:00 +00:00
flo
f9a31094b6 remove common_ron 2022-08-25 09:01:00 +00:00
Marcel
645b11df3f Merge branch 'floppy-seachapel-changelog' into 'master'
seachapel changelog entry

See merge request veloren/veloren!3564
2022-08-25 08:05:04 +00:00
flo666
55aebd5774 seachapel changelog entry 2022-08-25 08:38:32 +02:00
Isse
20013e17ab Merge branch 'isse/remove-print' into 'master'
Remove print

See merge request veloren/veloren!3563
2022-08-24 22:28:13 +00:00
Isse
ebe8c388e9 Merge branch 'floppy_seachapel' into 'master'
seachapel

See merge request veloren/veloren!3325
2022-08-24 21:50:54 +00:00
flo
e882e62c08 seachapel 2022-08-24 21:50:53 +00:00
IsseW
5232b6e9af remove print 2022-08-24 23:38:18 +02:00
Imbris
2f24da7339 Merge branch 'parzivale/issue-#1652-Remove-i18n-keys' into 'master'
Parzivale/issue #1652 remove i18n keys

Closes #1652

See merge request veloren/veloren!3560
2022-08-24 19:17:09 +00:00
parzivale
1fb981a09a updated header_i18n_key 2022-08-24 17:19:23 +02:00
parzivale
e456137b4c updated icon_button_tooltip to new format 2022-08-24 16:52:08 +02:00
parzivale
feca285665 ammended code quality issues from last commit 2022-08-24 16:29:42 +02:00
parzivale
06f5aa70f0 removed unecesarry .replace in dairy.rs 2022-08-24 16:16:30 +02:00
tygyh
c5b83e0166 Update swedish translations 2022-08-23 21:18:32 +02:00
parzivale
0ca2e64772 formtaed code with cargo fmt 2022-08-23 19:18:18 +02:00
Imbris
73ed0965d5 Merge branch 'imbris/fifo-default' into 'master'
Make the present mode default to Fifo instead of Immediate

See merge request veloren/veloren!3558
2022-08-23 14:30:11 +00:00
parzivale
e7f472059d tidied up code 2022-08-23 14:23:31 +02:00
parzivale
a3388bdd2e final cleanup for issue #1652 2022-08-23 13:35:16 +02:00
parzivale
cf09348306 second cleaning pass after removing i18n.get 2022-08-23 13:14:29 +02:00
Joshua Barretto
69e5c1424f Merge branch 'zesterer/automod' into 'master'
Relaxed automod somewhat

See merge request veloren/veloren!3559
2022-08-23 09:44:54 +00:00
parzivale
4a71698048 removed i18n.get 2022-08-23 11:19:39 +02:00
parzivale
9e22ae01a0 finished first pass removing i18n.get 2022-08-23 11:17:21 +02:00
Joshua Barretto
51d90707b5 Relaxed automod somewhat 2022-08-23 10:03:06 +01:00
parzivale
16a3794686 in the process of cleaning up i18n.gte calls 2022-08-23 10:04:21 +02:00
Imbris
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
Imbris
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
Imbris
ce8b8b6f12 Update changelog, cargo fmt 2022-08-21 12:10:20 -04:00
Imbris
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
DaforLynx
656727ecbd Miscellaneous audio fixes 2022-08-21 05:32:02 +00:00
Imbris
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
Imbris
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
Imbris
f1b6805c65 Remove outdated comments in handle_destroy and refactor map_err to if let Err 2022-08-20 18:47:09 -04:00
Imbris
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
Imbris
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
Marcel
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
Imbris
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
juliancoffee
69cea513ee Make comments to be doc-comments 2022-08-20 22:30:25 +03:00
juliancoffee
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
Marcel
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
Marcel
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
juliancoffee
a371aad05e Add /body command that allows you to switch body 2022-08-20 15:20:27 +03:00
juliancoffee
64c909cba0 Don't produce isolation marks in fluent 2022-08-20 13:36:16 +03:00
Imbris
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
Ben Wallis
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