ca1a27bd11
Merge branch 'imbris/update-tracy' into 'master'
...
Update tracy
See merge request veloren/veloren!3400
2022-05-27 02:50:24 +00:00
5cf899c4fe
Plot fixes in client and dynamic name fix in voxygen (tracy update)
2022-05-26 22:19:11 -04:00
8b7f08e8ab
Merge branch 'makselord/ingots' into 'master'
...
fixed silver, gold, copper, tin ingots not showing correctly in crafting
See merge request veloren/veloren!3402
2022-05-26 22:13:33 +00:00
5c8c88b786
fixed silver, gold, copper, tin ingots not showing correctly in crafting
2022-05-26 17:08:39 -04:00
3b6e6be947
Merge branch 'zesterer/fix-climbing' into 'master'
...
Fixed climbing
See merge request veloren/veloren!3401
2022-05-26 09:34:10 +00:00
4eb781cdf7
Fixed climbing
2022-05-26 10:08:41 +01:00
a366fc4512
Update tracy
2022-05-26 00:04:03 -04:00
fb6a8e0360
Merge branch 'xMAC94x/network_error' into 'master'
...
Pass network errors through the stack to display them in logs
See merge request veloren/veloren!3385
2022-05-25 22:12:42 +00:00
5c2eda64da
Merge branch 'christof/MR3316_reworked' into 'master'
...
MR3316 "Draft: Updated translations" without the directory movement and squashed
See merge request veloren/veloren!3391
2022-05-24 22:10:22 +00:00
2e6e864672
fix missing comma at line ends
2022-05-24 23:31:20 +02:00
b9c324a183
Merge branch 'tame_and_mount_special_casing' into 'master'
...
Special case taming and mounting.
See merge request veloren/veloren!3354
2022-05-24 02:09:45 +00:00
d84a26dfd8
Special case taming and mounting.
2022-05-24 02:09:45 +00:00
1b5c4b0749
Merge branch 'Corvella/bow_zoom_toggle' into 'master'
...
Add a setting to toggle zooming in when charging bow
See merge request veloren/veloren!3396
2022-05-23 23:09:47 +00:00
a9622fe28e
Add a setting to toggle zooming in when charging bow
2022-05-23 23:09:47 +00:00
d50b960592
Merge branch 'Corvella/hitboxes' into 'master'
...
Hitbox improvements
See merge request veloren/veloren!3395
2022-05-23 09:18:11 +00:00
42af9b8e15
Hitbox improvements
2022-05-23 09:18:10 +00:00
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
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
bbe22d6807
Fixed bins (no assets)
2022-05-18 16:44:09 -04:00
aeca67443b
Simplified item key (assets)
2022-05-18 16:28:10 -04:00
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
94d05b4ddf
Changelog
2022-05-17 19:57:16 -04:00
ed9bb7adae
Added comments to persistence code
2022-05-17 19:05:43 -04:00
46fe8604b7
Added search filtering to modular entries in crafting UI
2022-05-16 15:11:46 -04:00
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
cbf5336343
Moved items from 'items.crafting_ing.modular' to 'items.modular.weapon' (assets).
2022-05-16 15:11:45 -04:00
72f38068e0
Moved items from 'items.crafting_ing.modular' to 'items.modular.weapon' (no assets).
2022-05-16 15:11:44 -04:00
ad48b634ab
Address feedback (assets)
2022-05-16 15:11:44 -04:00
066b8ef9fd
Address feedback (no assets)
2022-05-16 15:11:43 -04:00
254b7964e1
Balance tweaks (assets)
2022-05-16 15:11:43 -04:00
