Joshua Barretto
b127cff26c
Merge branch 'zesterer/gbuffers-ssr' into 'master'
...
Use normal and material gbuffer to improve quality of SSR
See merge request veloren/veloren!3734
2023-01-12 20:26:41 +00:00
Joshua Barretto
49749c86a7
Made emissive figures behave correctly
2023-01-12 18:44:26 +00:00
Monty Marz
e21e4a6dd4
Add 0.14 background image
2023-01-12 17:56:50 +00:00
Joshua Barretto
4d7526b920
Made point shadows with shadow mapping an experimental shader
2023-01-12 15:39:11 +00:00
Joshua Barretto
0bdc66b10a
Addressed review comments, minor fixes
2023-01-12 15:30:13 +00:00
tygyh
3fb7674e6a
Update swedish translations
2023-01-05 10:30:11 +01:00
DaforLynx
b493a89b7f
Soundtrack fix...
2023-01-03 22:27:19 +00:00
Marcel
2ff24259be
Merge branch 'zesterer/lod-models' into 'master'
...
New LoD model, wind sway pays attention to wind velocity
See merge request veloren/veloren!3739
2023-01-02 14:51:00 +00:00
Marcel
10bb78792a
Merge branch 'thanosfisherman/new_music_track_rectifications' into 'master'
...
Thanosfisherman/new music track rectifications
See merge request veloren/veloren!3740
2023-01-02 12:14:39 +00:00
Thanos Psaridis
7bafd5f63c
Thanosfisherman/new music track rectifications
2023-01-02 12:14:39 +00:00
Francesco Vasco
a20c563ccd
Added hud-bag-sort_by_tag in italian
2023-01-01 22:42:39 +01:00
Marcel
081f48e73c
Merge branch 'thanosfisherman/add_music_track' into 'master'
...
Thanosfisherman/add music track
See merge request veloren/veloren!3737
2023-01-01 19:36:22 +00:00
Thanos Psaridis
2608e63316
Thanosfisherman/add music track
2023-01-01 19:36:22 +00:00
Joshua Barretto
0067825187
Reflection smearing
2022-12-31 19:19:52 +00:00
Joshua Barretto
f48e1ca951
Make wind sway change according to weather wind velocity
2022-12-31 17:40:40 +00:00
Joshua Barretto
873d3fb7a4
Added dead trees to LoD
2022-12-31 15:32:56 +00:00
Joshua Barretto
1f2d56c032
Better reflections
2022-12-31 13:04:28 +00:00
Matas Minelga
040c9fe6ee
Inventory: Implemented dynamic and better ordering by Category
2022-12-31 02:32:41 +02:00
Joshua Barretto
313527cf46
Correct material for LoD water
2022-12-30 19:22:07 +00:00
Joshua Barretto
6e344f58e8
Remove unnecessary cloud sampling from shiny water
2022-12-30 17:33:54 +00:00
Joshua Barretto
799bb17d75
Fixed underground sky blend test
2022-12-30 17:24:36 +00:00
Joshua Barretto
4bd7ec26d3
Fixed drop shadows
2022-12-30 17:01:26 +00:00
Joshua Barretto
367ec3e8f4
Added ViewMaterials experimental shader
2022-12-30 16:42:56 +00:00
Joshua Barretto
9098abc3d2
Merge reflections on horizontal border
2022-12-30 16:30:29 +00:00
Joshua Barretto
78fbaa82b3
Fixed ViewNormals
2022-12-30 16:26:32 +00:00
Joshua Barretto
c6fc833acb
Don't blend sky for underwater reflections
2022-12-30 16:23:38 +00:00
Joshua Barretto
d50bda8d09
Better SSR sky blending
2022-12-30 16:01:06 +00:00
Joshua Barretto
26a98a3d9b
Use normal and material gbuffer to improve quality of SSR
2022-12-30 15:33:23 +00:00
Joshua Barretto
6070bd6538
Merge branch 'master' into 'master'
...
Italian: hud-map-bridge
See merge request veloren/veloren!3717
2022-12-29 13:09:21 +00:00
Christof Petig
0fba3a73e4
Merge branch 'raresgmihalcea/update_flashing_lights_description' into 'master'
...
Update description of the flashing lights setting
See merge request veloren/veloren!3727
2022-12-29 13:01:59 +00:00
Monty Marz
6b74437c8c
Bag icon improvement
2022-12-23 15:22:13 +00:00
Marcel
5f4f285523
Merge branch 'christmas-2022' into 'master'
...
Christmas 2022 changes
See merge request veloren/veloren!3721
2022-12-22 21:06:51 +00:00
DaforLynx
5e282340ba
Christmas 2022 changes
2022-12-22 21:06:51 +00:00
Joshua Barretto
1798cdcffe
Merge branch 'zesterer/floofy-clouds' into 'master'
...
Floofy Clouds (improved cloud performance and visuals)
See merge request veloren/veloren!3726
2022-12-17 15:41:08 +00:00
Joshua Barretto
dcc4762106
Fixed moon lighting of clouds
2022-12-17 15:04:57 +00:00
Joshua Barretto
5cf3aefb87
Better storm clouds
2022-12-17 14:57:55 +00:00
Rares
d63f8850a4
Update description of the flashing lights setting
...
The lights are supposed to be enabled when the setting is checked
The new description should better reflect the intended behaviour
Only the English descriptions have been updated.
2022-12-16 21:34:22 +02:00
Joshua Barretto
94c0e3749e
Improved cloud visuals and performance
2022-12-15 23:56:28 +00:00
Marcel Märtens
b8afaafe69
fix spanish file movement
2022-12-15 21:39:59 +01:00
Francesco Vasco
03fae4f434
Italian: hud-map-bridge
2022-12-13 19:36:54 +01:00
Gamma
0e2fe6ff15
update the Spanish translation
2022-12-04 23:43:51 +00:00
rmdlv
f64af1dc86
Russian translation fixes
2022-12-03 19:40:45 +08:00
Marcel
122d2df04f
Merge branch 'tygyh/Swedish-translations' into 'master'
...
Update swedish translations
See merge request veloren/veloren!3705
2022-12-01 14:10:00 +00:00
Jonathan Berglin
511026fd65
Update swedish translations
2022-12-01 14:09:59 +00:00
Marcel
f96776b060
Merge branch 'alejandrohernandezcarbonero83-master-patch-36663' into 'master'
...
Update npc.ftl
See merge request veloren/veloren!3715
2022-12-01 13:39:25 +00:00
electro79
dfc31eb0b5
Update npc.ftl
2022-11-30 16:55:10 +00:00
Marcel
ba62cc853e
Merge branch 'Madrots/update-es_LA' into 'master'
...
Madrots/update-es_LA
See merge request veloren/veloren!3708
2022-11-30 15:34:33 +00:00
Madrots
605a0a07b0
Madrots/update-es_LA
2022-11-30 15:34:32 +00:00
Marcel
82e4520407
Merge branch 'master' into 'master'
...
Added 'hud-skill-set_as_exp_bar' in italian.
See merge request veloren/veloren!3710
2022-11-30 15:34:29 +00:00
Francesco Vasco
0ba7e5a06e
Added 'hud-skill-set_as_exp_bar' in italian.
2022-11-30 15:34:27 +00:00
Marcel
44bca9a1b0
Merge branch 'floppy_dagon_kit' into 'master'
...
dagon_kit
See merge request veloren/veloren!3696
2022-11-30 15:27:21 +00:00
flo
466ed2c382
dagon_kit
2022-11-30 15:27:21 +00:00
Marcel
7191ee9325
Merge branch 'alejandrohernandezcarbonero83-master-patch-19384' into 'master'
...
Update char_selection.ftl
See merge request veloren/veloren!3711
2022-11-30 15:18:04 +00:00
IsseW
7296843923
simple bridges
2022-11-30 15:13:52 +01:00
electro79
b5cb66d053
Update char_selection.ftl
2022-11-29 21:56:21 +00:00
DaforLynx
d338906b19
More music and artist links
2022-11-25 18:48:56 +00:00
Monty Marz
3abfa4d2cc
Add Exp-Bar
2022-11-22 11:52:39 +00:00
Marcel
1a92bd7fe1
Merge branch 'master' into 'master'
...
Italian transaltion
See merge request veloren/veloren!3687
2022-11-21 16:24:06 +00:00
Francesco Vasco
d127bcc5d8
Italian transaltion
2022-11-21 16:24:06 +00:00
Marcel
107cc8963f
Merge branch 'Halosesparta13-master-patch-90913' into 'master'
...
Translation for the "ability.ftl" file to the es_LA folder
See merge request veloren/veloren!3613
2022-11-20 18:16:49 +00:00
Halosesparta
cfcf197e32
Translation for the "ability.ftl" file to the es_LA folder
2022-11-20 18:16:48 +00:00
Marcel
e5979c78f8
Merge branch 'kuba1001t/update-pl_PL' into 'master'
...
Update polish translations
See merge request veloren/veloren!3677
2022-11-20 18:13:01 +00:00
Marcel
833ae2331a
Merge branch 'tygyh/Swedish-translations' into 'master'
...
Update swedish translations
See merge request veloren/veloren!3682
2022-11-20 18:12:59 +00:00
Justin Shipsey
aa2fabcd45
Merge branch 'mossdrake' into 'master'
...
Moss Drake
See merge request veloren/veloren!3693
2022-11-12 13:00:44 +00:00
flo
0351bf1d63
Moss Drake
2022-11-12 13:00:42 +00:00
Justin Shipsey
420e824a3e
Merge branch 'train-track-shadows' into 'master'
...
Train track shadows
See merge request veloren/veloren!3688
2022-11-12 13:00:24 +00:00
Christof Petig
a820eee289
Merge branch 'floppy-bat-wing-tweaks' into 'master'
...
tweak bat wing animation
See merge request veloren/veloren!3684
2022-11-12 10:18:11 +00:00
flo
df70381a7c
tweak bat wing animation
2022-11-12 10:18:10 +00:00
Monty Marz
a763a865fe
Musical Instruments part 2
2022-11-10 20:59:53 +00:00
DaforLynx
b2b14e7ab4
Event music can use more than one event at a time. Added test for soundtracks.
2022-11-07 22:39:25 +00:00
Avi Weinstock
18657fdb66
Render train tracks to the shadow map.
2022-11-06 20:54:58 -05:00
Avi Weinstock
db251273ed
Apply shadow map shadows to train tracks.
2022-11-06 18:09:07 -05:00
Samuel Keiffer
72bffe0df8
Merge branch 'train-tracks' into 'master'
...
Train tracks
See merge request veloren/veloren!3679
2022-11-05 22:56:07 +00:00
Avi Weinstock
f5c1293e9f
Address review comments for MR 3679:
...
- Fix normal vectors/lighting for train tracks.
- Adjust chat command logging statement.
- Remove train tracks when their chunks get unloaded.
- Create a struct for the 6-tuple returned from `get_nearest_ways`.
- Move code that creates the train tracks into `layers::apply_trains_to`.
2022-11-03 15:20:53 -04:00
Joshua Barretto
b64ca9e698
Tweaked door opening, many entities push grass
2022-11-02 14:44:18 +00:00
Avi Weinstock
ff5acf18d7
Doors now animate opening when entities are near them.
2022-11-01 19:29:51 -04:00
tygyh
abd2e0832f
Update swedish translations
2022-11-01 11:05:51 +01:00
Avi Weinstock
08a50afd9f
Mostly working train tracks.
2022-10-28 21:36:42 -04:00
Kuba 1001
92465bfe59
lang(pl_PL): update polish translations
2022-10-28 17:46:17 +02:00
Sam
0fe073fcdc
Addressed feedback from testing
2022-10-27 20:07:10 -04:00
Sam
1782408676
Address UX issues of contextual abilities.
2022-10-27 20:07:08 -04:00
Sam
bc8f794309
New ability icons
2022-10-27 20:06:59 -04:00
Sam
a8212d6f41
Dive melee now scales its attack off of the entity's vertical speed.
...
Parries now cause the attacker to effectively have a recover that is either twice as long or 0.5s longer, whichever is more.
Counters now deal twice as much damage to the target if the target is in the buildup portion of an ability.
2022-10-27 20:06:55 -04:00
Sam
356c26cc66
UI for sword skill tree.
2022-10-27 20:06:54 -04:00
Sam
871d480639
Combo related skill icons
2022-10-27 20:06:50 -04:00
Sam
500e0ae3d0
Heavy abilities
2022-10-27 20:06:34 -04:00
Sam
fd05795b4c
Titles and descriptions for each ability.
2022-10-27 20:06:31 -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
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
flo666
586d0f6dd8
add bat (created by Gemu)
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
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
Monty Marz
2d8627c29b
Add gnarling chieftain mask
2022-10-15 11:05:21 +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
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
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
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
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
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
