Joshua Barretto
b700d9a641
Merge branch 'zesterer/econ-tweaks' into 'master'
...
Limit trading currency to sane amounts
See merge request veloren/veloren!2154
2021-04-19 10:46:17 +00:00
Joshua Barretto
cd0a65da81
Added minimum chunk unload distance to make chunk reload cheesing harder
2021-04-19 11:29:20 +01:00
João Capucho
fd302b6975
Voxygen: Add inactive window volume
2021-04-19 10:24:31 +01:00
João Capucho
1d605c2dc8
Voxygen: Update ambient channels volume
2021-04-19 10:24:28 +01:00
João Capucho
05279872ce
Voxygen: Use the master volume setting
2021-04-19 10:20:42 +01:00
Joshua Barretto
324148d9a3
Limit trading currency to sane amounts
2021-04-19 10:04:28 +01:00
Samuel Keiffer
0b80e8ac5d
Merge branch 'capucho/stop-ambient' into 'master'
...
Stop ambient sounds on logout
See merge request veloren/veloren!2151
2021-04-18 23:38:10 +00:00
Samuel Keiffer
8295743a54
Merge branch 'sam/dash-tweaks' into 'master'
...
Overhauled dash melee.
See merge request veloren/veloren!2152
2021-04-18 23:12:20 +00:00
Sam
ce7581037c
Overhauled dash melee.
2021-04-18 18:36:12 -04:00
Joshua Barretto
cb817c0313
Merge branch 'zesterer/econ-tweaks' into 'master'
...
Rebalanced economy somewhat
See merge request veloren/veloren!2148
2021-04-18 21:20:49 +00:00
Marcel
fab9d1c899
Merge branch 'xMAC94x/fix_benchmarks' into 'master'
...
fix upload of benchmarks
See merge request veloren/veloren!2149
2021-04-18 20:55:05 +00:00
Marcel
ba55a46db1
Merge branch 'UMR1352/fix#1077' into 'master'
...
fix issue #1077 : show kill msg only to group members and nearby players if...
Closes #1077
See merge request veloren/veloren!2135
2021-04-18 20:46:17 +00:00
Enrico Marconi
a941833ff1
fix issue #1077 : show kill msg only to group members and nearby players if...
2021-04-18 20:46:16 +00: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
João Capucho
26c2738dc2
Voxygen: Stop ambient sounds on logout
2021-04-18 21:35:43 +01:00
Avi Weinstock
0404250300
Unlock dodge roll iframes and staff explosion by default.
2021-04-18 16:16:06 -04:00
Samuel Keiffer
c819f259ab
Merge branch 'sam/move-ci-stages' into 'master'
...
Moved coverage and benchmarks to only run post-merge.
See merge request veloren/veloren!2145
2021-04-18 19:50:05 +00: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
Joshua Barretto
352fce239e
Allow trading items not sold by merchants
2021-04-18 20:07:00 +01:00
Marcel Märtens
6f46d20aee
fix upload of benchmarks
2021-04-18 20:01:26 +02:00
Joshua Barretto
cac9ac6807
Trading stock limits
2021-04-18 18:58:26 +01:00
Joshua Barretto
250733a123
Better price rationalisation
2021-04-18 18:11:00 +01:00
Joshua Barretto
c0b71d0731
Removed legendaries from trading
2021-04-18 17:29:22 +01:00
Joshua Barretto
11683084ad
Use labour value for prices
2021-04-18 17:05:14 +01:00
Joshua Barretto
fcc23a4427
Normalised prices within sites
2021-04-18 15:09:21 +01:00
Joshua Barretto
b72e454148
Rebalanced economy somewhat
2021-04-18 14:08:48 +01:00
Samuel Keiffer
1892ec571d
Merge branch 'sam/permanent-spawn-safezone' into 'master'
...
Safezone is now permanently in existence at spawn.
See merge request veloren/veloren!2144
2021-04-17 23:44:10 +00:00
Samuel Keiffer
bf6c22462f
Merge branch 'xvar/inventory-sorting' into 'master'
...
Implemented inventory sorting
See merge request veloren/veloren!2141
2021-04-17 22:57:56 +00:00
Sam
48158a98c5
Moved coverage and benchmarks to only run post-merge.
2021-04-17 18:50:31 -04:00
Ben Wallis
cadf315096
Merge branch 'yusdacra/feat/nix-cargo-integration' into 'master'
...
build(nix): fix nix builds and switch to new integration platform
See merge request veloren/veloren!2136
2021-04-17 22:11:11 +00:00
Sam
c8d4c4ff84
Gated safe zone behind a server setting, removed unneeded function.
2021-04-17 17:54:11 -04:00
Sam
416fe5c2af
Safezone is now permanently in existence at spawn.
2021-04-17 17:33:54 -04:00
Ben Wallis
0e83de205b
Changed plugin load errors to debug and reworded plugin init/load error messages
2021-04-17 22:04:14 +01:00
Ben Wallis
a4cdb89987
Implemented inventory sorting
2021-04-17 22:04:08 +01:00
Joshua Yanovski
e7e7565440
Merge branch 'aweinstock/serverphysics-command' into 'master'
...
Added `/server_physics` admin command.
See merge request veloren/veloren!2142
2021-04-17 20:40:03 +00:00
Yusuf Bera Ertan
abad01ee87
build(nix): add git-lfs setup instructions for nix into git-lfs check abort message
2021-04-17 21:37:59 +03:00
Yusuf Bera Ertan
09a6d708b5
build(nix): make voxygen debug package and app defaults
2021-04-17 21:37:59 +03:00
Yusuf Bera Ertan
62844d816a
build(nix): switch to nix-cargo-integration
2021-04-17 21:37:57 +03:00
Yusuf Bera Ertan
198545f219
build: use git keyboard-keynames to fix nix build error
2021-04-17 21:37:22 +03: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
Marcel
006f1f1ea0
Merge branch 'imbris/test' into 'master'
...
Use separate crate to compile anim as a cdylib to avoid compiling both all the time and improve voxygen pipelining
See merge request veloren/veloren!2140
2021-04-17 17:48:21 +00:00
Avi Weinstock
af47c0dc21
Added /server_physics admin command.
2021-04-17 13:44:22 -04:00
Imbris
30e34aad44
Use separate crate to compile anim as a cdylib to avoid compiling both all the time and improve voxygen pipelining
2021-04-16 21:58:59 -04:00
Imbris
c83c1a5571
Merge branch 'aweinstock/serverphysics-fix-20210416' into 'master'
...
Make physics anticheat less aggressive.
See merge request veloren/veloren!2139
2021-04-16 22:51:40 +00:00
Avi Weinstock
513c7ff068
Make physics anticheat less aggressive.
2021-04-16 18:07:54 -04: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
Imbris
85ee4c8cd1
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
