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,549 Commits 151 Branches 18 Tags 2.1 GiB
90aa671e42
Commit Graph

2431 Commits

Author SHA1 Message Date
Marcel Märtens
1a9425526b remove spamming of the logs 2021-04-08 23:55:13 +02:00
Imbris
0eecc61ddf Merge branch 'vfoulon80/behavior-component' into 'master' 
New Component: Behavior

See merge request veloren/veloren!2033
 2021-04-08 19:16:28 +00:00
Vincent Foulon
d80db38bc9 Remove TRADE capability, use trade_site attribute instead 2021-04-08 19:06:57 +02:00
Vincent Foulon
bc1797a240 Address comments 2021-04-08 18:33:00 +02:00
holychowders
a4b00a3b97 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
Vincent Foulon
a30cbaf735 Move Behavior to Agent's Component 2021-04-07 22:11:29 +02:00
Vincent Foulon
dbee13f9be 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
Vincent Foulon
45fb9f3211 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
Vincent Foulon
a0157ac5f5 use bitflags instead of HashSet 2021-04-07 17:37:21 +02:00
Vincent Foulon
114715908a fix tag removing 2021-04-07 17:26:54 +02:00
Vincent Foulon
b1718cf578 Use HashSet instead of Vec 2021-04-07 17:26:48 +02:00
Vincent Foulon
211ab02897 Use Behavior::CanTrade instead of Agent::trade_for_site + addressed comments 2021-04-07 17:26:42 +02:00
Vincent Foulon
18694b30ad Use Behavior into Agent 2021-04-07 17:26:12 +02:00
Vincent Foulon
41314e9098 Create Behavior component 2021-04-07 17:21:53 +02:00
Marcel
45b4349bc7 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
James Melkonian
16871208f2 Add topographic option to map 2021-04-06 09:16:17 -07:00
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
Avi Weinstock
2c4612bff1 Fix loadout_builder panic. 2021-04-06 10:34:13 -04: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
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
Sam
ba0b6c309b Flattened roll progression. 2021-04-05 17:50:53 -04:00
Sam
a7e39bc8c9 Nerfs 2021-04-05 17:38:52 -04:00
Avi Weinstock
56137aff92 Address MR 2062 comments: avoid an expect-equivalent pattern. 2021-04-05 11:29:10 -04:00
Louis Pearson
91a647e35f Return none from depot get if stale id used 2021-04-05 06:16:23 -06: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
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
Monty Marz
06bbb7f0ff Crafting Tabs and more item tags 2021-04-04 13:02:27 +00:00
DaforLynx
6734198104 Adds on-hit combat sfx 2021-04-04 03:04:02 +00: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
Sam
18eed650f4 Changed touch_entities from a vec to a hashset. 2021-04-03 15:13:04 -04: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
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
Justin Shipsey
d99627e1dd Merge branch 'refactor-cell' into 'master' 
refactor Cell back to 4 byte size #993

Closes #993

See merge request veloren/veloren!1997
 2021-04-03 07:56:06 +00:00
Snowram
9a3f6d8261 Substitutes DPS for CR in item tooltip 2021-04-03 00:10:31 -04:00
Sam
be5d47a512 Factored out weapons into their own rating. 2021-04-03 00:08:40 -04:00
Sam
27f178286d Removed all rng matches in code to determine loot tables, and moved to loot tables specific for each sprite, creature, or dungeon. 2021-04-02 23:24:55 -04:00
Sam
9ad5b0f6b7 Changelog. Fixed a few qualities. 2021-04-02 23:04:36 -04:00
Sam
7c8242b5b1 Added unit test to validate contents of loot tables. 2021-04-02 23:04:35 -04:00
Sam
c8b8cd436e Made item prices sane. 2021-04-02 23:04:34 -04:00
Sam
7eb1eefa13 Re-created item_price_calculation with new loot tables. 2021-04-02 23:04:34 -04:00
Sam
a2906168a6 Moved materials into their own loot tables. 2021-04-02 23:04:33 -04:00
Sam
cb638180f8 Moved food items into their own loot tables. 2021-04-02 23:04:32 -04:00
Sam
31e69021cb Switched loot tables from declaring each weapon individually to just referencing a different loot table. 2021-04-02 23:04:31 -04:00