Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,629 Commits 151 Branches 18 Tags 2.1 GiB
1b85258838
Commit Graph

2042 Commits

Author SHA1 Message Date
Imbris
6cfadc4f65 Add sobel filter as experimental shader option 2022-01-23 16:32:26 -05:00
Joshua Barretto
abda8058fe Fixed caustics 2022-01-23 16:32:26 -05:00
Joshua Barretto
a3fcd7f568 Unified and fixed attenuation 2022-01-23 16:32:26 -05:00
Joshua Barretto
b94d560a20 Fixed light extinction 2022-01-23 16:32:26 -05:00
Joshua Barretto
212392a062 Added proper refraction to water surface 2022-01-23 16:32:26 -05:00
Joshua Barretto
470353e08c Fix for translucency blocking clouds 2022-01-23 16:32:26 -05:00
Joshua Barretto
0bcc3fb135 Sprite and figure attenuation 2022-01-23 16:32:26 -05:00
Joshua Barretto
90f3f0fea0 Stopped caustics appearing in bad places 2022-01-23 16:32:26 -05:00
Joshua Barretto
38832fadd3 Improved underwater lighting on low shader settings 2022-01-23 16:32:26 -05:00
Joshua Barretto
bf214f4de4 Use correct ray direction underwater 2022-01-23 16:32:26 -05:00
Joshua Barretto
5cf5693468 Handle underwater sunlight and moonlight 2022-01-23 16:32:26 -05:00
Joshua Barretto
067e98139f Better caustic movement 2022-01-23 16:32:26 -05:00
Joshua Barretto
c6a9565c0f Fixed caustics 2022-01-23 16:32:26 -05:00
Joshua Barretto
a316a780fc Fixed shader compilation error 2022-01-23 16:32:26 -05:00
Joshua Barretto
e6332c1cb5 Significantly improved underwater shaders 2022-01-23 16:32:25 -05:00
ubruntu
57d9283afb Show HUD for campfires 2022-01-23 16:32:25 -05:00
Joshua Barretto
bdb0fc9c16 Merge branch 'zesterer/underwater' into 'master' 
Underwater shaders

See merge request veloren/veloren!3127
 2022-01-23 20:36:47 +00:00
Joshua Barretto
a49c0f0cdf Fixed caustics 2022-01-23 20:06:44 +00:00
Joshua Barretto
8504a8ab21 Merge branch 'ubruntu/campfire-hud' into 'master' 
Show HUD for campfires

See merge request veloren/veloren!3097
 2022-01-23 19:25:11 +00:00
ubruntu
ca2a81c20f Show HUD for campfires 2022-01-23 19:25:11 +00:00
InfRandomness
69c3480fce Move alpha values calculation 2022-01-23 17:16:22 +00:00
Joshua Barretto
fb2b9929a6 Unified and fixed attenuation 2022-01-23 16:25:15 +00:00
Joshua Barretto
8a684973b4 Merge branch 'zesterer/tiny-fixes' into 'master' 
Addressing criticisms

See merge request veloren/veloren!3121
 2022-01-22 16:44:01 +00:00
Joshua Barretto
824ba2beff Fixed light extinction 2022-01-21 18:21:14 +00:00
Joshua Barretto
b8df17080d Merge branch 'infrandomness/waypoint_binding_customization' into 'master' 
Add waypoint binding customization code

See merge request veloren/veloren!3122
 2022-01-21 18:05:41 +00:00
