Commit Graph

12199 Commits

Author SHA1 Message Date
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
juliancoffee
56dc490903 Fix tutorial key i18n 2022-08-09 18:31:46 +03:00
Isse
b384391ff4 Merge branch 'juliancoffee/fix_death_message_buff' into 'master'
Fix died_of_buff typo bug

See merge request veloren/veloren!3519
2022-08-09 12:56:39 +00:00
juliancoffee
fe1ea00246 Fix died_of_buff typo bug 2022-08-09 14:40:26 +03:00
Marcel
06d827af11 Merge branch 'lokicalmito/added_romanian_translation' into 'master'
Added Romanian translation

See merge request veloren/veloren!3516
2022-08-08 20:22:03 +00:00
loki
a559645679 deleted .zip folder 2022-08-08 19:03:20 +03:00
loki
5d914c4577 changed folder to new format 2022-08-08 19:01:34 +03:00
loki
88b412f4c7 added romanian translation 2022-08-08 18:26:17 +03:00
Samuel Keiffer
8602a04e71 Merge branch 'floppy-DesertCity' into 'master'
DesertCity

See merge request veloren/veloren!3495
2022-08-08 09:58:19 +00:00
flo
5dd9991311 DesertCity 2022-08-08 09:58:18 +00:00
Marcel
5258668166 Merge branch 'imbris/ecs-storage-switch' into 'master'
Convert away from IdvStorage to mixture of VecStorage and DenseVecStorage

Closes #1559

See merge request veloren/veloren!3515
2022-08-08 06:28:31 +00:00
Imbris
d5b59c2bb7 Convert away from IdvStorage to mixture of VecStorage and DenseVecStorage 2022-08-08 00:38:20 -04:00
Vincent Foulon
c1dcb6e412
Fix missing translation key in interaction 2022-08-07 21:16:31 +02:00
Vincent Foulon
b82da6acdb
Reimplement !3508 2022-08-07 21:11:58 +02:00
Vincent Foulon
62568d2229
Add documentation 2022-08-07 20:54:09 +02:00
Vincent Foulon
3203051fc3
Move interaction-cancelling code in interaction behavior + includes missing fix from !3467 2022-08-07 20:54:08 +02:00
Vincent Foulon
4f53d055de
Reimplement !3467 + fix event being pushed in front of agent inbox 2022-08-07 20:54:07 +02:00