Joshua Barretto
483276b082
Made sprite/block selection effect more subtle
2021-04-20 02:46:06 +02:00
Monty
a4d56e7843
more sprite stuff and crafting UI update
...
fix item images
fix CR display
2021-04-20 02:46:06 +02:00
Monty
a1fe7c12c3
fmt, add sprites
2021-04-20 02:46:04 +02:00
Joshua Barretto
c5455fa1a1
Merge branch 'zesterer/small-fixes' into 'master'
...
Small fixes
See merge request veloren/veloren!2163
2021-04-19 21:54:26 +00:00
Joshua Barretto
4ad5257e40
Rebalanced mist
2021-04-19 22:26:56 +01:00
Joshua Barretto
86287e8f0a
Fixed negative cloud density bug
2021-04-19 22:02:47 +01:00
Imbris
8c9d4dc3dd
Merge branch 'capucho/inactive-master' into 'master'
...
Lower volume of window on focus loss
See merge request veloren/veloren!2150
2021-04-19 20:39:49 +00:00
Marcel
c5caec4921
Merge branch 'capucho/map-kb-zoom' into 'master'
...
Add keybindings for map/minimap zoom
See merge request veloren/veloren!2161
2021-04-19 19:52:27 +00:00
João Capucho
164411cb43
Voxygen: Added translations for map zoom
2021-04-19 20:27:02 +01:00
Marcel
3c3aa3d325
Merge branch 'juliancoffee/update-uk_UA' into 'master'
...
Update localization for uk_UA
See merge request veloren/veloren!2155
2021-04-19 19:26:20 +00:00
Illia Denysenko
ef8926bc5c
Update localization for uk_UA
2021-04-19 19:26:20 +00:00
João Capucho
f23b515dd8
Voxygen: Add master volume sliders to the settings
2021-04-19 19:58:14 +01:00
Joshua Barretto
f0f3da529b
Fixed water shader, sky shader
2021-04-19 14:42:49 +01:00
Sam
ce7581037c
Overhauled dash melee.
2021-04-18 18:36:12 -04:00
Samuel Keiffer
60d38cc03b
Merge branch 'aweinstock/dodgesplosion' into 'master'
...
Unlock dodge roll iframes and staff explosion by default.
See merge request veloren/veloren!2146
2021-04-18 20:46:15 +00:00
Avi Weinstock
0404250300
Unlock dodge roll iframes and staff explosion by default.
2021-04-18 16:16:06 -04:00
Marcel
62fcdcd998
Merge branch 'nwildner/update_pt_BR_20210417' into 'master'
...
update pt_br 20210417
See merge request veloren/veloren!2143
2021-04-18 19:33:39 +00:00
Nícolas Wildner
24b55d0f07
update pt_br 20210417
2021-04-18 19:33:39 +00:00
Ben Wallis
a4cdb89987
Implemented inventory sorting
2021-04-17 22:04:08 +01:00
Marcel
2a0c8e575f
Merge branch 'kinggred-master-patch-80352' into 'master'
...
Update main.ron
See merge request veloren/veloren!2123
2021-04-17 18:28:31 +00:00
Samuel Keiffer
a1d9ba15d9
Merge branch 'DaforLynx/normalize' into 'master'
...
Normalize + shrink all sfx; tweaks to combat music; change footstep sounds
See merge request veloren/veloren!2120
2021-04-16 00:35:15 +00:00
DaforLynx
f441c8c206
Normalize + shrink all sfx; tweaks to combat music; change footstep sounds
2021-04-16 00:35:13 +00:00
Samuel Keiffer
c962c5f12e
Merge branch 'gGmMsS/Burning' into 'master'
...
Added burning debuff for Staff M2
See merge request veloren/veloren!2134
2021-04-15 23:51:33 +00:00
gGmMsS123
e33961e1fa
M2 Staff Final Touch
2021-04-16 00:34:24 +03:00
gGmMsS123
0d956610ec
Added burning debuff for Staff M2
2021-04-15 23:34:28 +03:00
Avi Weinstock
2fb7575d60
Address MR 2126 comments.
2021-04-15 15:17:39 -04:00
Avi Weinstock
50d0314a75
Add a toggle to negotiate the use of server-authoritative physics.
2021-04-15 08:50:17 -04:00
Stanisław Grupiński
fd7bf41678
Update main.ron
2021-04-14 12:40:02 +00:00
jshipsey
ea9b871374
loot tables, clippy, animation tweaks
2021-04-13 20:18:59 -04:00
jshipsey
9a26024acb
alpha attacks
2021-04-13 20:18:59 -04:00
jshipsey
b53e1653f6
initial wield testing
2021-04-13 20:18:58 -04:00
Yuri Socher Bichibichi
c6dea3acca
Updates the Brazilian Portuguese (pt-BR) translation
2021-04-13 11:56:58 -03:00
Samuel Keiffer
e1020945dd
Merge branch 'aweinstock/combat-music' into 'master'
...
Add combat music transitions based on number of enemies in player radius.
See merge request veloren/veloren!2077
2021-04-12 06:01:19 +00:00
Marcel
e4a67a9ba2
Merge branch 'juliancoffee/update-uk_UA' into 'master'
...
Update localization for Ukrainian
See merge request veloren/veloren!2107
2021-04-12 02:28:56 +00:00
Illia Denysenko
4ac8015ed9
Update localization for Ukrainian
2021-04-12 02:28:55 +00:00
Avi Weinstock
df4f44d946
Address MR 2077 review comments.
2021-04-11 22:08:42 -04:00
Avi Weinstock
7c34a96934
Make fade timings configurable, and stop combat music on death.
2021-04-11 22:08:41 -04:00
Avi Weinstock
f1b022cdee
Add new version of combat soundtrack, and change details of how transitions between tracks work.
2021-04-11 22:08:41 -04:00
Avi Weinstock
5bfdd5f1af
Add combat music transitions based on number of enemies in player radius.
2021-04-11 22:08:40 -04:00
Marcel
54024ce401
Merge branch 'DaforLynx/more-music' into 'master'
...
Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds
See merge request veloren/veloren!2102
2021-04-12 00:43:08 +00:00
DaforLynx
9db290d4ea
Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds
2021-04-12 00:43:08 +00:00
Marcel
5e7adc6767
Merge branch 'trade-help-tooltips' into 'master'
...
Show ctrl-click and shift-click usage in item tooltips during trades.
See merge request veloren/veloren!2101
2021-04-11 22:56:03 +00:00
Rickey Chamblee
8a25ebb59a
Show ctrl-click and shift-click usage in item tooltips during trades.
2021-04-11 22:56:02 +00:00
Marcel
d7a9ab7e23
Merge branch 'master' into 'master'
...
Update and fix zh_CN
See merge request veloren/veloren!2103
2021-04-11 22:56:00 +00:00
law4x
4403cd71a5
Update and fix zh_CN
2021-04-11 22:55:59 +00:00
Marcel
eca27a30b5
Merge branch 'danielduel/PL-local' into 'master'
...
Add/Extend PL locale
See merge request veloren/veloren!2091
2021-04-11 22:55:58 +00:00
BuildTools
c4294d968d
Add/modify Polish translations
2021-04-11 19:10:09 +02:00
Vincent Foulon
a2e92c6715
add new loader + move some images
2021-04-11 16:35:25 +02:00
Snowram
52a53963ec
Lossless compression of UI assets
2021-04-11 16:35:25 +02:00
Vincent Foulon
95f69fea36
remove unused images
2021-04-11 16:35:23 +02:00