InfRandomness
b33fda1e0c Add waypoint binding customization code 2022-01-21 18:05:41 +00:00
ubruntu
1d0c861e19 Fix chest display names 2022-01-21 18:05:39 +00:00
Joshua Barretto
9a9c32d311 Added proper refraction to water surface 2022-01-21 17:45:50 +00:00
Joshua Barretto
31b9cd0565 Fix for translucency blocking clouds 2022-01-21 17:29:59 +00:00
Joshua Barretto
d2d4ca33c9 Sprite and figure attenuation 2022-01-21 14:04:24 +00:00
Joshua Barretto
b3bf06b07d Stopped caustics appearing in bad places 2022-01-21 13:43:36 +00:00
Joshua Barretto
3b347a2aa3 Improved underwater lighting on low shader settings 2022-01-21 13:35:40 +00:00
Joshua Barretto
2263bcbf7c Use correct ray direction underwater 2022-01-21 01:24:00 +00:00
Joshua Barretto
261fdf17a2 Handle underwater sunlight and moonlight 2022-01-21 01:18:43 +00:00
Joshua Barretto
51323cde38 Better caustic movement 2022-01-21 01:06:11 +00:00
Joshua Barretto
63f6af0621 Fixed caustics 2022-01-21 01:03:39 +00:00
Joshua Barretto
c17abb93f1 Fixed shader compilation error 2022-01-21 00:50:14 +00:00
Joshua Barretto
5b606f0d50 Significantly improved underwater shaders 2022-01-21 00:42:20 +00:00
Joshua Barretto
c2644d8e71 Fixed interaction between bloom and point glow 2022-01-20 22:30:05 +00:00
Joshua Barretto
4f181c936d Merge branch 'name_areas_based_on_biome' into 'master' 
name_areas_based_on_biome

See merge request veloren/veloren!3115
 2022-01-20 19:50:57 +00:00
Joshua Barretto
5a7cd39625 Added point glow slider 2022-01-20 13:40:11 +00:00
Joshua Barretto
1ccbaac314 Addressed review comments, fixed perf issue 2022-01-19 20:08:13 -05:00
Joshua Barretto
53574bb6ec Tweaked lantern offsets 2022-01-19 20:08:13 -05:00
Joshua Barretto
fcd25648fe Fixed point glow with no clouds 2022-01-19 20:08:13 -05:00
Joshua Barretto
fd4c4adae9 Fixed moving procgen LoD shader 2022-01-19 20:08:13 -05:00
Joshua Barretto
7506dc2a41 Added procedural LoD detail shader 2022-01-19 19:59:14 -05:00
Joshua Barretto
391d1f6bf4 Added point glow 2022-01-19 19:59:13 -05:00
Snowram
a6e396e29a Stunned and jump anims, stats, spawns, more IA work 2022-01-20 00:53:29 +01:00
Snowram
f6d7ba33ef Arthropods spawns and loots 2022-01-19 19:01:16 +01:00
Snowram
fd3ed89899 More arthropod animations 2022-01-19 19:01:15 +01:00
Snowram
02ed6ffd60 More arthropod work 2022-01-19 19:01:13 +01:00
Snowram
ae71f2e4f0 Adds poisoned debuff (energy change over time) 2022-01-19 19:01:13 +01:00
Snowram
fa549eece7 Adds new arthropod species 2022-01-19 19:01:12 +01:00
Snowram
f67bf2a539 Adds arthropod skeleton 2022-01-19 19:01:11 +01:00
Joshua Barretto
2f3b14f2e1 Improved glow lighting 2022-01-18 16:52:35 +00:00
floppy
28a7b00445 tweak biome icon 2022-01-18 09:19:55 +01:00
floppy
dcf36df781 tweak biome icon 2022-01-18 09:17:51 +01:00
Joshua Barretto
b85aac6e23 Fixed minor shader issues, added curved world effect 2022-01-18 01:47:06 +00:00
floppy
a836b61190 allow enabling/disabling biome names on map 2022-01-17 23:45:51 +01:00
Joshua Barretto
cd428d9267 Added support for experimental shaders 2022-01-17 22:20:33 +00:00
Imbris
9b85a01df6 Merge branch 'inputmeta' into 'master' 
Add Input methods to metainfo.xml

See merge request veloren/veloren!3093
 2022-01-17 18:30:28 +00:00
