Commit Graph

12215 Commits

Author SHA1 Message Date
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
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
Joshua Barretto
4d110a542c Improved banned words loading 2022-08-11 11:09:53 +01:00
Joshua Barretto
52bd7b2485 Added automod 2022-08-11 11:09:52 +01:00
Imbris
2d2d6b5c64 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 veloren/veloren!3528
2022-08-11 02:56:40 +00:00
DaforLynx
258feee634 Fix crash when Gap Between Songs is set to 0.0; changed name to Music Spacing 2022-08-11 02:56:40 +00:00
Justin Shipsey
ce52e53033 Merge branch 'airshipper_field_acessibility' into 'master'
Login screen's first detected tab triggers username focus

See merge request veloren/veloren!3526
2022-08-11 00:12:42 +00:00
Julio Cezar Silva
177fbcb0bc Login screen's first detected tab triggers username focus 2022-08-11 00:12:42 +00:00
Joshua Barretto
099ed62a69 Merge branch 'isse/town-music-fix' into 'master'
Add town music to cliff towns and desert cities

See merge request veloren/veloren!3524
2022-08-10 10:15:44 +00:00
IsseW
0cd4d71d00 Add town music to cliff towns and desert cities 2022-08-10 11:03:22 +02:00
Marcel
c2847bbbf2 Merge branch 'juliancoffee/boost-skills-ui' into 'master'
Force no digits after dot printing for boosts

See merge request veloren/veloren!3523
2022-08-09 22:29:20 +00:00
Marcel
877b4b06d7 Merge branch 'isse/spectate' into 'master'
Spectate mode

Closes #1379

See merge request veloren/veloren!3457
2022-08-09 22:09:59 +00:00
juliancoffee
02c78c28f4 Force no digits after dot printing for boosts 2022-08-10 01:06:17 +03:00
IsseW
e236807559 Add to changelog 2022-08-09 19:25:48 +02:00
IsseW
87821d5c1d force update counter 2022-08-09 19:22:09 +02:00
IsseW
a165bc09bc character viewpoint 2022-08-09 18:45:45 +02:00
IsseW
bf44ebd12b spectate speedup key 2022-08-09 18:44:10 +02:00
Isse
0471e78f41 spectate mode :D 2022-08-09 18:43:13 +02:00
Ben Wallis
cc6a4c92f5 Merge branch 'juliancoffee/hud-tutorial-click-fix' into 'master'
Fix tutorial key i18n

See merge request veloren/veloren!3520
2022-08-09 16:16:08 +00:00