Joshua Barretto
81f2c430f2
Fixed water shader, sky shader
2021-04-19 14:42:49 +01:00
Sam
b0d9a3b4ba
Overhauled dash melee.
2021-04-18 18:36:12 -04:00
Joshua Barretto
2c8f900299
Merge branch 'zesterer/econ-tweaks' into 'master'
...
Rebalanced economy somewhat
See merge request veloren/veloren!2148
2021-04-18 21:20:49 +00:00
Samuel Keiffer
9d145fccb5
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
b16d97b39c
Unlock dodge roll iframes and staff explosion by default.
2021-04-18 16:16:06 -04:00
Marcel
9b117dad62
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
d64b4b448b
update pt_br 20210417
2021-04-18 19:33:39 +00:00
Joshua Barretto
40ca69148c
Allow trading items not sold by merchants
2021-04-18 20:07:00 +01:00
Joshua Barretto
f5f57f89a8
Trading stock limits
2021-04-18 18:58:26 +01:00
Joshua Barretto
b342bb036d
Better price rationalisation
2021-04-18 18:11:00 +01:00
Joshua Barretto
cee7a79ae7
Removed legendaries from trading
2021-04-18 17:29:22 +01:00
Joshua Barretto
4732c77519
Use labour value for prices
2021-04-18 17:05:14 +01:00
Joshua Barretto
0a880843c3
Normalised prices within sites
2021-04-18 15:09:21 +01:00
Joshua Barretto
0939e602a4
Rebalanced economy somewhat
2021-04-18 14:08:48 +01:00
Ben Wallis
07e6f8fbd9
Implemented inventory sorting
2021-04-17 22:04:08 +01:00
Marcel
f4d5a196b4
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
8a83b00e78
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
4d74fe9d7c
Normalize + shrink all sfx; tweaks to combat music; change footstep sounds
2021-04-16 00:35:13 +00:00
Samuel Keiffer
a62598c62c
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
Imbris
0a44ec852a
Merge branch 'aweinstock/server-authoritative-physics' into 'master'
...
Aweinstock/server authoritative physics
See merge request veloren/veloren!2126
2021-04-15 22:24:00 +00:00
gGmMsS123
90a47a20ea
M2 Staff Final Touch
2021-04-16 00:34:24 +03:00
gGmMsS123
db8d189ebd
Added burning debuff for Staff M2
2021-04-15 23:34:28 +03:00
Avi Weinstock
26fbe51786
Address MR 2126 comments.
2021-04-15 15:17:39 -04:00
jshipsey
16869933b7
attacking movement tweaks
2021-04-15 12:13:50 -04:00
jshipsey
599981fca4
combat tweaks
2021-04-15 11:43:52 -04:00
Avi Weinstock
1064e3777b
Add a toggle to negotiate the use of server-authoritative physics.
2021-04-15 08:50:17 -04:00
Sam
b76181aaa0
Fixes animation parameters so a 2h weapon in the offhand slot doesn't look wonky.
2021-04-14 17:38:37 -04:00
Stanisław Grupiński
ee445137c3
Update main.ron
2021-04-14 12:40:02 +00:00
jshipsey
3640656a02
changelog
2021-04-13 20:19:35 -04:00
jshipsey
ce168a17f7
loot tables, clippy, animation tweaks
2021-04-13 20:18:59 -04:00
jshipsey
31598107d4
spins, combos
2021-04-13 20:18:59 -04:00
jshipsey
0419ca882e
more setups. chargeswing/dash anims
2021-04-13 20:18:59 -04:00
jshipsey
1b7af50388
alpha attacks
2021-04-13 20:18:59 -04:00
jshipsey
f94169ed22
initial wield testing
2021-04-13 20:18:58 -04:00
Marcel
149fc5ac76
Merge branch 'socherbyc/assets' into 'master'
...
Updates the Brazilian Portuguese (pt-BR) translation
See merge request veloren/veloren!2118
2021-04-13 17:24:45 +00:00
Yuri Socher Bichibichi
03aa34590f
Updates the Brazilian Portuguese (pt-BR) translation
2021-04-13 11:56:58 -03:00
Vincent Foulon
bdbbc23b9c
Support quantity + use Enum for autocompletion + Address comments
2021-04-12 20:07:34 +02:00
Vincent Foulon
65ef568d70
New Command: "kit" + Removed Command: "debug"
...
Update CHANGELOG.md
Update CHANGELOG.md
2021-04-12 18:53:36 +02:00
Samuel Keiffer
22ef002238
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
2e8bbeaf4a
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
015c4a7c91
Update localization for Ukrainian
2021-04-12 02:28:55 +00:00
Avi Weinstock
545eda6eea
Address MR 2077 review comments.
2021-04-11 22:08:42 -04:00
Avi Weinstock
abdc7bb112
Make fade timings configurable, and stop combat music on death.
2021-04-11 22:08:41 -04:00
Avi Weinstock
8a11a723fd
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
6a3883b8f1
Add combat music transitions based on number of enemies in player radius.
2021-04-11 22:08:40 -04:00
Marcel
39d4d84f15
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
e1ca34d9e8
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
dc2428b38e
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
95c44a6794
Show ctrl-click and shift-click usage in item tooltips during trades.
2021-04-11 22:56:02 +00:00
Marcel
439505c405
Merge branch 'master' into 'master'
...
Update and fix zh_CN
See merge request veloren/veloren!2103
2021-04-11 22:56:00 +00:00
