Commit Graph

11833 Commits

Author SHA1 Message Date
fc735f509e fix a unrelated clippy issue that came up suddenly 2022-05-23 09:20:54 +02:00
e194a2e334 export unterlying errors via network crate, to generate more detailed logs 2022-05-23 02:00:56 +02:00
8e0295ff47 Merge branch 'dawn-vs-dusk' into 'master'
Split sky shader's twilight into dawn and dusk

See merge request veloren/veloren!3390
2022-05-22 21:55:52 +00:00
5ac9c720a1 MR3316 "Draft: Updated translations" without the directory movement and squashed:
Renewed Polish translations
Added spaces and change sequences so code fits to English version
2022-05-22 23:01:40 +02:00
e1bd2c1f0c Merge branch 'zesterer-master-patch-64170' into 'master'
Fixed frozen character when wall-run into water horizontally

See merge request veloren/veloren!3389
2022-05-22 18:59:29 +00:00
fe11d6d5bc Split sky shader's twilight into dawn and dusk
Instead of having the same color profiles for the sky's color, light,
and halo, we now have the ability to define different values for dawn
and dusk.

The dusk values were unchanged and the dawn values are similar, but with
less red. These should probably be tweaked a bit more.
2022-05-22 19:54:44 +01:00
d18483756b Fixed frozen character when wall-run into water horizontally 2022-05-22 19:37:52 +01:00
34c12092cc Merge branch 'Samuellm93-master-patch-97383' into 'master'
Update common.ron pt_BR. Added some variables and edited a few.

See merge request veloren/veloren!3387
2022-05-22 13:11:57 +00:00
4327c083a8 Merge branch 'Eurydia/added-th_TH' into 'master'
Add Thai translation

See merge request veloren/veloren!3386
2022-05-22 10:06:37 +00:00
88eaef3145 Add Thai translation 2022-05-22 10:06:36 +00:00
75d109ef6e Update common.ron pt_BR. Added some variables and edited a few. 2022-05-21 00:11:04 +00:00
813a493f9a Merge branch 'Chaseowski/Balance' into 'master'
Multiple Balance Tweaks & Miscellaneous Changes

See merge request veloren/veloren!3372
2022-05-19 22:46:31 +00:00
7dcee3eb23 Multiple Balance Tweaks & Miscellaneous Changes 2022-05-19 22:46:31 +00:00
dc9fe8932b Merge branch 'NPC_item_pickup' into 'master'
NPC itemdrop picking up

See merge request veloren/veloren!3308
2022-05-19 22:06:44 +00:00
N A
1f82dab948 NPC itemdrop picking up 2022-05-19 22:06:44 +00:00
faa4c85cbb Merge branch 'modular-fixes' into 'master'
Tweaks for this week

See merge request veloren/veloren!3383
2022-05-19 19:35:32 +00:00
080d8ef8b1 Tweaks for this week 2022-05-19 19:35:31 +00:00
73244893cc Merge branch 'update-it_IT' into 'master'
Updated the italian translation

See merge request veloren/veloren!3359
2022-05-19 03:51:44 +00:00
50c34e56ce Merge branch 'chucksys/chat-opacity-text' into 'master'
Add chat window opacity value alongside slider

See merge request veloren/veloren!3377
2022-05-19 03:48:20 +00:00
3f60629c54 Merge branch 'sam/item-key-rework' into 'master'
Simplified item key

Closes #1549

See merge request veloren/veloren!3382
2022-05-19 03:48:17 +00:00
Sam
bbe22d6807 Fixed bins (no assets) 2022-05-18 16:44:09 -04:00
Sam
aeca67443b Simplified item key (assets) 2022-05-18 16:28:10 -04:00
Sam
534c7dc8b9 Simplified item key (no assets) 2022-05-18 16:28:06 -04:00
c3377547c3 Merge branch 'modular-weapons' into 'master'
Modular weapons

Closes #1255

See merge request veloren/veloren!2708
2022-05-18 00:42:03 +00:00
Sam
94d05b4ddf Changelog 2022-05-17 19:57:16 -04:00
Sam
ed9bb7adae Added comments to persistence code 2022-05-17 19:05:43 -04:00
Sam
46fe8604b7 Added search filtering to modular entries in crafting UI 2022-05-16 15:11:46 -04:00
Sam
ba0846d6c7 Addressed more feedback 2022-05-16 15:11:46 -04:00
ac124b67a0 minor loot table tweaks and removal of yellow weapon components from caves 2022-05-16 15:11:45 -04:00
Sam
cbf5336343 Moved items from 'items.crafting_ing.modular' to 'items.modular.weapon' (assets). 2022-05-16 15:11:45 -04:00
Sam
72f38068e0 Moved items from 'items.crafting_ing.modular' to 'items.modular.weapon' (no assets). 2022-05-16 15:11:44 -04:00
Sam
ad48b634ab Address feedback (assets) 2022-05-16 15:11:44 -04:00
Sam
066b8ef9fd Address feedback (no assets) 2022-05-16 15:11:43 -04:00
Sam
254b7964e1 Balance tweaks (assets) 2022-05-16 15:11:43 -04:00
Sam
bcf36d08b0 Add removed items to migration. 2022-05-16 15:11:43 -04:00
Sam
54a6c31c63 Slight optimization to persistence 2022-05-16 15:11:42 -04:00
Sam
85c2a85817 Addressed review comments 2022-05-16 15:11:42 -04:00
Sam
d6ac9c43d7 More feedback addressed (assets). 2022-05-16 15:11:41 -04:00
Sam
00276acbdb More feedback addressed (no assets). 2022-05-16 15:11:41 -04:00
Sam
5d0ba6e2b8 Addressed round 3 of feedback (no assets). 2022-05-16 15:11:41 -04:00
Sam
13ea6dee93 Addressed second round of balance feedback (assets). 2022-05-16 15:11:40 -04:00
Sam
c0dd748bc7 Addressed second round of balance feedback (no assets). 2022-05-16 15:11:40 -04:00
d46cdf60b5 renamed hilt voxels, adjusted secondary components in item image manifests [ci_skip] 2022-05-16 15:11:39 -04:00
Sam
95c3fdffa1 Addressed playtest feedback (no assets). 2022-05-16 15:11:39 -04:00
Sam
9b078c3383 Addressed playtest feedback (assets). 2022-05-16 15:11:38 -04:00
Sam
f47cbeb022 Addressed review comments 2022-05-16 15:11:38 -04:00
fc28449703 rotate voxels and sceptre positioning [ci_skip] 2022-05-16 15:11:37 -04:00
Sam
de8f98446e Fixed errors in csv import, csv export, and recipe graphviz bins 2022-05-16 15:11:37 -04:00
1c626da66b loot tables and adding models 2022-05-16 15:11:36 -04:00
Sam
528b62c59a Rebase commit 2022-05-16 15:11:36 -04:00