Commit Graph

3386 Commits

Author SHA1 Message Date
Sam
2fcd876e3f Air slash abilities 2022-10-27 20:06:35 -04:00
Sam
7a8653e8f8 Reaching abilities 2022-10-27 20:06:35 -04:00
Sam
5d643f430a Mobility abilities 2022-10-27 20:06:35 -04:00
Sam
500e0ae3d0 Heavy abilities 2022-10-27 20:06:34 -04:00
Sam
8a578bf3f6 Parrying abilities 2022-10-27 20:06:34 -04:00
Sam
d99eddb483 Defensive abilities 2022-10-27 20:06:33 -04:00
Sam
ec03bd7032 Cleaving abilities 2022-10-27 20:06:33 -04:00
Sam
a4d3de4833 Crippling abilities 2022-10-27 20:06:32 -04:00
Sam
2051d45d2f Offensive abilities 2022-10-27 20:06:32 -04:00
Sam
fd05795b4c Titles and descriptions for each ability. 2022-10-27 20:06:31 -04:00
Sam
014a8cce61 Combo melee can now optionally not function as a stance 2022-10-27 20:06:31 -04:00
Sam
66f9cf22fc Balanced abilities and insert ability id into animations. 2022-10-27 20:06:30 -04:00
Sam
aea4a43b65 Placeholder abilities 2022-10-27 20:06:30 -04:00
Sam
38094b6ba2 Finisher melee 2022-10-27 20:06:29 -04:00
Sam
057b1a4ad6 Added capability for attacks to be interrupted by dodging or blocking 2022-10-27 20:06:29 -04:00
Sam
1e0dfe003d Rolling can now only interrupt abilities when in buildup 2022-10-27 20:06:28 -04:00
Sam
7b27b63122 Melee attacks now only hit a single target by default 2022-10-27 20:06:28 -04:00
Sam
af39287331 Added support for abilities being cheaper if activated from the correct stance 2022-10-27 20:06:27 -04:00
Sam
17258975fc Combo melee 2 state 2022-10-27 20:06:26 -04:00
flo
42ffb54fd7 fix soundtrack 2022-10-27 17:40:51 +00:00
flo
34eae80253 fix facegourd item name 2022-10-27 13:49:06 +00:00
DaforLynx
926c1bc533 Halloween soundtrack with automatic functionality 2022-10-27 06:56:39 +00:00
Joshua Barretto
29d40cf509 Added graphics presets 2022-10-27 01:15:40 +01:00
Joshua Barretto
4db88bb22c Better sampling of noisy regions 2022-10-27 01:15:21 +01:00
Joshua Barretto
589f59b771 Improve FxUpscale quality for distant objects 2022-10-27 01:15:21 +01:00
Joshua Barretto
f29b1da583 Implemented FxUpscale 2022-10-27 01:15:20 +01:00
Marcel
779cccd238 Merge branch 'kevinsmia1939/thai-translate' into 'master'
Improve and fix Thai translation.

See merge request veloren/veloren!3666
2022-10-25 21:37:58 +00:00
Kavin Teenakul
40c949c274 Improve and fix Thai translation. 2022-10-25 21:37:58 +00:00
Marcel
51d4c8dd51 Merge branch 'halloween' into 'master'
Halloween event

