Joshua Barretto
|
bb9725548f
|
Made twigs/stones slightly more common
|
2021-04-19 21:33:52 +01:00 |
|
Marcel
|
bd45103303
|
Merge branch 'james/fix-bow-humanoid-ai' into 'master'
Fix bow AI
See merge request veloren/veloren!2162
|
2021-04-19 19:52:29 +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 |
|
João Capucho
|
7a9876760b
|
Voxygen: Allow zoom on minimap with kbd
|
2021-04-19 20:26:54 +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 |
|
James Melkonian
|
ef38d9778f
|
Fix bow AI
|
2021-04-19 12:17:31 -07:00 |
|
João Capucho
|
f23b515dd8
|
Voxygen: Add master volume sliders to the settings
|
2021-04-19 19:58:14 +01:00 |
|
Joshua Barretto
|
faf5b40576
|
Merge branch 'zesterer/shader-fixes' into 'master'
Fixed water shader, sky shader
See merge request veloren/veloren!2156
|
2021-04-19 14:29:08 +00:00 |
|
Joshua Barretto
|
f0f3da529b
|
Fixed water shader, sky shader
|
2021-04-19 14:42:49 +01:00 |
|
Joshua Barretto
|
c49a5357c5
|
Merge branch 'zesterer/small-fixes' into 'master'
Added minimum chunk unload distance to make chunk reload cheesing harder
See merge request veloren/veloren!2157
|
2021-04-19 11:08:23 +00:00 |
|
João Capucho
|
7589331785
|
Voxygen: Add support for map zoom with keybind
|
2021-04-19 11:56:58 +01:00 |
|
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 |
|