JakobDev
860f802afa Add Gamepad to supported controls 2022-01-17 15:09:03 +00:00
Joshua Barretto
bde3aade2b Updated changelog, fixed incorrect hint for mineable blocks 2022-01-16 17:53:51 +00:00
Joshua Barretto
504e2a38d5 Added overhead hints, smoother mount movement 2022-01-16 17:53:14 +00:00
Monty Marz
6d0913bb5e visuals 2022-01-15 21:46:57 -05:00
Monty Marz
eb0bed39e8 stats window WIP 2022-01-15 21:46:54 -05:00
Monty Marz
7515c26d68 progress 2022-01-15 21:46:54 -05:00
Monty Marz
89bf41574c diary section buttons 2022-01-15 21:42:33 -05:00
jshipsey
475fc1631f akhlut 2022-01-13 23:20:58 -05:00
jshipsey
1fac6359de more gnarling weapons 2022-01-13 23:20:56 -05:00
jshipsey
7f928d0bc0 woodengolem, chieftain, icedrake, blowgun 2022-01-13 23:20:52 -05:00
Jonathan Berglin
5fcbd1e743 Update swedish translations 2022-01-10 08:45:47 +00:00
Jonathan Berglin
d3f0fa810e Update swedish translations 2022-01-09 16:37:53 +00:00
JakobDev
9909fe11a1
Add Input methods to metainfo.xml 2022-01-09 12:29:22 +01:00
Samuel Keiffer
a600d4ca94 Merge branch 'FreeFull/intel_uvec3_fix' into 'master' 
Avoid Intel graphics ivec3/uvec3 bug.

See merge request veloren/veloren!3091
 2022-01-09 01:14:48 +00:00
Dominik Broński
cc36a14407 Fixes NaN in shader code which produced black sprites visible through blocks 2022-01-09 01:03:05 +00:00
Filip Szczepański
053e28a33a Avoid Intel graphics ivec3/uvec3 bug. 2022-01-09 00:04:35 +01:00
unvariant
71d2be5f76 support removing key bindings 2022-01-07 20:30:30 +00:00
voxal
e546a1d1a9 Allow players to see own speech bubbles. 2022-01-05 20:06:43 -08:00
DaforLynx
13e87375d6 River sounds and more 2022-01-03 22:40:31 +00:00
Dr. Dystopia
38246eefd3 Add missing 'new line' character 2022-01-01 17:56:42 +01:00
Dr. Dystopia
039f73be8f Update swedish translations 2022-01-01 15:03:58 +01:00
Dr. Dystopia
fae2fcd3f1 More swedish translations 2022-01-01 10:33:10 +01:00
Dr. Dystopia
9ea6cea7cd Update swedish translations and fix typo 2022-01-01 00:40:50 +01:00
Samuel Keiffer
4d85ae4f60 Merge branch 'ubruntu/dagger-ux' into 'master' 
Dagger UX

See merge request veloren/veloren!3072
 2021-12-28 22:09:34 +00:00
