Marcel Märtens
73adc22282
change some Ordering::Relaxed to Ordering::SeqCst when we do not want to have it moved/or taken effects from other threads.
...
some id increases are kept Relaxed, SeqCst shouldn't be necessary there.
Not sure about the bool checks in api.rs
2021-04-07 23:17:09 +02:00
Ben Wallis
82423f30bd
Merge branch 'hqurve/crafting-ui' into 'master'
...
Added search to crafting and social windows, added i18n support to crafting tabs, fixed social window offset when group open, removed tabs in social window
See merge request veloren/veloren!2081
2021-04-07 20:24:23 +00:00
hqurve
1b3536a5f5
Added search to crafting and social windows, added i18n support to crafting tabs, fixed social window offset when group open, removed tabs in social window
2021-04-07 20:24:22 +00:00
Marcel
4703a7e563
Merge branch 'vfoulon80/l18n-fr-missing' into 'master'
...
Add missing translations + Add "enemy_killed" text for villagers
See merge request veloren/veloren!2079
2021-04-07 14:42:32 +00:00
Vincent Foulon
024e366126
Add missing translations + Add "enemy_killed" text for villagers
2021-04-07 13:26:15 +02:00
Marcel
ea2db98598
Merge branch 'james/topo-map' into 'master'
...
Adds topographic map option and allows for map layers
See merge request veloren/veloren!2074
2021-04-07 09:34:13 +00:00
Joshua Barretto
fff38441eb
Merge branch 'aweinstock/small-fix-20210406' into 'master'
...
Fix loadout_builder panic.
See merge request veloren/veloren!2075
2021-04-06 16:37:19 +00:00
James Melkonian
7bb62615df
Add topographic option to map
2021-04-06 09:16:17 -07:00
James Melkonian
9c7bfb72ea
Map icon scaling
2021-04-06 08:42:09 -07:00
James Melkonian
44715100c1
Add layers to minimap
2021-04-06 08:42:08 -07:00
James Melkonian
3578116eee
Added map layers
2021-04-06 08:42:07 -07:00
James Melkonian
5d3acb0c2e
Topographic map
2021-04-06 08:42:06 -07:00
Avi Weinstock
d2e2f30f47
Fix loadout_builder panic.
2021-04-06 10:34:13 -04:00
Marcel
269124a325
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
44f96000ba
Rename Norsk to Norsk bokmål
2021-04-06 11:37:51 +00:00
Marcel
51e62a8655
Merge branch 'tonyvu0605/VietTranslation' into 'master'
...
Started Vietnamese Translation
See merge request veloren/veloren!2059
2021-04-06 10:48:03 +00:00
Marcel
af2a9c0f45
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
b419ed6905
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
d8b8fd1d97
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
8c3ea2eb13
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
2decedc575
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
28fc121458
Added auto camera setting
2021-04-05 23:24:31 +01:00
Sam
31e9577182
Flattened roll progression.
2021-04-05 17:50:53 -04:00
Marcel
b767256d65
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
8c0c0b9d4e
Nerfs
2021-04-05 17:38:52 -04:00
theCow61
865c6002d2
Change to auto walk/glide.
2021-04-05 16:07:17 -05:00
Marcel
d1a0f0469f
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
3ca26c7332
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
33db5cdd45
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
edb68601a3
Address MR 2062 comments: avoid an expect-equivalent pattern.
2021-04-05 11:29:10 -04:00
Hunter Parks
7dd7c29c53
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
d9c862a083
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
c81e650af9
fixed auth server URL
2021-04-05 14:15:57 +00:00
Louis Pearson
a2fda31449
Add default world build AABB
2021-04-05 07:39:09 -06:00
Marcel
ea0188a6cc
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
07341cc67f
Return none from depot get if stale id used
2021-04-05 06:16:23 -06:00
Monty
a8b619bbef
More cheese is less cheese
...
Update CHANGELOG.md
fmt
Update crafting.rs
2021-04-05 13:40:12 +02:00
Marcel
d7ed57ca7e
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
5043cdb20e
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
70db31eb7f
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
81994622be
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
8c6cafa675
Make merchants spawn with stacks of stackable items.
2021-04-04 13:47:05 -04:00
Avi Weinstock
2b3aa57b72
Add a cheese counter in the bag display.
2021-04-04 11:14:25 -04:00
Monty Marz
51ad963c20
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
c0b7952eb9
Crafting Tabs and more item tags
2021-04-04 13:02:27 +00:00
Justin Shipsey
5c2af6d8c8
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
5ee9108e0d
Adds on-hit combat sfx
2021-04-04 03:04:02 +00:00
tonyvu0605
290f36613b
Started Vietnamese Translation
2021-04-03 22:17:57 -04:00
Joshua Yanovski
ad768d767a
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
329db14f39
output stats per value for all categories in the trade pricing test
2021-04-03 23:22:34 +02:00
