Marcel
738136e70f
Merge branch 'alxly/update-ru_RU' into 'master'
...
alxly/update-ru_RU: add ru_RU missed translations
See merge request veloren/veloren!2757
2021-08-17 12:18:33 +00:00
AlxlY
4b62797f03
alxly/update-ru_RU: update translation for GPU profiler and mouse sensevity
2021-08-16 22:04:17 +02:00
Ygor Souza
54c3adf9af
Use all armor stats to calculate combat rating
...
- Added terms to account for poise (stun resistance), max energy bonus,
energy reward bonus, and crit power.
- The weights were chosen to yield roughly the same CR for each of the 3
types of armor in the same tier.
- Weapon rating multiplied by a constant to keep in the same order of
magnitude as the other terms.
2021-08-16 19:59:54 +02:00
Samuel Keiffer
5116c31f20
Merge branch 'juliancoffee/balance_update' into 'master'
...
Abilitiy tweaks and /make_npc command
See merge request veloren/veloren!2769
2021-08-16 16:06:59 +00:00
juliancoffee
09e8ee2b3f
Remove giants
2021-08-16 18:15:01 +03:00
juliancoffee
130ae1f429
Add ori_modifier for DashMelee and nerf it
...
* 0.6 -> 0.3 ori modifier during charge in DashMelee
2021-08-16 17:27:59 +03:00
juliancoffee
e24cd2598d
Implement /make_npc
2021-08-16 17:27:59 +03:00
juliancoffee
5941d6731c
Refactor supplement evaluation to use NpcData
2021-08-16 17:27:59 +03:00
juliancoffee
e9dde3ecec
Add MakeNPC admin command
2021-08-16 16:45:36 +03:00
juliancoffee
e3798e5d2a
Abilitiy tweaks
...
Buff axe double_strike damage (90 -> 110 for first stage)
Decrease initial poise damage for hammer charged (20 -> 5)
2021-08-15 23:20:21 +03:00
Imbris
1fd25c22dd
Merge branch 'juliancoffee/explode_vines' into 'master'
...
Make Fireballs explode EnsnaringVines
See merge request veloren/veloren!2758
2021-08-14 19:09:05 +00:00
Imbris
16fe011061
Merge branch 'master' into 'master'
...
Add WGPU adapter selection using WGPU_ADAPTER
See merge request veloren/veloren!2747
2021-08-14 18:09:51 +00:00
Joshua Barretto
95f505e0b0
Merge branch 'zesterer/better-aggro' into 'master'
...
Improved aggro system to reduce hyper-focused enemies
See merge request veloren/veloren!2767
2021-08-14 13:29:25 +00:00
Joshua Barretto
04a1ff214b
Merge branch 'DanTheOne/missing-volume-numbers' into 'master'
...
Add music and sfx volume numbers and a little refactoring
See merge request veloren/veloren!2768
2021-08-14 13:04:32 +00:00
DanTheOne
de750e2f46
Refactor sound settings window
2021-08-14 14:24:06 +02:00
DanTheOne
9b555a52dc
Add music and sfx volume numbers
2021-08-14 12:25:21 +02:00
Joshua Barretto
87851293c2
Improved aggro system to reduce hyper-focused enemies
2021-08-14 11:09:33 +01:00
juliancoffee
c2247686db
Make is_mid_air use on_surface().is_none()
2021-08-13 23:16:38 +03:00
Daniil Nemtsev
a5ec81844f
Add WGPU adapter selection using WGPU_ADAPTER
2021-08-13 12:39:44 +00:00
Joshua Barretto
5e7e560c10
Merge branch 'min-persistent-world' into 'master'
...
min-persistent-world
See merge request veloren/veloren!2662
2021-08-13 12:30:28 +00:00
Marcel
7158ae1936
Merge branch 'update_pt_BR_20210810' into 'master'
...
update pt_br translation 2021_08_10
See merge request veloren/veloren!2753
2021-08-13 07:17:01 +00:00
Nícolas Wildner
dc4574aa49
update pt_br translation 2021_08_10
2021-08-13 07:17:01 +00:00
Marcel
cddb827a27
Merge branch 'trade-window-fix' into 'master'
...
Small fix for trade window headers
See merge request veloren/veloren!2766
2021-08-12 22:50:36 +00:00
Xeriab Nabil
05df63dd79
Small fix for trade window headers
2021-08-12 21:56:38 +03:00
juliancoffee
a82f5ca057
Add comment about fragility of solution
2021-08-12 15:28:58 +03:00
Marcel
b6300bb6f7
Merge branch 'tygyh/Move-assignment-out-of-if-statement' into 'master'
...
Move assignment out of if-statement
See merge request veloren/veloren!2764
2021-08-12 11:14:57 +00:00
Dr. Dystopia
94bcf5b59b
Move assignment out of if-statement
2021-08-12 12:34:04 +02:00
Joshua Barretto
c2498d81c7
Added feature flag for terrain persistence
2021-08-12 10:48:00 +01:00
Joshua Barretto
738e59965f
Added experimental terrain persistence
2021-08-12 10:26:20 +01:00
Marcel
0dfc0d39dd
Merge branch 'fix-1278' into 'master'
...
Fixes the issue mentioned in #1278
See merge request veloren/veloren!2760
2021-08-12 07:24:16 +00:00
Xeriab Nabil
8ce679766a
Fixes the issue mentioned in #1278
2021-08-12 03:23:31 +03:00
juliancoffee
86b9e2d8e6
Make Fireballs explode EnsnaringVines
2021-08-12 01:25:55 +03:00
AlxlY
bd26d2ad2a
alxly/update-ru_RU: updated transation after review.
2021-08-12 00:16:45 +02:00
Marcel
add74cd0ea
Merge branch 'xMAC94x/fix_1165' into 'master'
...
remove futures_executor from renderer and rather pass tokio runtime to it...
See merge request veloren/veloren!2755
2021-08-11 15:26:08 +00:00
AlxlY
b8f37f474b
alxly/update-ru_RU: fix translation based on @CodeReview comments.
2021-08-11 13:37:05 +02:00
Marcel
0bedfde53e
Merge branch 'trade-window-improvements' into 'master'
...
UI: Fixes and enhancements to the trading window
See merge request veloren/veloren!2738
2021-08-11 09:25:17 +00:00
Marcel Märtens
bc821a46cd
code cleanup
2021-08-11 09:42:29 +02:00
Marcel Märtens
889a8d11f5
zest prefers this over await
2021-08-11 01:23:48 +02:00
Marcel
631b4747d9
Merge branch 'juliancoffee/i18n_sprites' into 'master'
...
Localization for sprite overitem (currenly only crafting stations)
See merge request veloren/veloren!2759
2021-08-10 23:17:25 +00:00
Illia Denysenko
2a093a9991
Localization for sprite overitem (currenly only crafting stations)
2021-08-10 23:17:25 +00:00
AlxlY
d47620959b
alxly/update-ru_RU: added proper translations after review. changed indentation to spaces
2021-08-11 00:48:48 +02:00
Marcel Märtens
32e58c4b17
remove futures_executor from renderer and rather pass tokio runtime to it properly. therefore the runtime is now created with Voxygen rather than with the Connect attempt
2021-08-11 00:38:03 +02:00
AlxlY
18a6ff3f31
alxl/update-ru_RU: add ru_RU missed translations
2021-08-10 23:36:02 +02:00
Marcel
92684b31fa
Merge branch 'kilpkonn/camera_clipping' into 'master'
...
Camera clipping
Closes #955
See merge request veloren/veloren!2730
2021-08-10 12:20:27 +00:00
Tavo Annus
6114cbbcf3
Fix skybox jumping
2021-08-10 14:01:09 +02:00
Tavo Annus
5c5f172667
Use old strategy for far distances
2021-08-10 14:00:59 +02:00
Tavo Annus
06b8ad62d3
Minor tweaks to clipping, style fixes
2021-08-10 14:00:51 +02:00
Tavo Annus
ad075b55c9
Allow trees to pass between character and camera for bigger distances
2021-08-10 14:00:42 +02:00
Tavo Annus
e834711293
Fix character being too close in menu
2021-08-10 14:00:34 +02:00
Tavo Annus
a7aa37f7f6
Fix camera shaking & Style fixes
2021-08-10 14:00:13 +02:00
