Commit Graph

7506 Commits

Author SHA1 Message Date
James Melkonian
8ee1fc4a0f Add layers to minimap 2021-04-06 08:42:08 -07:00
James Melkonian
bacda06dba Added map layers 2021-04-06 08:42:07 -07:00
James Melkonian
70ede7f34d Topographic map 2021-04-06 08:42:06 -07:00
Marcel
187a85e056 Merge branch 'renamenorsk_norskbokmål' into 'master'
Rename Norsk to Norsk bokmål

See merge request veloren/veloren!2064
2021-04-06 11:37:54 +00:00
Kim André Moen Bjørkede
2380f9e8c2 Rename Norsk to Norsk bokmål 2021-04-06 11:37:51 +00:00
Marcel
2ed85a2dc0 Merge branch 'tonyvu0605/VietTranslation' into 'master'
Started Vietnamese Translation

See merge request veloren/veloren!2059
2021-04-06 10:48:03 +00:00
Marcel
f0cabf1add Merge branch 'aweinstock/stackable-merchants' into 'master'
Make merchants spawn with stacks of stackable items.

See merge request veloren/veloren!2062
2021-04-06 08:14:33 +00:00
Joshua Barretto
de9ad0942f Merge branch 'zesterer/follow-cam' into 'master'
Added auto camera setting

See merge request veloren/veloren!2071
2021-04-06 04:23:40 +00:00
Samuel Keiffer
3c50321a80 Merge branch 'sam/consolidate-roll' into 'master'
Flattened roll progression.

See merge request veloren/veloren!2073
2021-04-06 03:31:46 +00:00
Samuel Keiffer
f79493f7d0 Merge branch 'sam/sceptre-nerfs' into 'master'
Sam/sceptre nerfs

See merge request veloren/veloren!2072
2021-04-06 02:41:56 +00:00
Joshua Barretto
1648d6f7e9 Merge branch 'autoglide' into 'master'
Change to auto walk/glide.

See merge request veloren/veloren!2070
2021-04-06 01:53:28 +00:00
Joshua Barretto
60e2ed3e7d Added auto camera setting 2021-04-05 23:24:31 +01:00
Sam
ba0b6c309b Flattened roll progression. 2021-04-05 17:50:53 -04:00
Marcel
4dde9f84b0 Merge branch 'huntertparks/fix-cursor-not-locking' into 'master'
Fixes #520 and #840 - locks cursor to screen when menu is not open

Closes #840 and #520

See merge request veloren/veloren!2069
2021-04-05 21:40:24 +00:00
Sam
a7e39bc8c9 Nerfs 2021-04-05 17:38:52 -04:00
theCow61
b99c02401d Change to auto walk/glide. 2021-04-05 16:07:17 -05:00
Marcel
07017da19b Merge branch 'desttinghim/depot-improvements' into 'master'
Depot fix and default world AABB

See merge request veloren/veloren!2067
2021-04-05 19:11:14 +00:00
Marcel
25f18229d3 Merge branch '1b15-master-patch-98134' into 'master'
fixed auth server URL

See merge request veloren/veloren!2068
2021-04-05 16:36:10 +00:00
Monty Marz
d008f9a0ad Merge branch 'pfau/lactose-intolerance' into 'master'
More cheese is less cheese

See merge request veloren/veloren!2066
2021-04-05 15:47:12 +00:00
Avi Weinstock
56137aff92 Address MR 2062 comments: avoid an expect-equivalent pattern. 2021-04-05 11:29:10 -04:00
Hunter Parks
6af9662b03 Change cursor lock location to be center of screen
Changing the cursor coordinates to the middle of the screen had some
side effects. When a user would close a menu and re-open it back up
without moving the mouse, the cursor position would not change.
This commit takes care of that by changing how the HUD handles closing
menus via keyboard inputs.
2021-04-05 16:48:22 +02:00
Hunter Parks
7df0413be4 Fixes #520 and #840 - locks cursor to screen when menu is not open
Rather than lock the cursor to the middle of the screen, the cursor will
move to it's last known coordinates when a menu or the minimap is not
open.
2021-04-05 16:37:40 +02:00
1b15
f8009e5d1c fixed auth server URL 2021-04-05 14:15:57 +00:00
Louis Pearson
f5bc6b43c9 Add default world build AABB 2021-04-05 07:39:09 -06:00
Marcel
88079cfd30 Merge branch 'japanese' into 'master'
Add Japanese message translation

