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 |
|
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
|
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 |
|
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 |
|
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 |
|
Sam
|
67916b44a7
|
Staff weapon tiering shuffle.
|
2021-04-02 23:04:30 -04:00 |
|
Sam
|
a2fc2abf83
|
Made staff and sceptre balancing sane. Created loot tables for staffs and sceptres.
|
2021-04-02 23:04:30 -04:00 |
|
Sam
|
2e37cefce5
|
Created weapon loot tables.
|
2021-04-02 23:04:29 -04:00 |
|
Sam
|
833f1f3309
|
Converted all armor in loot tables to reference armor set loot tables.
|
2021-04-02 23:04:28 -04:00 |
|
Sam
|
96b354c178
|
Consolidated loot tables by switching to CreatureMaterial where possible
|
2021-04-02 23:04:27 -04:00 |
|
Sam
|
ab2fca21cf
|
Fixed trading
|
2021-04-02 23:04:26 -04:00 |
|
Sam
|
bdbe6134f2
|
Fixed csv tools
|
2021-04-02 23:04:26 -04:00 |
|
Sam
|
cbca2a66b6
|
Support for creature specific materails and materials having a quantity.
|
2021-04-02 23:04:25 -04:00 |
|
Sam
|
247004d180
|
Loot tables can now recursively specify loot tables. Mercahnts broken.
|
2021-04-02 23:04:25 -04:00 |
|
Snowram
|
8365db8041
|
Merge branch 'aweinstock/trade-buysell-colors' into 'master'
Add colors for buy/sell tooltips based on site prices.
See merge request veloren/veloren!2050
|
2021-04-03 00:57:36 +00:00 |
|
Avi Weinstock
|
b7dbadc32f
|
Add colors for buy/sell tooltips based on site prices.
|
2021-04-02 17:44:02 -04:00 |
|
Christof Petig
|
3a9e070ec0
|
create economy tree graph
|
2021-04-02 22:27:39 +02:00 |
|
Jun NOGATA
|
129a3de2eb
|
Add Japanese message translation
|
2021-04-03 01:50:10 +09:00 |
|
Vincent Foulon
|
62b2ad80fb
|
Refine Sewing Set
|
2021-04-02 18:19:39 +02:00 |
|
Songtronix
|
d39d11d2fa
|
Merge branch 'revert-5918fbed' into 'master'
Revert "Merge branch 'animtweaks' into 'master'"
See merge request veloren/veloren!2044
|
2021-04-01 20:33:24 +00:00 |
|
Vincent Foulon
|
49be1fd70c
|
Refine some item icons
|
2021-04-01 21:46:57 +02:00 |
|
Marcel
|
42463d1fe0
|
Revert "Merge branch 'animtweaks' into 'master'"
This reverts merge request !2039
|
2021-04-01 18:45:03 +00:00 |
|