Joshua Barretto
c8a5e3ac51
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
94e40abab2
Limit trading currency to sane amounts
2021-04-19 10:04:28 +01:00
Samuel Keiffer
12cc4cb29f
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
9de4ab4b5e
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
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
Marcel
a4e836bf9b
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
334581b098
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
a5459e7da1
fix issue #1077 : show kill msg only to group members and nearby players if...
2021-04-18 20:46:16 +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
João Capucho
61edb30808
Voxygen: Stop ambient sounds on logout
2021-04-18 21:35:43 +01:00
Avi Weinstock
b16d97b39c
Unlock dodge roll iframes and staff explosion by default.
2021-04-18 16:16:06 -04:00
Samuel Keiffer
610896d695
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
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
Marcel Märtens
bbaf8280fa
fix upload of benchmarks
2021-04-18 20:01:26 +02: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
Samuel Keiffer
a0ed6cf978
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
e2bb44a70b
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
2a860d1baf
Moved coverage and benchmarks to only run post-merge.
2021-04-17 18:50:31 -04:00
Ben Wallis
6cbfd7af76
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
6a1ef4d47a
Gated safe zone behind a server setting, removed unneeded function.
2021-04-17 17:54:11 -04:00
Sam
5cf40812d9
Safezone is now permanently in existence at spawn.
2021-04-17 17:33:54 -04:00
Ben Wallis
9525c4d64e
Changed plugin load errors to debug and reworded plugin init/load error messages
2021-04-17 22:04:14 +01:00
Ben Wallis
07e6f8fbd9
Implemented inventory sorting
2021-04-17 22:04:08 +01:00
Joshua Yanovski
473319b5e7
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
dc3b11d28a
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
ce2545ffd3
build(nix): make voxygen debug package and app defaults
2021-04-17 21:37:59 +03:00
Yusuf Bera Ertan
84a7f666c2
build(nix): switch to nix-cargo-integration
2021-04-17 21:37:57 +03:00
Yusuf Bera Ertan
33c00839e9
build: use git keyboard-keynames to fix nix build error
2021-04-17 21:37:22 +03: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
Marcel
46601da581
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
29146fddbc
Added /server_physics admin command.
2021-04-17 13:44:22 -04:00
Imbris
8b41409227
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
203fcb551f
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
b1a60eede7
Make physics anticheat less aggressive.
2021-04-16 18:07:54 -04: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
191d60266a
m2 staff
2021-04-16 00:48:20 +03:00
Imbris
b72867da60
Merge branch 'xvar/fixed-overitem-primcount' into 'master'
...
Fixed bug causing UI elements to move around when they shouldn't
See merge request veloren/veloren!2133
2021-04-15 21:38:57 +00:00
gGmMsS123
90a47a20ea
M2 Staff Final Touch
2021-04-16 00:34:24 +03:00
Ben Wallis
f0ab4bbb28
Fixed miscount in Overitem::prim_count causing the tutorial button to fly around when multiple overitem texts are drawn
2021-04-15 21:45:09 +01:00
