Joshua Barretto
352fce239e
Allow trading items not sold by merchants
2021-04-18 20:07:00 +01: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
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
gGmMsS123
d5a887f195
m2 staff
2021-04-16 00:48:20 +03:00
Imbris
4419c24eab
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
e33961e1fa
M2 Staff Final Touch
2021-04-16 00:34:24 +03:00
Ben Wallis
1144eefa46
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
gGmMsS123
0d956610ec
Added burning debuff for Staff M2
2021-04-15 23:34:28 +03:00
Ben Wallis
5445094174
Merge branch 'xvar/fix-cargo-test-server' into 'master'
...
Fixed cargo test-server. Removed -Z package-features from .cargo/config as it is no longer required
See merge request veloren/veloren!2132
2021-04-15 19:31:30 +00:00
Avi Weinstock
2fb7575d60
Address MR 2126 comments.
2021-04-15 15:17:39 -04:00
Ben Wallis
95d7a3d761
Fixed cargo test-server. Removed -Z package-features from .cargo/config as it is no longer required
2021-04-15 19:07:46 +01:00
Justin Shipsey
803e67b1fb
Merge branch 'slipped/changes' into 'master'
...
combat tweaks
See merge request veloren/veloren!2131
2021-04-15 17:36:19 +00:00
jshipsey
8f20d17c9a
attacking movement tweaks
2021-04-15 12:13:50 -04:00
jshipsey
896d2a5b63
combat tweaks
2021-04-15 11:43:52 -04:00
Avi Weinstock
bf6ac56eb0
Add teleport/speedhack mitigation.
2021-04-15 08:50:17 -04:00
Avi Weinstock
50d0314a75
Add a toggle to negotiate the use of server-authoritative physics.
2021-04-15 08:50:17 -04:00
Avi Weinstock
d6f4537d39
Minimal implementation of server-authoritative physics.
2021-04-15 08:26:15 -04:00
Marcel
a386a27411
Merge branch 'hqurve/settings-cleanup' into 'master'
...
Settings changes from the ui are now wrapped into a single enum and handling was moved to session/settings_change.rs, also settings.rs was split up
See merge request veloren/veloren!2130
2021-04-15 09:06:10 +00:00
Samuel Keiffer
9c59033976
Merge branch 'yusdacra/chore/nix' into 'master'
...
Nix chores
See merge request veloren/veloren!2127
2021-04-15 01:25:02 +00:00
Justin Shipsey
f7f2eb4b9b
Merge branch 'sam/2h-offhand-anim-fixes' into 'master'
...
2 Hand Offhand Animation Fixes
See merge request veloren/veloren!2129
2021-04-15 01:21:52 +00:00
Ben Wallis
b6cd1f836e
Merge branch 'xvar/rework-char-deletes' into 'master'
...
Character deletes are now processed by CharacterUpdater and clear any pending...
See merge request veloren/veloren!2128
2021-04-15 00:39:17 +00:00
hqurve
6ac2b87006
Debug change visibility from settings_window works again
2021-04-14 19:24:28 -04:00
hqurve
9018ead8d0
Seem to have missed minimap again
2021-04-14 19:10:18 -04:00
hqurve
399795dbf1
simplified settings changing within hud and settings_window
2021-04-14 19:10:18 -04:00
