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

1586 Commits

Author SHA1 Message Date
Marcel
dc2428b38e Merge branch 'trade-help-tooltips' into 'master' 
Show ctrl-click and shift-click usage in item tooltips during trades.

See merge request veloren/veloren!2101
 2021-04-11 22:56:03 +00:00
Rickey Chamblee
95c44a6794 Show ctrl-click and shift-click usage in item tooltips during trades. 2021-04-11 22:56:02 +00:00
Marcel
439505c405 Merge branch 'master' into 'master' 
Update and fix zh_CN

See merge request veloren/veloren!2103
 2021-04-11 22:56:00 +00:00
law4x
86e53dbb95 Update and fix zh_CN 2021-04-11 22:55:59 +00:00
Marcel
58bebc39d0 Merge branch 'danielduel/PL-local' into 'master' 
Add/Extend PL locale

See merge request veloren/veloren!2091
 2021-04-11 22:55:58 +00:00
BuildTools
fcdfd3e223 Add/modify Polish translations 2021-04-11 19:10:09 +02:00
Vincent Foulon
eb04bc7335 add new loader + move some images 2021-04-11 16:35:25 +02:00
Snowram
61fe82d4af Lossless compression of UI assets 2021-04-11 16:35:25 +02:00
Vincent Foulon
c29f75372e remove unused images 2021-04-11 16:35:23 +02:00
Vincent Foulon
ff6c6da674 optimized all images 2021-04-11 16:35:23 +02:00
Vincent Foulon
c613e0022c Asset reorganization + removed some unused and duplicates + reduce size of some images 2021-04-11 16:35:17 +02:00
Monty Marz
04d540c565 UI fixes and more 2021-04-11 03:49:47 +00:00
Marcel
4c2bf6673a Merge branch 'ccm7676/lang_bug_fix' into 'master' 
fixed the Select a Language text on languages where it was broken

See merge request veloren/veloren!2089
 2021-04-10 15:47:28 +00:00
Marcel
aa63982e69 Merge branch 'juliancoffee/uk_UA-localizaion' into 'master' 
Update localization files for Ukrainian

See merge request veloren/veloren!2090
 2021-04-10 14:54:13 +00:00
Illia Denysenko
f9d06f48d9 Update localization files for Ukrainian 2021-04-10 14:54:12 +00:00
Marcel
7c9ecca2c5 Merge branch 'MigraineX/update-es-ES' into 'master' 
Updated the Spanish (ES) translation

See merge request veloren/veloren!2094
 2021-04-10 14:20:40 +00:00
MigraineX
ccafd14390 Updated the Spanish (ES) translation 2021-04-10 14:31:57 +02:00
Joshua Yanovski
909f2c4680 Remove panics and unwraps, part 1. 
Also fixes various other miscellaneous bugs.
 2021-04-10 10:03:21 +02:00
Carl Marino
5de52fc116 fixed the Select a Language text on languages where it was broken 2021-04-09 18:39:53 +02:00
hqurve
1b3536a5f5 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
024e366126 Add missing translations + Add "enemy_killed" text for villagers 2021-04-07 13:26:15 +02:00
James Melkonian
7bb62615df Add topographic option to map 2021-04-06 09:16:17 -07:00
Marcel
269124a325 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
44f96000ba Rename Norsk to Norsk bokmål 2021-04-06 11:37:51 +00:00
Marcel
51e62a8655 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
b419ed6905 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
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
Samuel Keiffer
8c3ea2eb13 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
28fc121458 Added auto camera setting 2021-04-05 23:24:31 +01: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
theCow61
865c6002d2 Change to auto walk/glide. 2021-04-05 16:07:17 -05:00
Marcel
ea0188a6cc 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
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
tonyvu0605
290f36613b Started Vietnamese Translation 2021-04-03 22:17:57 -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
21ed2885c9 Actually committed bone staff fix. 2021-04-03 10:26:32 -04:00
Justin Shipsey
6855961fe7 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
9cc6ff3711 Substitutes DPS for CR in item tooltip 2021-04-03 00:10:31 -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
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