52d86cca4a
Merge branch 'holychowders/fix_issue_#1061_combat_rating_affected_by_buffs' into 'master'
...
Fix issue #1061 - Combat Rating is Affected by Buffs
Closes #1061
See merge request veloren/veloren!2084
2021-04-08 02:51:21 +00:00
2854a05099
Update the changelog
2021-04-07 17:38:09 -07:00
261802a0d1
Fix issue #1061 - Combat Rating is Affected by Buffs
...
Replaced `stats` with `None` into the calculation for damage reduction
2021-04-07 17:09:51 -07:00
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
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
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
39bf6826f2
Move Behavior to Agent's Component
2021-04-07 22:11:29 +02:00
8cb001e91b
Finally Behavior isn't good enough as a component, Remove it from ECS and include it onto Agent directly
2021-04-07 22:02:57 +02:00
e0da6aa572
Address comments
...
- make Behavior's capabilities and state private
- Typo in a comment
- add basic tests
Apply 1 suggestion(s) to 1 file(s)
Remove comments in agent.rs
2021-04-07 22:02:42 +02:00
d3045ddff9
address mutability comment
2021-04-07 17:39:12 +02:00
c33e73bbed
use bitflags instead of HashSet
2021-04-07 17:37:21 +02:00
738f074f89
fix tag removing
2021-04-07 17:26:54 +02:00
4d10230f54
Use HashSet instead of Vec
2021-04-07 17:26:48 +02:00
72d0067e5c
Use Behavior::CanTrade instead of Agent::trade_for_site + addressed comments
2021-04-07 17:26:42 +02:00
6c65e213c4
cleanup old code
2021-04-07 17:26:27 +02:00
1aebb5a0e7
Change check for trading NPC
2021-04-07 17:26:19 +02:00
822db0895c
Use Behavior into Agent
2021-04-07 17:26:12 +02:00
ccf89c4275
Create Behavior component
2021-04-07 17:21:53 +02:00
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
024e366126
Add missing translations + Add "enemy_killed" text for villagers
2021-04-07 13:26:15 +02:00
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
a13c0bf773
Make randoms use green lantern.
2021-04-06 21:16:56 +02:00
3041392469
Remove dead code.
2021-04-06 21:15:49 +02:00
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
7bb62615df
Add topographic option to map
2021-04-06 09:16:17 -07:00
9c7bfb72ea
Map icon scaling
2021-04-06 08:42:09 -07:00
44715100c1
Add layers to minimap
2021-04-06 08:42:08 -07:00
3578116eee
Added map layers
2021-04-06 08:42:07 -07:00
5d3acb0c2e
Topographic map
2021-04-06 08:42:06 -07:00
d2e2f30f47
Fix loadout_builder panic.
2021-04-06 10:34:13 -04:00
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
44f96000ba
Rename Norsk to Norsk bokmål
2021-04-06 11:37:51 +00:00
51e62a8655
Merge branch 'tonyvu0605/VietTranslation' into 'master'
...
Started Vietnamese Translation
See merge request veloren/veloren!2059
2021-04-06 10:48:03 +00:00
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
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
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
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
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
28fc121458
Added auto camera setting
2021-04-05 23:24:31 +01:00
31e9577182
Flattened roll progression.
2021-04-05 17:50:53 -04:00
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
8c0c0b9d4e
Nerfs
2021-04-05 17:38:52 -04:00
865c6002d2
Change to auto walk/glide.
2021-04-05 16:07:17 -05:00
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
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
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
edb68601a3
Address MR 2062 comments: avoid an expect-equivalent pattern.
2021-04-05 11:29:10 -04:00
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
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
c81e650af9
fixed auth server URL
2021-04-05 14:15:57 +00:00
