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,527 Commits 151 Branches 18 Tags
Commit Graph

2418 Commits

Author SHA1 Message Date
holychowders
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
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
James Melkonian
7bb62615df Add topographic option to map 2021-04-06 09:16:17 -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
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
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
Sam
31e9577182 Flattened roll progression. 2021-04-05 17:50:53 -04:00
Sam
8c0c0b9d4e Nerfs 2021-04-05 17:38:52 -04:00
Avi Weinstock
edb68601a3 Address MR 2062 comments: avoid an expect-equivalent pattern. 2021-04-05 11:29:10 -04:00
Louis Pearson
07341cc67f Return none from depot get if stale id used 2021-04-05 06:16:23 -06: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
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
Monty Marz
c0b7952eb9 Crafting Tabs and more item tags 2021-04-04 13:02:27 +00:00
DaforLynx
5ee9108e0d Adds on-hit combat sfx 2021-04-04 03:04:02 +00: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
Joshua Yanovski
82a7194985 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
4750aaa79e Changed touch_entities from a vec to a hashset. 2021-04-03 15:13:04 -04:00
Samuel Keiffer
0f31bc6da0 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
c3fc8bcf83 Handled error in setting stack size for item quantity in lottery. 2021-04-03 11:37:57 -04:00
Sam
21ed2885c9 Actually committed bone staff fix. 2021-04-03 10:26:32 -04:00
Samuel Keiffer
7ea1573db8 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
e493067826 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
9cc6ff3711 Substitutes DPS for CR in item tooltip 2021-04-03 00:10:31 -04:00
Sam
76a28c6be1 Factored out weapons into their own rating. 2021-04-03 00:08:40 -04:00
Sam
33503bd9c2 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
ed5cb2b5f0 Changelog. Fixed a few qualities. 2021-04-02 23:04:36 -04:00
Sam
0306c6398d Added unit test to validate contents of loot tables. 2021-04-02 23:04:35 -04:00
Sam
9c0f75f580 Made item prices sane. 2021-04-02 23:04:34 -04:00
Sam
5d0249e350 Re-created item_price_calculation with new loot tables. 2021-04-02 23:04:34 -04:00
Sam
e83a2eef3d Moved materials into their own loot tables. 2021-04-02 23:04:33 -04:00
Sam
8d1700b882 Moved food items into their own loot tables. 2021-04-02 23:04:32 -04:00
Sam
01296ac816 Switched loot tables from declaring each weapon individually to just referencing a different loot table. 2021-04-02 23:04:31 -04:00
Sam
a773d53b3a Created weapon loot tables. 2021-04-02 23:04:29 -04:00
Sam
0a29d93164 Converted all armor in loot tables to reference armor set loot tables. 2021-04-02 23:04:28 -04:00
Sam
25034a6a0b Consolidated loot tables by switching to CreatureMaterial where possible 2021-04-02 23:04:27 -04:00
Sam
f88fd5f349 Fixed trading 2021-04-02 23:04:26 -04:00
Sam
fa7d1d85a9 Fixed csv tools 2021-04-02 23:04:26 -04:00
Sam
4cc4e3a158 Support for creature specific materails and materials having a quantity. 2021-04-02 23:04:25 -04:00
Sam
7846c6fdbf Loot tables can now recursively specify loot tables. Mercahnts broken. 2021-04-02 23:04:25 -04:00
aljazerzen
c8136a44de refactor Cell back to 4 byte size 2021-04-01 17:38:10 +02:00
aljazerzen
697d4a52d9 login trim username, improve validation, social ordering 2021-04-01 16:43:27 +02:00
aljazerzen
205e989350 after leaving group, issue warning instead of changing chat mode 2021-04-01 15:43:50 +02:00
Avi Weinstock
19ac0b2245 Allow fast stacking into and out of a trade with {ctrl,shift} click. 
Shift click goes 1 at a time, Ctrl click automatically balances the trade w.r.t. that quantity.
 2021-03-30 18:39:10 -04:00
Marcel Märtens
7afa77a06f move tracing code to own crate 2021-03-30 16:35:36 +02:00
Joshua Barretto
bb88d42295 Merge branch 'zesterer/sprite-text' into 'master' 
Added text prompts to sprites

See merge request veloren/veloren!2034
 2021-03-30 11:41:14 +00:00