See merge request veloren/veloren!2049
2021-04-05 13:38:30 +00:00
Louis Pearson
91a647e35f Return none from depot get if stale id used 2021-04-05 06:16:23 -06:00
Monty
b8c474057c More cheese is less cheese
Update CHANGELOG.md
fmt
Update crafting.rs
2021-04-05 13:40:12 +02:00
Marcel
69891f0b70 Merge branch 'login-trim-username' into 'master'
login trim username, improve validation, social ordering #1040

Closes #1040

See merge request veloren/veloren!2042
2021-04-04 22:09:16 +00:00
Marcel
b433938e0a Merge branch 'christof/economy_graph' into 'master'
create economy tree graph

See merge request veloren/veloren!2052
2021-04-04 20:21:19 +00:00
Marcel
c222fa7fda Merge branch 'aweinstock/cheese-counter' into 'master'
Add a cheese counter in the bag display.

See merge request veloren/veloren!2061
2021-04-04 19:24:35 +00:00
Marcel
958c75642c Merge branch 'christof/stats_per_price' into 'master'
output stats per value for all categories in the trade pricing test

See merge request veloren/veloren!2057
2021-04-04 18:35:39 +00:00
Avi Weinstock
a1cfd9ea3c Make merchants spawn with stacks of stackable items. 2021-04-04 13:47:05 -04:00
Avi Weinstock
78f130a3b2 Add a cheese counter in the bag display. 2021-04-04 11:14:25 -04:00
Monty Marz
1e18904092 Merge branch 'pfau/ui-and-assets' into 'master'
Crafting Tabs and more item tags

See merge request veloren/veloren!2058
2021-04-04 13:02:27 +00:00
Monty Marz
06bbb7f0ff Crafting Tabs and more item tags 2021-04-04 13:02:27 +00:00
Justin Shipsey
689480ec01 Merge branch 'DaforLynx/combat-sfx' into 'master'
Adds on-hit combat sfx

See merge request veloren/veloren!2048
2021-04-04 03:04:03 +00:00
DaforLynx
6734198104 Adds on-hit combat sfx 2021-04-04 03:04:02 +00:00
tonyvu0605
e0dbd5566d Started Vietnamese Translation 2021-04-03 22:17:57 -04:00
Joshua Yanovski
4be0f1b02e Merge branch 'sam/hashset-touch-entities' into 'master'
Changed touch_entities from a vec to a hashset.

See merge request veloren/veloren!2056
2021-04-03 22:06:05 +00:00
Christof Petig
d3bdaaec1a output stats per value for all categories in the trade pricing test 2021-04-03 23:22:34 +02:00
Joshua Yanovski
143fe3876d Merge branch 'sam/use-lottery-result' into 'master'
Handled error in setting stack size for item quantity in lottery.

See merge request veloren/veloren!2055
2021-04-03 20:11:12 +00:00
Marcel
94e41f8b27 Merge branch 'xMAC94x/netpanic' into 'master'
make a panic a error! and improve logging

See merge request veloren/veloren!2054
2021-04-03 19:20:27 +00:00
Sam
18eed650f4 Changed touch_entities from a vec to a hashset. 2021-04-03 15:13:04 -04:00
Marcel Märtens
7ca2f3b9d6 make a panic a error! and improve logging 2021-04-03 19:58:36 +02:00
Samuel Keiffer
8d9f63404e Merge branch 'sam/combat-ratings' into 'master'
Tweaks to Combat Rating Calculation

See merge request veloren/veloren!2051
2021-04-03 17:33:34 +00:00
Sam
fd61b94b5d Handled error in setting stack size for item quantity in lottery. 2021-04-03 11:37:57 -04:00
Sam
ca1a93ba21 Actually committed bone staff fix. 2021-04-03 10:26:32 -04:00
Justin Shipsey
debf88e42f Merge branch 'vfoulon80/refine-item-icons' into 'master'
Refine some item icons

See merge request veloren/veloren!2045
2021-04-03 11:19:36 +00:00
Christof Petig
18f1cb9f43 as usual clippy is right (and helpful) 2021-04-03 10:54:42 +02:00
Samuel Keiffer
69b64e26c7 Merge branch 'sam/loot-table-features' into 'master'
Loot Table Rework

See merge request veloren/veloren!2046
2021-04-03 08:45:53 +00:00