See merge request veloren/veloren!3668
2022-10-25 21:37:34 +00:00
flo666
ada9bd8f36 fix unitest error:
layer::wildlife::tests::test_name_uniqueness' panicked at 'world.wildlife.spawn.calendar.halloween.halloween:
2022-10-25 00:33:36 +02:00
flo666
9b1efe1bee clippy, fmt, remove leftover file, fix sitenames in soundtrack 2022-10-25 00:33:23 +02:00
IsseW
18659f7d09 Consumable sounds 2022-10-25 00:31:33 +02:00
IsseW
9a6a3a05a1 bat config 2022-10-25 00:31:04 +02:00
kitswas
9b692d072f Added checkbox in the settings for poisebar
See [this message on Discord](https://discord.com/channels/449602562165833758/1014778601368997958/1033838446575370351).
2022-10-24 22:05:11 +05:30
kitswas
65e6db9ef8 Separated the poise images
The energy images were duplicated.
2022-10-24 22:05:11 +05:30
Joshua Barretto
428816c65e Addressed review comments 2022-10-23 23:54:55 +01:00
Joshua Barretto
1521b6165f Prettier cheap water 2022-10-23 21:41:45 +01:00
Joshua Barretto
40e47b4f3e Added reflection mode settings 2022-10-23 20:03:21 +01:00
James Melkonian
6bacb487f3 Bat AI 2022-10-23 20:05:39 +02:00
flo666
586d0f6dd8 add bat (created by Gemu) 2022-10-23 20:05:39 +02:00
flo666
79e6fd58fe - make tricksters spawn in groups and play instruments
- remove defunct draugr flee
2022-10-23 20:05:39 +02:00
flo666
82026c1acc remove defunct headband from trickster loadout 2022-10-23 20:05:39 +02:00
flo666
60a48e450c facegourd and helmet offset (Female Orc) 2022-10-23 20:05:39 +02:00
flo666
e1bd385408 make draugrs Npcs flee at health below 100%,
trickster gear,
single spawns (trickster, dullahan),
2022-10-23 20:05:39 +02:00
flo666
1d98050f28 halloween npcs:
in forests, spawn harvester or dullahans or tricksters with custom halloween loot: facegourd, pumpkin_spice_brew, honeygourd
2022-10-23 20:05:39 +02:00
Joshua Barretto
b85fd11443 Added refraction 2022-10-23 15:15:25 +01:00
Joshua Barretto
c072dc4082 Place puddle details behind extra experimental shader 2022-10-23 01:42:01 +01:00
Joshua Barretto
d0894a189e Added SSR to wet surfaces 2022-10-23 01:42:01 +01:00
Joshua Barretto
a7c24ed518 Added figure noise 2022-10-23 01:42:01 +01:00
Joshua Barretto
ae66432a1e Make cheap water look better underwater 2022-10-23 01:42:01 +01:00
Joshua Barretto
764adb67c7 Fixed no SSR shaders 2022-10-23 01:42:01 +01:00
Joshua Barretto
51c3a25b9a Handle obscured SSR elements better 2022-10-23 01:42:01 +01:00
Joshua Barretto
be8ef302bc Make SSR water verticals behave better 2022-10-23 01:42:01 +01:00
Joshua Barretto
d40be0ea5f Apply clouds more correctly 2022-10-23 01:42:01 +01:00
Joshua Barretto
d4c81cf8b8 Handle SSR transition better 2022-10-23 01:42:01 +01:00
Joshua Barretto
9285e48ff0 Don't reflect rain 2022-10-23 01:42:01 +01:00
Joshua Barretto
8dd63940b0 Fixed SSR at distance 2022-10-23 01:42:01 +01:00
Joshua Barretto
bc4c93bc5e More accurate SSR 2022-10-23 01:42:00 +01:00
Joshua Barretto
0561a168de Added tracing to SSR 2022-10-23 01:42:00 +01:00
Joshua Barretto
387d7e65d2 Improved SSR quality 2022-10-23 01:42:00 +01:00
Joshua Barretto
daef86d813 Make screen-space reflections an experimental shader 2022-10-23 01:42:00 +01:00
Joshua Barretto
f00cc5f2de The worst SSR 2022-10-23 01:42:00 +01:00
Joshua Barretto
81ac4f9125 Various water-related lighting fixes 2022-10-23 01:42:00 +01:00
Joshua Barretto
b45586902a Made cheap water display velocity 2022-10-23 01:42:00 +01:00
Joshua Barretto
ce7dda3e2f Substantially faster water shaders 2022-10-23 01:42:00 +01:00
Joshua Barretto
30de7b4fb8 Better attenuation 2022-10-23 01:42:00 +01:00
Joshua Barretto
db4cc21ec3 Fixed seams 2022-10-23 01:42:00 +01:00
Joshua Barretto
3f2efea4f2 Experimental river velocity in shaders 2022-10-23 01:42:00 +01:00
flo
1d04c9ba8c floppy_instrument_samples 2022-10-21 07:58:41 +00:00
Monty Marz
3a63f210b2 fix drop model for chieftain mask 2022-10-21 00:20:15 +02:00
Youssef Fahmy
44e19d7c54 Hot-fix for sword 2022-10-19 22:03:42 +00:00
Sam
b1f45ea241 Sword triple strike tweaks. 2022-10-19 09:36:20 -04:00
UncomfySilence
f21082fa76 minor stat tweaks and cleanup 2022-10-16 14:12:37 +02:00
Sam
8eb89adb61 Fixed unintentional overbuff to speed focused secondary components 2022-10-16 14:06:42 +02:00
UncomfySilence
c432a0b719 rings and necks 2022-10-16 14:06:42 +02:00
Sam
3222fb88b0 Nerfed melee combo melee skills 2022-10-16 14:06:42 +02:00
UncomfySilence
fe87f8c38d induv hat stat changes 2022-10-16 14:06:42 +02:00
Sam
2735d3403c Nerfed other sets 2022-10-16 14:06:41 +02:00
Sam
46daa6bfa9 Armor nerf 2022-10-16 14:06:41 +02:00
Monty Marz
2d8627c29b Add gnarling chieftain mask 2022-10-15 11:05:21 +00:00
James Melkonian
99d547c7c6 Add unit test to validate recipe keys 2022-10-09 20:50:09 -07:00
Marcel
160cbbf449 Merge branch 'steel_pick_desc' into 'master'
Removes blue vein reference from Steel Pickaxe description

See merge request veloren/veloren!3491
2022-10-09 19:50:31 +00:00
Julio Cezar Silva
0d090bb93e Removes blue vein reference from Steel Pickaxe description 2022-10-09 19:50:30 +00:00
tygyh
fcc096c599 Update swedish translation 2022-10-05 09:48:18 +02:00
Marcel
f07c0b67ee Merge branch 'update_simplified_chinese' into 'master'
Upgrade Simplified Chinese Translation

See merge request veloren/veloren!3641
2022-10-04 22:59:41 +00:00
WanCheng Ye
85b345054e Upgrade Simplified Chinese Translation 2022-10-04 22:59:41 +00:00
Marcel
b9c249940c Merge branch 'galaipa/update-eu' into 'master'
Translate missing Basque strings

See merge request veloren/veloren!3647
2022-10-04 22:25:23 +00:00
Bingen Galartza
4c4a1bf80b Translate missing Basque strings 2022-10-04 22:25:23 +00:00
Marcel
4b0033ff91 Merge branch 'Nether190/update-pt_BR' into 'master'
Nether190/update-pt_BR

See merge request veloren/veloren!3632
2022-10-04 22:10:11 +00:00
Valter Sanches
60c3d80d57 Nether190/update-pt_BR 2022-10-04 22:10:11 +00:00
Marcel
f584a3f0f6 Merge branch 'fix_Latin-American_translation' into 'master'
correction in the translation Spanish Latin American

See merge request veloren/veloren!3646
2022-10-04 21:50:03 +00:00
Marcel
e5dfc6261c Merge branch 'ztianyang/lantern' into 'master'
Crafting recipe for black lantern

See merge request veloren/veloren!3590
2022-10-02 17:46:38 +00:00
Tianyang Zhang
99bedde100 Crafting recipe for black lantern 2022-10-02 17:46:36 +00:00
Henning Meyer
8581d3da38 Complete German Translation 2022-10-02 17:45:26 +00:00
Juan Pablo Lagos
b716284ef2 correction in the translation Spanish Latin American 2022-10-02 17:09:55 +09:00
Henning Meyer
fee11cc438 German Translation Edits 2022-10-01 16:53:27 +00:00
Marcel
dd5523785c Merge branch 'master' into 'master'
UA localization update

See merge request veloren/veloren!3640
2022-09-29 18:00:41 +00:00
fanix472
34e75a1796 UA localization update 2022-09-29 18:00:40 +00:00
Marcel Märtens
0fe0192a2d get rid of string replacements in template strings 2022-09-29 17:33:53 +02:00
Marcel Märtens
ba260e8419 translate MOD and YOU messages 2022-09-27 13:46:12 +02:00
Marcel
a1d0d0283f Merge branch 'Welvex/update-es_LA' into 'master'
Update the Spanish LA translation.

See merge request veloren/veloren!3635
2022-09-25 17:07:31 +00:00
Welvex
10e4b94599 Update the Spanish LA translation. 2022-09-25 17:07:31 +00:00
Joshua Barretto
0b0fde5254 Faster wave shader 2022-09-23 00:08:23 +01:00
Joshua Barretto
34522b39bd Balance caustics with depth better 2022-09-22 23:45:16 +01:00
Joshua Barretto
3b195fbd55 Improved shiny water shader 2022-09-22 23:08:32 +01:00
Joshua Barretto
4bb5660f40 Fixed incorrect specular light in water 2022-09-22 22:40:16 +01:00
Joshua Barretto
b48b3eea02 Improved caustic shaders 2022-09-22 21:12:20 +01:00
flo
cfbadd36ea fix_desert_rock_animals 2022-09-22 18:42:34 +00:00
Samuel Keiffer
59d8d287d9 Merge branch 'seachapel_npc_work' into 'master'
seachapel npc work

See merge request veloren/veloren!3599
2022-09-22 01:04:01 +00:00
flo
a37e1f8d99 seachapel npc work 2022-09-22 01:04:01 +00:00
Joshua Yanovski
57ea753bff Merge branch 'sharp/parallel-ingame' into 'master'
Parallelize ingame messages.

See merge request veloren/veloren!3627
2022-09-21 19:44:40 +00:00
Joshua Yanovski
67231aff90 Remove persistence loading error from SkillSet.
This is needed (for now) in order to parallelize ingame_chat, because
one of the handled messages updates this value on the server.  It turns
out that the value is not actually used on the server, only the client,
so this was mostly a matter of threading this back to the correct place.
Additionally, we took the opportunity to modify the UI to not log you
into the game until your character was confirmed to be loaded, which
was a todo item that lets us simplify some error handling logic and
remove stuff from global state.
2022-09-21 09:29:25 -07:00
Marcel
f590e68f7e Merge branch 'mckol/mute-keybinds' into 'master'
Mute audio keybinds (and respective buttons in settings)

See merge request veloren/veloren!3361
2022-09-21 09:22:45 +00:00
Imbris
1b48a3008c Merge branch 'Couls/TestBed' into 'master'
Extend item pickup UI to group members

Closes #1402

See merge request veloren/veloren!3521
2022-09-20 22:13:50 +00:00
Couls
4a4c061b55 Extend item pickup UI to group members 2022-09-20 22:13:50 +00:00
Marcel
27a368defd Merge branch 'MadirexRus/update-ru_RU' into 'master'
Update the Russian translation

See merge request veloren/veloren!3631
2022-09-18 19:57:38 +00:00
MadirexRus
0ae7980a2a Update the Russian translation 2022-09-18 19:57:38 +00:00
Koboo
bb0382e76c Koboo/update de de 2022-09-18 18:58:34 +00:00
LunarEclipse
6ad02b1fb0 Added i18n stuff for volume muting keybinds for en and pl_PL locales 2022-09-16 22:17:00 +02:00
LunarEclipse
716d4e476e Updated mute buttons to have less distracting borders (they don't have indexed color) 2022-09-16 21:58:09 +02:00
Jonathan Berglin
a724c014c8 Update swedish translation 2022-09-15 13:32:26 +00:00
Koboo
54e3b3e9f5 Koboo/update de de 2022-09-14 07:48:19 +00:00
Joshua Yanovski
0d09d1f88e Merge branch 'fix_salamander_and_elbst' into 'master'
fix_salamander_and_elbst

See merge request veloren/veloren!3609
2022-09-13 17:32:53 +00:00
flo
dc688bccb9 fix_salamander_and_elbst 2022-09-13 17:32:53 +00:00
Koboo
71c2d99aef Update the German translation (hud-skill-dodge resolve error) 2022-09-12 16:58:39 +02:00
Samuel Keiffer
513b135d58 Merge branch 'floppy_instrument_sample_edits' into 'master'
add guitar & instrument sample edits

See merge request veloren/veloren!3574
2022-09-10 17:23:38 +00:00
flo
e43608ce80 add guitar & instrument sample edits 2022-09-10 17:23:38 +00:00
Joshua Barretto
b3b2f404e5 Fixed FXAA at non-1.0x scales 2022-09-10 13:33:38 +01:00
Joshua Barretto
85a1c06be6 Better depth-aware HQX 2022-09-10 13:16:47 +01:00
Joshua Barretto
80fa0baf09 Added HQX anti-aliasing 2022-09-10 10:56:22 +01:00
Joshua Barretto
03e8eb42ad Added experimental BetterAA shader 2022-09-09 11:59:40 +01:00
Samuel Keiffer
aa7569061b Merge branch 'juliancoffee/more-buffs' into 'master'
Add Golden Cheese debug potion

See merge request veloren/veloren!3597
2022-09-08 01:01:18 +00:00
Imbris
411aa3b0d9 Merge branch 'matheusclmb/update-pt_BR' into 'master'
pt_BR - Added all missing keys and formatted some old ones.

See merge request veloren/veloren!3556
2022-09-07 04:12:31 +00:00
juliancoffee
3cbfe02a8e Add Golden Cheese debug item 2022-09-06 15:50:04 +03:00
juliancoffee
34c5e95d8a Add Energy regen buff
* Fix broken i18n keys for health and energy increases
* Better handle buff descriptions
Calculate infobox lines for item stats to set correct infobox frame
dimensions
2022-09-06 15:50:04 +03:00
Isse
7ea720b2ef Merge branch 'creature_model_updates' into 'master'
Creature model updates

See merge request veloren/veloren!3584
2022-09-06 10:35:11 +00:00
flo
e4a3671345 Creature model updates 2022-09-06 10:35:10 +00:00
Samuel Keiffer
34fa03a425 Merge branch 'juliancoffee/bigger-kit' into 'master'
Make /kit use all weapons from possible modulars

See merge request veloren/veloren!3595
2022-09-06 04:45:12 +00:00
Dominik Broński
c39be960a0 Merge branch 'zDrag0nG/update-es_ES' into 'master'
Update Spanish Translation

See merge request veloren/veloren!3594
2022-09-04 23:41:15 +00:00
zDrag0nG
18e1b48006 Update Spanish Translation 2022-09-04 23:41:15 +00:00
juliancoffee
54a1adea31 Assets work
* Remove endgame /kit, move cultist weapons to cultist, move legendaries
  to tier-5
* Remove root_evil sceptre from endgame travelers
2022-09-05 00:24:59 +03:00
Imbris
9dbff4c342 [voxygen] Disable editing server address if it is supplied via CLI and hide server list button (with an unlock button to re-enable editing) 2022-09-03 20:24:50 -04:00
LunarEclipse
36167f2e3a Renamed some files, added missing img_ids. 2022-09-03 21:56:25 +02:00
LunarEclipse
33ded63da9 Improved mute button assets (TODO merge with a5f446a7) 2022-09-03 21:56:25 +02:00
Mckol
6605c2657f Added mute buttons for all of the audio sliders in settings 2022-09-03 20:31:04 +02:00
Isse
e35e533d88 Merge branch 'sau/update-es_ES' into 'master'
update the Spanish translation

See merge request veloren/veloren!3583
2022-09-02 23:29:40 +00:00
Sau
767041ae5c update the Spanish translation 2022-09-02 23:29:40 +00:00
Dong
17cd06bc5e Update Spanish translation 2022-09-02 17:51:18 +02:00
Jonathan Berglin
cf9f2d36d0 Update swedish translation 2022-09-01 08:21:07 +00:00
Marcel
aa7cdd2864 Merge branch 'christof/econ_goods_in_ron' into 'master'
Economy: Move decay and transportation effort from hardcoded into ron

See merge request veloren/veloren!3578
2022-08-31 08:26:24 +00:00
Ben Wallis
91a4a9e187 Merge branch 'put_organ_under_toolkind_instrument' into 'master'
put Organ under Toolkind Instrument

See merge request veloren/veloren!3580
2022-08-30 16:55:03 +00:00
flo
6c89cd8fbf put Organ under Toolkind Instrument 2022-08-30 16:55:02 +00:00
MadirexRus
8f1c45af17 Russian translation fixes 2022-08-30 12:29:18 +00:00
Christof Petig
5e2474230e oh, Potions do not decay in master 2022-08-30 00:37:38 +02:00
Christof Petig
fbe0aee40d move trading good properties (decay, transportation) from hard coded to ron file 2022-08-30 00:37:38 +02:00
Marcel
f3e13ee49d Merge branch 'sau/update-es_ES' into 'master'
update the Spanish translation

See merge request veloren/veloren!3575
2022-08-29 20:19:39 +00:00
Marcel
60f05f45a7 Merge branch 'juliancoffee/better-i18n-keys' into 'master'
Remake price-tips internationalization

See merge request veloren/veloren!3571
2022-08-29 12:18:36 +00:00
Sau
a8ff0e4e5f update the Spanish translation 2022-08-29 11:48:54 +00:00
Samuel Keiffer
52ce12f383 Merge branch 'floppy-music-instruments' into 'master'
Music Instruments

See merge request veloren/veloren!3535
2022-08-28 18:48:18 +00:00
flo
9339971032 Music Instruments 2022-08-28 18:48:18 +00:00
Marcel
1a11205dbf Merge branch 'tygyh/Swedish-translations' into 'master'
Update swedish translations

See merge request veloren/veloren!3561
2022-08-28 16:38:16 +00:00
juliancoffee
76cd36b179 Remake price-tips internationalization 2022-08-26 17:56:32 +03:00
Imbris
e626519ec0 Replace "Present Mode" options with more user friendly terms:
'Fifo'       ->  'Vsync capped'
'Mailbox'    ->  'Vsync uncapped'
'Immediate'  ->  'Vsync off'
2022-08-25 23:24:43 -04:00
Imbris
334937568e Add an entity view distance setting that allows limiting the distance
entities are synced from and displayed in.

NOTE: Syncing entities work at the granularity regions which are
multi-chunk squares but the display of entities in voxygen is limited in
a circle with the radiues of the supplied distance.

Additional details and changes:
* Added `ViewDistances` struct in `common` that contains separate
  terrain and entity view distances (the entity view distance will be
  clamped by the terrain view distance in uses of this).
* View distance requests from the client to the server now use this
  type.
* When requesting the character or spectate state the client now passes
  its desired view distances. This is exposed as a new parameter on
  `Client::request_character`/`Client::request_spectate`. And the client
  no longer needs to send a view distance request after entering these
  states. This also allows us to avoid needing to initialize `Presence`
  with a default view distance value on the server.
* Removed `DerefFlaggedStorage` from `Presence` and `RegionSubscription` since the
  change tracking isn't used for these components.
* Add sliders in voxygen graphics and network tabs for this new setting.
  Show the clamped value as well as the selected value next to the
  slider.
* Rename existing "Entities View Distance" slider (which AFAIK controls
  the distance at which different LOD levels apply to figures) to
  "Entities Detail Distance" so we can use the former name for this new
  slider.
2022-08-25 23:24:43 -04:00
tygyh
355f916a99 Update translations 2022-08-25 20:47:13 +02:00
flo
f9a31094b6 remove common_ron 2022-08-25 09:01:00 +00:00
flo
e882e62c08 seachapel 2022-08-24 21:50:53 +00:00
tygyh
c5b83e0166 Update swedish translations 2022-08-23 21:18:32 +02:00
Matheus
055f40ddc6 changed/typo to generic masculine 2022-08-21 02:43:09 +00:00
Matheus
467e85dca2 typo fix 2022-08-21 02:28:36 +00:00
matheusclmb
3967501a03 Small/Cultural changes recommended by @jcezarms 2022-08-21 03:26:32 +01:00
matheusclmb
02d6090438 changed some words for better context 2022-08-21 01:42:12 +01:00
matheusclmb
fc9dca7e95 Added gameinput missing keys 2022-08-20 20:48:52 +01:00
matheusclmb
b662d9cce1 Added common missing keys 2022-08-20 20:48:36 +01:00
matheusclmb
636dbc8a22 Added char_selection missing keys 2022-08-20 20:48:20 +01:00
matheusclmb
b288214650 Added and formatted npcs missing keys 2022-08-20 20:48:04 +01:00
matheusclmb
00a13fd893 Added settings missing keys 2022-08-20 20:47:37 +01: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
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
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
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
tygyh
1ce4cb4901 Update swedish translations 2022-08-17 11:33:46 +02:00
Monty Marz
50701620e6 Temporary invincible merchants 2022-08-16 12:16:45 +00:00
AldanTanneo
ba87a405af Discord Activity 2022-08-15 15:58:37 +00:00
DaforLynx
daadf3abdb Gnarling Fort music; more specific sites; fix music spacing; new sfx 2022-08-14 01:57:58 +00:00
Julio Cezar Silva
9315482fc4 Craft all 2022-08-12 00:47:48 +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
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
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
Samuel Keiffer
1066553f21 Merge branch 'juliancoffee/fluent-i18n' into 'master'
Use Fluent for localisation (l10n) and internationalisation (i18n)

See merge request veloren/veloren!3508
2022-08-07 18:21:31 +00:00
Marcel
4131b3ac20 Merge branch 'DaforLynx/river-hotfix' into 'master'
Lower volume of river sfx

See merge request veloren/veloren!3510
2022-08-06 21:29:38 +00:00
DaforLynx
9a8c288580 Lower volume of river sfx 2022-08-06 21:29:38 +00:00
juliancoffee
a994984b09 Migrate i18n files to new format 2022-08-06 21:57:08 +03:00
juliancoffee
48eeabcc93 Fix broken i18n files 2022-08-06 21:45:23 +03:00
Vincent Foulon
8862258f61 Deny any interaction received during hostile_tree 2022-08-06 18:31:42 +00:00
DaforLynx
bf4a582cf7 WIP: New music, "now playing" line in debug overlay, and music frequency slider 2022-08-01 17:41:44 +00:00
Isse
cfdc2a8ae6 Add setting to disable flashing lights 2022-07-31 21:53:25 +00:00
Marcel
a9946a491e Merge branch 'lunareclipse/update-polish-translation' into 'master'
Minor update of the Polish translation

See merge request veloren/veloren!3499
2022-07-31 18:28:12 +00:00
Sam
b572c32a4d Tweaks 2022-07-30 00:18:10 -04:00
LunarEclipse
2a7174a4e6 Minor fixups of the Polish translation 2022-07-27 21:31:10 +02:00
Sam
28a4ce9be1 Various tweaks 2022-07-26 19:44:49 -04:00
Marcel
72b0b26004 Merge branch 'pfau/bg_new' into 'master'
new bg

See merge request veloren/veloren!3488
2022-07-22 11:49:57 +00:00
DaforLynx
d2710635d8 Lightning strikes are less audible; cave music restored; fixed audio permanently stopping on logout 2022-07-21 08:27:35 +00:00
Monty Marz
6571068623 new bg 2022-07-19 20:53:06 +02:00
Marcel
35883c61cb Merge branch 'mckol/update-polish-translation' into 'master'
Update the Polish translation

See merge request veloren/veloren!3399
2022-07-17 11:50:50 +00:00
Joshua Barretto
0b16baf46a Improved rain performance 2022-07-16 14:44:58 +01:00
Treeco
7efddc33f7 Merge branch 'more_humanoid_models' into 'master'
Humanoid Model Overhaul

See merge request veloren/veloren!3478
2022-07-16 11:13:24 +00:00
Youssef Fahmy
91c85dea22 Humanoid Model Overhaul 2022-07-16 11:13:24 +00:00
Mckol
8861e12e70 Updated the Polish translation 2022-07-16 13:07:45 +02:00
Joshua Barretto
ea39f78dfd Minimised rain occlusion problems 2022-07-16 11:14:12 +01:00
Joshua Barretto
b08a501aef Cleaned up ready for merge 2022-07-16 11:09:35 +01:00
Joshua Barretto
3c5de2991b More consistent texturing code 2022-07-15 08:43:35 +01:00
Joshua Barretto
9ad32b37e7 More efficient texture fetches 2022-07-15 08:43:34 +01:00
Joshua Barretto
61792d4135 Apply AO 2022-07-15 08:43:34 +01:00
Joshua Barretto
2694f5f917 Fixed lava 2022-07-15 08:43:34 +01:00
Joshua Barretto
07ba4dcc33 Fixed particles for non-body entities, AO for non-volumetric illumination 2022-07-15 08:43:34 +01:00
Joshua Barretto
b5662163f0 Better lighting and verticality in caves 2022-07-15 08:43:33 +01:00
Joshua Barretto
1f979e4133 More biomes 2022-07-15 08:42:56 +01:00
Joshua Barretto
2cce44fc36 Began work on caves2 2022-07-15 08:42:56 +01:00
Joshua Barretto
62d2982990 Made rainbows ultra only 2022-07-15 07:08:30 +00:00
Joshua Barretto
e34f080c91 Fixed unrolling issue in rain shader 2022-07-15 07:06:11 +00:00
Joshua Barretto
964b315fc5 Fixed lightning point glow 2022-07-14 22:12:34 +00:00
Christof Petig
2dce472d1f Merge branch 'christof/modular-weapon-prices' into 'master'
Implement material (de-)composition for modular weapons, add tusk+crest+pincer to price list

See merge request veloren/veloren!3469
2022-07-14 18:24:21 +00:00
Isse
5c7ed1e712 Merge branch 'vfoulon80/boat-loading-animation' into 'master'
Add a boat loading animation

See merge request veloren/veloren!3474
2022-07-14 07:17:30 +00:00
DaforLynx
194b1866c6 Music, ambience tweaks, and more 2022-07-14 00:55:35 +00:00
Joshua Barretto
f48665366b More lightning position variety 2022-07-13 21:45:37 +01:00
Vincent Foulon
2240fa4a23
Add a boat loading animation 2022-07-13 22:41:34 +02:00
Christof Petig
5ee72f8a5e fix test; add tusk, crest, pincer 2022-07-13 20:15:28 +02:00
Joshua Barretto
25c55b6a25 Better rain performance, wetness 2022-07-13 18:34:34 +01:00
Joshua Barretto
4e854a28ff Fixed occlusion bias 2022-07-10 16:56:45 +01:00
Joshua Barretto
d4906f55bc Fixed rain occlusion issues 2022-07-10 16:40:49 +01:00
Joshua Barretto
fc21b54f02 Better rain performance 2022-07-10 13:53:31 +01:00
Joshua Barretto
47b236b1f0 Better lightning rates, fixed shaders 2022-07-10 13:44:11 +01:00
Joshua Barretto
3b758cc7b0 Minor colour tweak 2022-07-09 02:25:24 +01:00
Joshua Barretto
85a292a854 Always take origin as lightning end point 2022-07-09 02:16:13 +01:00
Joshua Barretto
6fea7205fa Better lightning at distance 2022-07-09 02:08:55 +01:00
Joshua Barretto
836fe2b1c6 Proper lightning 2022-07-09 01:59:18 +01:00
Joshua Barretto
edc2720416 Better lightning effect 2022-07-09 00:39:18 +01:00
Joshua Barretto
4531a4e3f9 Added lightning 2022-07-08 23:26:33 +01:00
Joshua Barretto
622b67d24e Relative offset fix 2022-07-08 20:49:51 +01:00
Joshua Barretto
90d2ceab2e Fixed rain clipping issue 2022-07-08 20:40:08 +01:00
Joshua Barretto
4b738c8b8f Balanced rain intensity 2022-07-08 20:22:09 +01:00
Joshua Barretto
6c4b10d881 Use existing humidity 2022-07-08 20:18:07 +01:00