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
|
e72a382620
|
Staff weapon tiering shuffle.
|
2021-04-02 23:04:30 -04:00 |
|
Sam
|
9b6c311373
|
Made staff and sceptre balancing sane. Created loot tables for staffs and sceptres.
|
2021-04-02 23:04:30 -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 |
|
Snowram
|
8e7e821ee8
|
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
|
0a6461f2b9
|
Add colors for buy/sell tooltips based on site prices.
|
2021-04-02 17:44:02 -04:00 |
|
Songtronix
|
79e2d92ca6
|
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 |
|
Marcel
|
eeb9e76902
|
Revert "Merge branch 'animtweaks' into 'master'"
This reverts merge request !2039
|
2021-04-01 18:45:03 +00:00 |
|
Marcel
|
1add298f21
|
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
|
ce5970c8c1
|
address review comments
|
2021-04-01 19:13:08 +02:00 |
|
Marcel
|
4ed96b2f0d
|
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 |
|
Joshua Barretto
|
a5220041f6
|
Merge branch 'animtweaks' into 'master'
small anim tweaks
See merge request veloren/veloren!2039
|
2021-04-01 14:47:00 +00:00 |
|
aljazerzen
|
205e989350
|
after leaving group, issue warning instead of changing chat mode
|
2021-04-01 15:43:50 +02:00 |
|
aljazerzen
|
f7ba4148b3
|
after leaving a group, set chat mode to world
|
2021-04-01 15:43:05 +02:00 |
|
jshipsey
|
99930f13c8
|
small anim tweaks
|
2021-04-01 03:08:33 -04:00 |
|
Songtronix
|
474094de03
|
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
|
b6ea31446f
|
Add dialogue when the Merchant is busy and randomize some trading dialogues
|
2021-03-31 19:06:41 +02:00 |
|
Songtronix
|
0307cab21f
|
change(ci): only create artifacts triggered by schedule
|
2021-03-31 17:02:47 +02:00 |
|
Marcel
|
3ba4669f34
|
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
|
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
|
7badcb92e8
|
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
|
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 |
|
Marcel
|
b6481e759d
|
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
|
5e9bd564da
|
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
|
f5bd61a683
|
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
|
c91a2e0d28
|
Fixed merchant wandering
|
2021-03-29 17:27:56 -07:00 |
|
Joshua Barretto
|
5cc6061606
|
Merge branch 'zesterer/small-fixes' into 'master'
Bow improvements
See merge request veloren/veloren!2032
|
2021-03-30 00:16:45 +00:00 |
|
Joshua Barretto
|
97e5c26838
|
Added indicator text to terrain sprites
|
2021-03-30 01:04:23 +01:00 |
|
Snowram
|
95924315fb
|
Fix a staff icon, some offset fixes, lower wolf spawn rate
|
2021-03-30 00:27:03 +02:00 |
|
Samuel Keiffer
|
c978386d40
|
Merge branch 'sam/mindflayer-balancing' into 'master'
Mindflayer balance tweaks.
See merge request veloren/veloren!2031
|
2021-03-29 21:05:49 +00:00 |
|
Joshua Barretto
|
286f6823b9
|
Added patch for sticky hitboxes
|
2021-03-29 21:52:05 +01:00 |
|
Joshua Barretto
|
6ca8cd9bb2
|
Fixed training dummy hitbox
|
2021-03-29 21:52:05 +01:00 |
|
Joshua Barretto
|
8ecc0d5231
|
Improved hit particles
|
2021-03-29 21:52:05 +01:00 |
|
Joshua Barretto
|
6f72e53295
|
Improved archery with feedback sfx and particles
|
2021-03-29 21:52:04 +01:00 |
|
Snowram
|
5526dfa4fc
|
Merge branch 'snowram/items-infos' into 'master'
Snowram/items infos
See merge request veloren/veloren!1956
|
2021-03-29 20:16:35 +00:00 |
|
Sam
|
699f992774
|
Made entity spawn room check more intuitive to understand
|
2021-03-29 13:05:04 -04:00 |
|