ubruntu
65f9d18fb7 Dagger UX 2021-12-28 22:09:34 +00:00
flo
4e843cb0ff update german translation by dd65 2021-12-28 18:14:29 +00:00
DoctorKompot
cc6058889a deleted unused PNG files 2021-12-27 03:01:29 +02:00
DoctorKompot
0dba858ca9 fixed turban specifier in item image manifest, reverted bag size for purified soulkeeper, updated item quality colors in mod files 2021-12-27 03:01:26 +02:00
DoctorKompot
5a196f1684 another shot at fixing turbans 2021-12-27 03:01:25 +02:00
DoctorKompot
d312452941 changed Magic Lantern kind: to "Magic" 2021-12-27 03:01:24 +02:00
DoctorKompot
439c6a9a3e fixed cheese 2021-12-27 03:01:22 +02:00
DoctorKompot
44f6e3888b updated mortar and pestle, fixed GR and cheese rotation, fixed offsets of Pfau's turbans 2021-12-27 03:01:21 +02:00
DoctorKompot
1cc69bbca1 fixed Pfau's turbans and manually added back mod.rs files that got deleted previously 2021-12-27 03:01:19 +02:00
DoctorKompot
9eedb024fe added new cheese, glowing remains and mortar and pestle files, updated collar and mushroom curry 2021-12-27 03:01:18 +02:00
DoctorKompot
e83446811a fixed apple offset 2021-12-27 03:01:16 +02:00
DoctorKompot
bc07474f31 fixed grey and purple slots 2021-12-27 03:01:15 +02:00
DoctorKompot
ff71891821 brightened item backgrounds 2021-12-27 03:01:14 +02:00
DoctorKompot
ca93284294 updated sewing set, ice shard and sunflower tea models with the ones provided by Gemu 2021-12-27 03:01:13 +02:00
DoctorKompot
46fe40d5fc fixed ice shard, sunflower tea and sewing kit 2021-12-27 03:01:11 +02:00
DoctorKompot
1060693d16 changed the scaling and offset of some items, replaced Raptor feather, sunflower tea, ice shard and sewing set PNGs with .vox files, updated the image manifest 2021-12-27 03:01:10 +02:00
DoctorKompot
7fb9ac121e updated item models with the ones provided by Gemu, (bags and food), some leather items, and honey, then updated item_image_manifest and sprite_manifest accordingly 2021-12-27 03:01:09 +02:00
DoctorKompot
0242552492 added mushroom stick, changed apple and apple stick models, made phoenix feather legendary rarity 2021-12-27 03:01:07 +02:00
DoctorKompot
84b85d6ae5 fixed coconut, added apple stick 2021-12-27 03:01:06 +02:00
DoctorKompot
daad02ae60 changed the index from the highlight color of these necklaces, since the voxels were invisible in-game 2021-12-27 03:01:04 +02:00
DoctorKompot
ac15e556f5 added vox files for apple, coconut, collar, mushroom curry and admin tabard, update item image manifest accordingly 2021-12-27 03:01:02 +02:00
DoctorKompot
e5408c69b5 changed color of MF bag to a darker tone 2021-12-27 03:01:00 +02:00
DoctorKompot
d7ddb3ae04 updated bag displays 2021-12-27 03:00:59 +02:00
DoctorKompot
3b6dc4dc50 reverted the previous Common items display changes 2021-12-27 03:00:56 +02:00
DoctorKompot
3c60bd1929 made lanterns slightly brighter, changed lantern color for green and red to match their names, changed display of Common items to fit the item frames of other qualities, updated item image manifest 2021-12-27 03:00:54 +02:00
Joshua Barretto
119c802695 Merge branch 'DaforLynx/new-music-nov' into 'master' 
Music additions

See merge request veloren/veloren!3023
 2021-12-22 11:20:34 +00:00
DaforLynx
e44478736e Music additions 2021-12-22 11:20:34 +00:00
Youssef Fahmy
04a37ba29c Christmas tweaks 2021-12-21 22:58:41 +00:00
Christof Petig
f3c1a69b12 make christmas wreaths hang to the wall, not float [ci skip] 2021-12-20 18:09:42 +00:00
Christof Petig
cbd2a422f3 Add Chrismas wreath (25% chance) and make the towns go wild with illumination 2021-12-20 18:06:58 +00:00
Christof Petig
47a6cf8ee3 Add Sarra_Kitty's Christmas wreath model [ci skip] 2021-12-20 18:06:58 +00:00
Christof Petig
920874146a remove the unintended black pixels at the bottom point [ci skip] 2021-12-20 18:06:58 +00:00
Christof Petig
c695d607d3 revise the snowflake shape [ci skip] 2021-12-20 18:06:57 +00:00
Christof Petig
201101c059 Add glowing christmas ornaments 2021-12-20 18:06:57 +00:00
Christof Petig
f097be4366 correct hanging star orientation 2021-12-20 18:06:57 +00:00
Christof Petig
207943aaa6 The snowflake is less deep than the star 2021-12-20 18:06:57 +00:00
Christof Petig
343ad8dfd9 Add mounting to Ornaments 2021-12-20 18:06:56 +00:00
Christof Petig
a314afdf04 Glowing snowflake model (Xmas decoration) 2021-12-20 18:06:55 +00:00
Christof Petig
1877bd5a57 Moravian Star (Xmas) decoration 2021-12-20 18:06:55 +00:00
UncomfySilence
065da20812 + Finished hat offsets for all races 
+ Villagers only wear christmas hat
+ Guards wear boreal_warhelm
+ Gave guards christmas color lanterns
+ Grave_robbers now wear hood and hood_dark too while also dropping them at a higher rate than previously.
+ Christmas event now starts at 20th and goes till 30th of december
+ item_image_manifest.ron manifest fix
+ Created a potential boss loot table which allows the player to get the winter_cap, the boreal_warhelm, polaris lantern, and more blue cheese.
+ Updated hood_dark with another index 17 layer to prevent hair clip.
 2021-12-20 18:06:21 +00:00
