Commit Graph

12232 Commits

Author SHA1 Message Date
matheusclmb
00a13fd893 Added settings missing keys 2022-08-20 20:47:37 +01: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
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
Socksonme
0e5b472d1d Fix sed regex 2022-08-19 19:45:22 +03:00
juliancoffee
e15c375cb5 Use fluent attributes for abilities
* Better translation logic and ergonomics
* Cut two format!-s
2022-08-19 18:35:44 +03:00
juliancoffee
a16af15140 Make CI trigger on .ftl changes 2022-08-19 18:29:47 +03:00
Marcel
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
Imbris
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
juliancoffee
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
juliancoffee
d26422dc29 Resurrect convert_utf8_to_ascii 2022-08-19 00:09:39 +03:00
Joshua Barretto
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
Marcel
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
Marcel Märtens
fdaaa24338 fix coverage 2022-08-18 09:00:16 +02:00
Tormod Gjeitnes Hellen
e306b3bfe3
Have the ambushers say something.
Very unsure about the way I did this...
2022-08-17 23:50:09 +02:00
Tormod G. Hellen
753a51e683
Make selfish bastards ambush people when they're alone. 2022-08-17 23:50:09 +02:00
Marcel
c6bcdd7a2c Merge branch 'juliancoffee/i18n-tooling-fluent' into 'master'
Implement i18n-tooling

See merge request veloren/veloren!3536
2022-08-17 20:39:00 +00:00
juliancoffee
3860b3ece3 Remove template.ftl file
They are empty anyway
2022-08-17 22:46:48 +03:00
juliancoffee
847ee1c1b1 Implement i18n-tooling
* Working csv export
* Working i18n-check
2022-08-17 22:46:48 +03:00
Ben Wallis
5a15611f33 Merge branch 'vacuum_database' into 'master'
Server: Vacuum database on startup

Closes #1610

See merge request veloren/veloren!3527
2022-08-17 19:06:42 +00:00
Saverio Miroddi
021a8be62e Server: Vacuum database on startup
Runs after the migrations. In some cases, it can reclaim a significant amount of space (reported 30%).
2022-08-17 20:12:20 +02:00
tygyh
1ce4cb4901 Update swedish translations 2022-08-17 11:33:46 +02:00
Monty Marz
5e5665ea19 Merge branch 'temp_merchant_fix' into 'master'
Temporary invincible merchants

See merge request veloren/veloren!3541
2022-08-16 12:16:45 +00:00
Monty Marz
50701620e6 Temporary invincible merchants 2022-08-16 12:16:45 +00:00
Joshua Barretto
dfe2e1c085 Merge branch 'AldanTanneo/discord-presence' into 'master'
Discord Activity

See merge request veloren/veloren!3529
2022-08-15 15:58:38 +00:00
AldanTanneo
ba87a405af Discord Activity 2022-08-15 15:58:37 +00:00
Marcel
6c17f7b95b Merge branch 'isse/spectator-fixes' into 'master'
Various spectator fixes.

See merge request veloren/veloren!3534
2022-08-15 09:33:03 +00:00
IsseW
911be0113d camera movement changes 2022-08-14 22:41:08 +02:00
IsseW
f77cce68d5 fix viewpoint meshing 2022-08-14 22:41:08 +02:00
IsseW
9b7a67c80e fix viewpoint rotation 2022-08-14 22:41:07 +02:00
IsseW
689376ec70 save spectate position 2022-08-14 22:41:07 +02:00
Isse
14aad5fde7 Merge branch 'campfires_for_clifftown_and_desertcity' into 'master'
add campfires to clifftown and desertcity

See merge request veloren/veloren!3538
2022-08-14 20:22:31 +00:00
flo
4c49cb933e add campfires to clifftown and desertcity 2022-08-14 20:22:30 +00:00
Isse
4ddd7ff4c9 Merge branch 'DaforLynx/audio-additions' into 'master'
Gnarling Fort music; more specific sites; fix music spacing; new sfx

See merge request veloren/veloren!3532
2022-08-14 01:57:58 +00:00
DaforLynx
daadf3abdb Gnarling Fort music; more specific sites; fix music spacing; new sfx 2022-08-14 01:57:58 +00:00
Isse
3e5f04cb40 Merge branch 'fix-flashing-lights' into 'master'
Fix experimental shaders

See merge request veloren/veloren!3537
2022-08-12 18:54:38 +00:00
IsseW
50274fbc0c add newline to flashing lights option 2022-08-12 20:30:32 +02:00
Isse
7ad52ba901 Merge branch 'floppy-desertcity-fixes' into 'master'
DesertCity small fix

See merge request veloren/veloren!3530
2022-08-12 11:34:40 +00:00
flo
4ccec12dc7 DesertCity small fix 2022-08-12 11:34:40 +00:00
Samuel Keiffer
a1b5f53d15 Merge branch 'craft-all' into 'master'
Craft all

See merge request veloren/veloren!3525
2022-08-12 00:47:48 +00:00
Julio Cezar Silva
9315482fc4 Craft all 2022-08-12 00:47:48 +00:00
Samuel Keiffer
9112e2177a Merge branch 'vfoulon80/agent-behavior-tree' into 'master'
Refactor agent's behavior tree

See merge request veloren/veloren!3500
2022-08-11 20:46:14 +00:00
Isse
9f9bfc8fb3 Merge branch 'isse/test-world-fix' into 'master'
Fix compilation with worldgen turned off.

See merge request veloren/veloren!3531
2022-08-11 20:27:25 +00:00
Isse
e81dade43f Fix compilation with worldgen turned off. 2022-08-11 20:27:25 +00:00
Vincent Foulon
b1baa09815
Address review comments 2022-08-11 21:15:46 +02:00
Joshua Barretto
900454552a Merge branch 'zesterer/automod' into 'master'
Automod

See merge request veloren/veloren!3513
2022-08-11 10:56:18 +00:00
Joshua Barretto
602de267b1 Perform validation on all kinds of chat message 2022-08-11 11:11:33 +01:00
Joshua Barretto
4e103c433f Simplified and improved alias validation 2022-08-11 11:11:31 +01:00