750 Commits

Author SHA1 Message Date
Monty Marz
9869b2a8d7 group leader colouring, offset fix when debug menu is open,
fixed social tab visuals

text width limit

group interaction wording, group window adjustments
2020-08-08 01:15:58 +02:00
Monty Marz
a0dd070daf timeout visuals, various small fixes and two new items 2020-08-08 01:15:58 +02:00
Monty Marz
64acb03083 Update CHANGELOG.md, german locale 2020-08-08 01:15:58 +02:00
Monty Marz
fb40666831 Social window assets 2020-08-08 01:14:19 +02:00
Monty Marz
b7e7cdbf94 group button and menu logic changes
group member panels

health bar text

text shadows and scaling

cleanup, don't show the player panel

social window assets
2020-08-08 01:14:19 +02:00
Imbris
320cbc9b3c New group UI functions 2020-08-08 01:14:19 +02:00
Monty Marz
c5720c02c9 Basic UI
Basic ui for groups and group window
2020-08-08 01:12:35 +02:00
Imbris
ef43cc0030 Add key to select entities 2020-08-08 01:09:02 +02:00
Marcel
eb6855ff96 Merge branch 'french_translation' into 'master'
French translation improvements

See merge request veloren/veloren!1263
2020-08-07 21:05:47 +00:00
Varpie
9d8db2c846 Fixing various obsolete texts and a few typos, uniform pronoun (tu->vous) and French style punctuation 2020-08-07 21:05:47 +00:00
Marcel Märtens
5c764cd933 add a translation test that verifys that all language RON files are parseable (without any git involved) 2020-08-07 21:31:34 +02:00
nepo
b8cb8ec68b nepo/dullahan 2020-08-07 03:56:59 +00:00
Marcel
0d0845c32e Merge branch 'patch-2' into 'master'
I did it from scratch to match other languages files. -Deleted some tabs and empty spaces. I hope it's the last fix and that it finally appears in the next update.

See merge request veloren/veloren!1262
2020-08-06 23:05:41 +00:00
Judge Griesa
8d787aee94 I did it from scratch to match other languages files. -Deleted some tabs and empty spaces. 2020-08-05 16:22:44 +00:00
BottledByte
b8199542e0 Dehardcoded LanternKind, Consumable and Ingredient, fixed Sceptre hotbar
Also fixed two wrong asset references and did some .ron formatting
2020-08-05 01:21:42 +02:00
Judge Griesa
2fffdd902e -Added crafting commands missed in the file (Probably the reason why the file wasn't read by the game). Removed some weird whitespaces. Added some NPC lines while attacked. 2020-08-03 12:22:07 +00:00
Marcel
1af779cf2b Merge branch 'patch-2' into 'master'
-Removed some white spaces. Added some lines about tips. Fixed some sections.

See merge request veloren/veloren!1251
2020-08-03 08:13:41 +00:00
BottledByte
4a19f1dacc De-enumerized armor variants 2020-08-03 03:41:32 +00:00
BottledByte
c7a5161b43 Removed fine-grained Item enums and replaced them with Strings
This change allows to introduce new weapons and pair them
with graphical assets without need to recompile.
2020-08-02 01:21:32 +00:00
Samuel Keiffer
6f73713c79 Allows for weapons to have different stats. Seperates healing staff out from staffs into its own weapon type: sceptre. Splits bow weapon type into shortbow and longbow. 2020-08-01 20:08:30 +00:00
jshipsey
030f29d102 cleanup, last tweaks 2020-08-01 02:19:45 -04:00
jshipsey
0eaa41f5ba arming the cyclops 2020-08-01 02:19:45 -04:00
Snowram
b37c0962af Add frog npc, tweak pig model 2020-08-01 02:19:45 -04:00
jshipsey
2645f9e631 cyclops run anim 2020-08-01 02:19:45 -04:00
Snowram
d7bafe7fb5 Bonerattler tweaks 2020-08-01 02:19:45 -04:00
jshipsey
654088820c maneater and feed anim 2020-08-01 02:19:45 -04:00
Snowram
1b7cb8cde6 Add troll, truffler and wendigo npcs 2020-08-01 02:19:45 -04:00
jshipsey
9a4415509c catoblepas, bonerattler, rabbit, improved anims 2020-08-01 02:19:44 -04:00
jshipsey
8251fcfa55 new models, anim tweaks 2020-08-01 02:19:44 -04:00
Snowram
eb5ebdce12 Various changes to npcs animations
- Improved dragon run with tilting
- New run animation for quadsmall, added tilting
2020-08-01 02:19:43 -04:00
Judge Griesa
87742b98cc -Removed some white spaces. Added some lines about tips. Fixed some sections. 2020-07-31 13:36:43 +00:00
Marcel
190cd41182 -Update on Latinamerican Spanish translation!
Some spell check and changed some words for others to have a better context.
2020-07-30 10:22:09 +00:00
VZIKL
83e4f8e2e7 add some chinese language 2020-07-29 21:09:19 +08:00
VZIKL
eaac2eee69 add zh_CN support and add chinese ttf fonts 2020-07-28 21:39:51 +08:00
Marcel
9e02620d8b Merge branch 'yusdacra/update-tr-translation' into 'master'
tr_TR localization: add missing and update some keys

See merge request veloren/veloren!1229
2020-07-27 08:16:20 +00:00
Marcel
9011af9cf1 Merge branch 'snowram/french-translation' into 'master'
fr_FR: Loading tips and villagers attack speech

See merge request veloren/veloren!1230
2020-07-27 08:16:14 +00:00
Yusuf Bera Ertan
f427627d36
tr_TR localization: add missing and update some keys 2020-07-26 12:59:40 +03:00
Samuel Keiffer
527453c54a Armor fixes 2020-07-25 23:57:04 +00:00
Snowram
3d01b37e20 Loading tips and villagers attack speech 2020-07-23 20:31:47 +02:00
Monty Marz
6d3f0f2e29 lots of things
animation fixes by slipped
new cultist item
settings option for loading screen tips
loot table adjustments
2020-07-23 12:10:13 +00:00
Samuel Keiffer
7c0f90e6b2 Added protection stat to admin armor hidden in debug folder. Removed blue cultist armor set from drop table as it is an admin set. 2020-07-18 00:05:28 +00:00
Marcel
77e97007b7 Merge branch 'ismail.assaidi/fr' into 'master'
Ismail.assaidi/fr

See merge request veloren/veloren!1210
2020-07-16 11:34:38 +00:00
Marcel
5d7b3c8331 Ismail.assaidi/fr 2020-07-16 11:34:37 +00:00
Monty Marz
2aea3538e3 Fix item images, cleanup debug items folder 2020-07-16 02:46:10 +00:00
lausek
313936c2ba de_DE: minor updates on the German translation 2020-07-15 20:56:16 +00:00
Marcel
bf1205d71c Merge branch 'jackrubino/it_IT' into 'master'
Jackrubino/it it

See merge request veloren/veloren!1211
2020-07-15 18:29:28 +00:00
PatatasDelPapa
e3aa063cd2 update es_la 2020-07-14 23:25:46 -04:00
Joshua Barretto
1c1229fff9 Crafting 2020-07-14 20:11:39 +00:00
Forest Anderson
e271d32ca1 Merge branch 'nwilder/improve-pt-br-translation' into 'master'
Nwilder/improve pt br translation

See merge request veloren/veloren!1199
2020-07-14 03:21:45 +00:00
Kai
257127e5a5 Prevent GameInputs from being bound to multiple keys unless explicitly allowed. Add a Reset to Defaults button for controls. 2020-07-12 11:59:55 -07:00