UncomfySilence
f9b4b55494 + working on hat offset 2021-12-20 18:06:21 +00:00
floppy
ff4c0460e6 - add Polaris Lantern, created by Gemu and Uncomfy for Christmas 2021-12-20 18:06:21 +00:00
floppy
aa81f2522d - add Polaris Lantern, created by Gemu and Uncomfy 2021-12-20 18:06:21 +00:00
UncomfySilence
e70fd8d397 + Added Gemu models 
+ Created manifest files for each
+ Created stats and other needs
+ Changed Event date from (24..=25) to (20..=30)
 2021-12-20 18:06:19 +00:00
UncomfySilence
d641245388 + Added updated blue_cheese model. 2021-12-20 18:03:52 +00:00
UncomfySilence
c2bf1a5345 + Created common.loot_tables.event directory for special item drop changes or for potential bosses. 
+ Made yeti boss have a 5% chance to spawn in snow biomes.
+ New yeti entity has ~28.5% chance to drop 1 to 10 exclusive blue cheese, ~57.1% to drop 1 to 3 coal, and ~14.2% chance to drop 1 diamond.
+ Blue cheese heals 60hp over 20 seconds.
+Blue cheese has item_image_manifest and other necessities completed. (Model is current placeholder until Gemu or Hannibal have approved)
 2021-12-20 18:03:52 +00:00
Ben Wallis
9a4e6b81d3 Merge branch 'Character-editting' into 'master' 
Character editing

See merge request veloren/veloren!3059
 2021-12-20 15:24:43 +00:00
Dr. Dystopia
3329a8df61 Add 'pen' icons for edit buttons 2021-12-18 15:27:14 +01:00
Dr. Dystopia
48fd9e877d Use 'confirm' button when finishing editing 2021-12-18 11:45:49 +01:00
Marcel
cba946c07b Merge branch 'add-zh_TW-gameinput.greet' into 'master' 
Add zh_TW gameinput.greet translate.

See merge request veloren/veloren!3061
 2021-12-16 16:21:58 +00:00
EvanMeek
435d2ec8ae Add zh_TW gameinput.greet translate. 2021-12-16 17:47:12 +08:00
EvanMeek
3a66c5a91a Add gameinput.greet translate. 2021-12-16 17:43:33 +08:00
holychowders
b40d94dd53 Re-allow and improve fleeing. 2021-12-07 20:18:03 -06:00
Jonathan Berglin
58881d4cfc Translate to swedish 2021-11-26 14:16:10 +00:00
UncomfySilence
1b1fee4f0b + Updating item_image_manifest to Master (was behind) 2021-11-18 18:56:50 +01:00
UncomfySilence
e69a6b82dc + Updating item_image_manifest to Master (was behind) 2021-11-18 18:52:22 +01:00
UncomfySilence
8d86f62f2e + Updating item_image_manifest to Master (was behind) 2021-11-18 18:31:22 +01:00
UncomfySilence
4e19f2444b + Updating item_image_manifest to Master (was behind) 2021-11-18 18:31:22 +01:00
Monty Marz
ec07dbb05e Merchant Outfit 2021-11-18 16:31:12 +00:00
Limofeus
7d50af8b7d Upd #4 - some other translations 2021-11-17 20:04:20 +00:00
Marcel
3801ead342 Merge branch 'tim74' into 'master' 
fix(AppData): Update screenshots due 404

