Commit Graph

1567 Commits

Author SHA1 Message Date
hqurve
be42cc60c4 Added search to crafting and social windows, added i18n support to crafting tabs, fixed social window offset when group open, removed tabs in social window 2021-04-07 20:24:22 +00:00
Vincent Foulon
5e23c164e6 Add missing translations + Add "enemy_killed" text for villagers 2021-04-07 13:26:15 +02:00
James Melkonian
16871208f2 Add topographic option to map 2021-04-06 09:16:17 -07:00
Marcel
187a85e056 Merge branch 'renamenorsk_norskbokmål' into 'master'
Rename Norsk to Norsk bokmål

See merge request veloren/veloren!2064
2021-04-06 11:37:54 +00:00
Kim André Moen Bjørkede
2380f9e8c2 Rename Norsk to Norsk bokmål 2021-04-06 11:37:51 +00:00
Marcel
2ed85a2dc0 Merge branch 'tonyvu0605/VietTranslation' into 'master'
Started Vietnamese Translation

See merge request veloren/veloren!2059
2021-04-06 10:48:03 +00:00
Joshua Barretto
de9ad0942f Merge branch 'zesterer/follow-cam' into 'master'
Added auto camera setting

See merge request veloren/veloren!2071
2021-04-06 04:23:40 +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
Samuel Keiffer
f79493f7d0 Merge branch 'sam/sceptre-nerfs' into 'master'
Sam/sceptre nerfs

See merge request veloren/veloren!2072
2021-04-06 02:41:56 +00:00
Joshua Barretto
60e2ed3e7d Added auto camera setting 2021-04-05 23:24:31 +01: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
theCow61
b99c02401d Change to auto walk/glide. 2021-04-05 16:07:17 -05:00
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
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
tonyvu0605
e0dbd5566d Started Vietnamese Translation 2021-04-03 22:17:57 -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
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
Snowram
9a3f6d8261 Substitutes DPS for CR in item tooltip 2021-04-03 00:10:31 -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
247004d180 Loot tables can now recursively specify loot tables. Mercahnts broken. 2021-04-02 23:04:25 -04: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
Vincent Foulon
49be1fd70c Refine some item icons 2021-04-01 21:46:57 +02:00
Vincent Foulon
dcde8df365 address review comments 2021-04-01 19:13:08 +02:00
Vincent Foulon
c2a8feada5 Add dialogue when the Merchant is busy and randomize some trading dialogues 2021-03-31 19:06:41 +02: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
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
Snowram
606dd64741 Fix a staff icon, some offset fixes, lower wolf spawn rate 2021-03-30 00:27:03 +02:00
Samuel Keiffer
12ec46c572 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
8f3233365d Improved hit particles 2021-03-29 21:52:05 +01:00
Joshua Barretto
b0acbda236 Improved archery with feedback sfx and particles 2021-03-29 21:52:04 +01:00
Snowram
6adaac8106 Addresses comments 2021-03-29 18:35:12 +02:00
Snowram
b8ac90d049 Changelog, cleanup, clippy 2021-03-29 18:35:10 +02:00
Snowram
508e35ca17 Add several new i18n lines 2021-03-29 18:34:45 +02:00
Snowram
2c09180189 Set the item tooltip for every bag slots 2021-03-29 18:34:45 +02:00