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 |
|
Marcel
|
3b7e3f8e74
|
Merge branch 'vfoulon80/trading-dialogues' into 'master'
Add dialogue when the Merchant is busy and randomize some trading dialogues
See merge request veloren/veloren!2038
|
2021-04-01 18:08:44 +00:00 |
|
Vincent Foulon
|
dcde8df365
|
address review comments
|
2021-04-01 19:13:08 +02:00 |
|
Marcel
|
08b901490d
|
Merge branch 'chat-world-after-group' into 'master'
after leaving a group, set chat mode to world
Closes #958
See merge request veloren/veloren!2001
|
2021-04-01 16:43:21 +00:00 |
|
aljazerzen
|
9b3f080838
|
refactor Cell back to 4 byte size
|
2021-04-01 17:38:10 +02:00 |
|
Joshua Barretto
|
5918fbed74
|
Merge branch 'animtweaks' into 'master'
small anim tweaks
See merge request veloren/veloren!2039
|
2021-04-01 14:47:00 +00:00 |
|
aljazerzen
|
08146f6a3a
|
login trim username, improve validation, social ordering
|
2021-04-01 16:43:27 +02:00 |
|
aljazerzen
|
8ac879e4c1
|
after leaving group, issue warning instead of changing chat mode
|
2021-04-01 15:43:50 +02:00 |
|
aljazerzen
|
dae8515590
|
after leaving a group, set chat mode to world
|
2021-04-01 15:43:05 +02:00 |
|
jshipsey
|
030e14f333
|
small anim tweaks
|
2021-04-01 03:08:33 -04:00 |
|
Songtronix
|
3506f754aa
|
Merge branch 'songtronix/scheduled-artifacts' into 'master'
CI: only create artifacts when triggered by schedule
See merge request veloren/veloren!2037
|
2021-03-31 17:50:43 +00:00 |
|
Vincent Foulon
|
c2a8feada5
|
Add dialogue when the Merchant is busy and randomize some trading dialogues
|
2021-03-31 19:06:41 +02:00 |
|
Songtronix
|
6c8c649d3d
|
change(ci): only create artifacts triggered by schedule
|
2021-03-31 17:02:47 +02:00 |
|
Marcel
|
3753406eeb
|
Merge branch 'aweinstock/fast-stacking' into 'master'
Allow fast stacking into and out of a trade with {ctrl,shift} click.
See merge request veloren/veloren!2036
|
2021-03-31 08:34:18 +00:00 |
|
Avi Weinstock
|
0122dca3c3
|
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
|
aafdc209d3
|
Merge branch 'xMAC94x/code_reduction' into 'master'
move tracing code to own crate
See merge request veloren/veloren!2026
|
2021-03-30 16:21:39 +00:00 |
|
Marcel Märtens
|
ccb78eeb5c
|
move tracing code to own crate
|
2021-03-30 16:35:36 +02:00 |
|
Joshua Barretto
|
3c19713e63
|
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 |
|
Marcel
|
895de16dd6
|
Merge branch 'james/fix-merchant-wander' into 'master'
Fix merchant wandering
See merge request veloren/veloren!2035
|
2021-03-30 10:52:42 +00:00 |
|
Marcel
|
5ccbfba8fe
|
Merge branch 'xMAC94x/terrainoptimisation' into 'master'
if more than 1 player is in the area of a newly created chunk, skip additional copies
See merge request veloren/veloren!2030
|
2021-03-30 08:27:13 +00:00 |
|
Snowram
|
4128f7fe45
|
Merge branch 'snowram/new-weapons-fix' into 'master'
Fix a staff icon, some offset fixes, lower wolf spawn rate
See merge request veloren/veloren!2025
|
2021-03-30 01:04:37 +00:00 |
|
James Melkonian
|
8e522596a5
|
Fixed merchant wandering
|
2021-03-29 17:27:56 -07:00 |
|
Joshua Barretto
|
92afdaf423
|
Merge branch 'zesterer/small-fixes' into 'master'
Bow improvements
See merge request veloren/veloren!2032
|
2021-03-30 00:16:45 +00:00 |
|