Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,864 Commits 151 Branches 18 Tags 2.1 GiB
6714fbc419
Commit Graph

7864 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Barretto
a19212daf7 Fix block-snapping at low framerates 2021-04-20 14:59:59 +01:00
Joshua Barretto
9ff7db9b1c Account for FP imprecision in block-hopping 2021-04-20 14:54:21 +01:00
Joshua Barretto
36e95e0c03 Cleaned up client-side recipe handling 2021-04-20 12:33:22 +01:00
Monty
a1b4e0bdaf remove old craftsman hammer, add migration 2021-04-20 03:34:11 +02:00
Monty Marz
abacdfc719 clippy 2021-04-20 02:48:17 +02:00
Monty
86445af09c change cauldron spawning 
cooking pot height
fmt
fmt, changelog
 2021-04-20 02:48:13 +02:00
Joshua Barretto
11ba02130c Made sprite/block selection effect more subtle 2021-04-20 02:46:07 +02:00
Joshua Barretto
483276b082 Made sprite/block selection effect more subtle 2021-04-20 02:46:06 +02:00
Monty
a4d56e7843 more sprite stuff and crafting UI update 
fix item images
fix CR display
 2021-04-20 02:46:06 +02:00
Joshua Barretto
1a0f6f03ef Prevent crafting without station 2021-04-20 02:46:05 +02:00
Monty
a1fe7c12c3 fmt, add sprites 2021-04-20 02:46:04 +02:00
Joshua Barretto
5598d07944 Added crafting stations 2021-04-20 02:45:59 +02:00
Marcel
96b739a841 Merge branch 'common-state' into 'master' 
Common state

See merge request veloren/veloren!2076
 2021-04-20 00:15:48 +00:00
Marcel Märtens
7348e399e0 only have 1 Fn passed to tick fn 2021-04-20 01:49:45 +02:00
Marcel Märtens
485a477503 include origin into system name 2021-04-20 01:30:27 +02:00
Marcel Märtens
425063e24e remove authc from common::net 2021-04-20 01:30:23 +02:00
Marcel Märtens
5862920f32 seperate sys/state 2021-04-20 01:30:17 +02:00
Joshua Barretto
c5455fa1a1 Merge branch 'zesterer/small-fixes' into 'master' 
Small fixes

See merge request veloren/veloren!2163
 2021-04-19 21:54:26 +00:00
Joshua Barretto
4ad5257e40 Rebalanced mist 2021-04-19 22:26:56 +01:00
Joshua Barretto
86287e8f0a Fixed negative cloud density bug 2021-04-19 22:02:47 +01:00
Joshua Barretto
ed20a66b20 Fixed block-snapping 2021-04-19 21:46:51 +01:00
Imbris
8c9d4dc3dd Merge branch 'capucho/inactive-master' into 'master' 
Lower volume of window on focus loss

See merge request veloren/veloren!2150
 2021-04-19 20:39:49 +00:00
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