See merge request veloren/veloren!2834
 2021-11-15 12:44:01 +00:00
Oolnokk
5643cea4ba The long orc beard was painted with index 17 thus rendering parts invisible after the hat update, creating an infamous 'goatee' look. Copied the colors to much higher indexes, and now it looks as intended ingame. 2021-11-13 19:08:06 -05:00
Joshua Barretto
c0bf9503bd Addressed review issues, added cloning docs to BodySpec::Manifests 2021-11-13 17:20:23 +00:00
Joshua Barretto
edf9c59e7d Added bomb sprites 2021-11-13 17:12:16 +00:00
Joshua Barretto
dbfbdcdacd Added golf club 2021-11-13 17:11:02 +00:00
Benjam Soule H. Walker
9011ed3a77 Update assets/voxygen/voxel/armor/misc/head/wanderers_hat.vox 2021-11-13 16:30:03 +00:00
Oolnokk
c6383ca5a4 Models have been cleaned up and approved by Gemu 2021-11-12 18:46:01 -05:00
DemonicOnPc
b7ac542ebb fixes to branch after my whoops 2021-11-08 17:09:19 -05:00
DemonicOnPc
7fc57c027b Fixes to jungle sprites and lillypads 2021-11-08 17:09:15 -05:00
DemonicOnPc
c6dd425203 Update sprite_manifest.ron 2021-11-08 17:09:12 -05:00
DemonicOnPc
9514cd71c6 Jungle and River update 
-Added Lillypads to rivers
-Added new types of reeds
-Added reeds to water
-Added more Ferns/Flowers/Plants to jungles
 2021-11-08 17:09:11 -05:00
Youssef Fahmy
6c52d4ca5e Minor edits 2021-11-03 21:27:47 +00:00
Joshua Barretto
80c4e3de19 Merge branch 'tijnvdheuvel/newSFX' into 'master' 
Merge "Tijnvdheuvel/new sfx" New Truffler & Fungome SFX

See merge request veloren/veloren!2977
 2021-11-01 21:15:35 +00:00
Oolnokk
b6f137bb7a Changes to formatting 2021-10-31 23:49:46 -04:00
Oolnokk
3618a0e5f5 Changes to formatting 2021-10-31 23:44:29 -04:00
Oolnokk
b67558c1ba 2 new beards, four new hairstyles and 1 new eye option for dwarf males 2021-10-31 22:58:25 -04:00
jshipsey
b1e9d9664b adjust models, last fixes 2021-10-30 23:42:18 -04:00
jshipsey
f69e3c9fbc more hats 2021-10-30 23:42:17 -04:00
jshipsey
97a3c1e713 simple hats 2021-10-30 23:42:15 -04:00
jshipsey
5cc54b34bd headbands 2021-10-30 23:42:13 -04:00
Evelyn
91477f7a5c Add new gliders 2021-10-30 20:48:04 +00:00
tijnvdheuvel
05f943f09b You guessed it, yet another missed comma -,- Update sfx.ron 2021-10-29 14:57:36 +00:00
tijnvdheuvel
80438fa582 Fixed another missing comma sfx.ron 2021-10-29 14:28:59 +00:00
tijnvdheuvel
377afc410d Update sfx.ron 2021-10-28 13:34:46 +00:00
Monty Marz
727295aec1 text and alignment WIP 2021-10-27 17:02:35 -04:00
Monty Marz
a97cc95496 crafting station model, explanatory text part 1 2021-10-27 17:02:34 -04:00
Monty Marz
7aae35f286 bench 2021-10-27 17:02:31 -04:00
tijnvdheuvel
6721375d75 Changed name of fungome SFX 2021-10-26 22:01:27 +00:00
tijnvdheuvel
016fce2c3c Update sfx.ron 2021-10-26 21:58:20 +00:00
tijnvdheuvel
f1850141b9 Added truffler calm SFX (a growl) 2021-10-26 17:42:23 +00:00
tijnvdheuvel
aadeb87005 Added truffler calm SFX 2021-10-26 17:41:37 +00:00
tijnvdheuvel
70d3f9fdc4 Added a fungomel calm utterance. 2021-10-26 17:32:41 +00:00
IsseW
411acc73ff Edited all languages to fit new change 2021-10-26 01:27:03 +02:00
IsseW
6a85e231b4 Added part of tip 2021-10-26 00:15:09 +02:00
IsseW
047cda179f Added keybinding shortcut in loading tips 2021-10-25 23:53:27 +02:00
Doctor Kompot
51f8aa06df DoctorKompot - New Necklaces 2021-10-22 05:24:20 +00:00
Nicolas Wildner
515f16d84e update pt_br 20211019 2021-10-18 14:19:52 -03:00
Samuel Keiffer
1e61a279cc Merge branch 'kaedr/pretty_printing_error_messages' into 'master' 
Fixed obfuscation of error messages caused by previous MR (pretty printing error messages)

See merge request veloren/veloren!2935
 2021-10-18 03:35:03 +00:00
Joshua Barretto
87293fb9df Fixed lantern lighting bug 2021-10-17 09:07:27 +01:00
kaedr
cc98ccc371 Added localization for server error message display on client 2021-10-16 20:17:38 -04:00
kaedr
eb02a4733d Fixed obfuscation of error messages caused by previous commits 2021-10-16 20:17:37 -04:00
Joshua Barretto
94b0288180 Merge branch 'zesterer/tiny-fixes' into 'master' 
Tiny fixes

See merge request veloren/veloren!2926
 2021-10-16 16:25:59 +00:00
Joshua Barretto
2b74071cdb Merge branch 'kalikatz/add_tools_to_sfx' into 'master' 
add pointers to sceptre and pickaxe pickup sounds

See merge request veloren/veloren!2934
 2021-10-16 16:04:20 +00:00
Joshua Barretto
ef33b2e3ab Better ambiance slider 2021-10-16 15:12:07 +01:00
Joshua Barretto
3322eeb365 Aurora light tint 2021-10-16 14:32:18 +01:00
Joshua Barretto
c4efb5fc68 Better moonlight, added aurora light 2021-10-16 14:31:46 +01:00
Joshua Barretto
53185639a0 Better aurora 2021-10-16 14:31:46 +01:00
Joshua Barretto
3357008601 Merge branch 'zesterer/small-fixes' into 'master' 
Caverns

See merge request veloren/veloren!2763
 2021-10-16 09:33:57 +00:00
Kali
8446fb9383 add pointers to sceptre and pickaxe pickup sounds 2021-10-15 15:40:18 -07:00
Henry Corse
e01ce2dcf4 Kaedr/pretty printing error messages 2021-10-14 18:37:51 +00:00
Marcel
430ee87620 Merge branch 'Limofeus/russian_translation_updates' into 'master' 
Limofeus/russian translation updates

See merge request veloren/veloren!2920
 2021-10-12 17:15:49 +00:00
Limofeus
df1aab877b Upd #2 - removed mixed up tabs and spaces 2021-10-12 19:18:11 +03:00
GLawrence29
e1ea1193c2 i18n: Revised catalan (Catalonia) translation 2021-10-12 15:16:25 +02:00
Limofeus
a2d0911355 Upd #1 - Skills, Settings labels, Tools and Credits translations added 2021-10-12 16:09:55 +03:00
Marcel
94439a4240 Merge branch 'jtriantafylos/background_fps' into 'master' 
Fixes #1350 - Allow players to cap the game FPS when unfocused

Closes #1350

See merge request veloren/veloren!2890
 2021-10-10 15:33:38 +00:00