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
5,403 Commits 151 Branches 18 Tags 2.1 GiB
60a5346a0b
Commit Graph

165 Commits

Author SHA1 Message Date
Judge Griesa
da70e59210 I did it from scratch to match other languages files. -Deleted some tabs and empty spaces. 2020-08-05 16:22:44 +00:00
Judge Griesa
5b35cb4618 -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
92115ec39d 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
Samuel Keiffer
f930f52df5 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
Judge Griesa
a5930e9676 -Removed some white spaces. Added some lines about tips. Fixed some sections. 2020-07-31 13:36:43 +00:00
Marcel
0203854bd3 -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
4d157ece01 add some chinese language 2020-07-29 21:09:19 +08:00
VZIKL
e56434d443 add zh_CN support and add chinese ttf fonts 2020-07-28 21:39:51 +08:00
Marcel
598f14b258 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
Yusuf Bera Ertan
a76d2d3746
tr_TR localization: add missing and update some keys 2020-07-26 12:59:40 +03:00
Snowram
20c2fd2c0b Loading tips and villagers attack speech 2020-07-23 20:31:47 +02:00
Monty Marz
31cfc05123 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
6cce09be85 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
b4cf3297a4 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
d6411f478d Ismail.assaidi/fr 2020-07-16 11:34:37 +00:00
lausek
9a54031e15 de_DE: minor updates on the German translation 2020-07-15 20:56:16 +00:00
Marcel
fc30cad5fd 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
1cdab4b4e8 update es_la 2020-07-14 23:25:46 -04:00
Joshua Barretto
8d6b442193 Crafting 2020-07-14 20:11:39 +00:00
Forest Anderson
6510d38b8b 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
8e523364ac 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
Joshua Barretto
ddaa0a9246 Made char select handle client events 2020-07-06 17:11:19 +01:00
Jack Rubino
2ce92b88a9 Update it_IT.ron 2020-07-06 14:27:55 +00:00
Nícolas Wildner
9f7f9f96f9 Update pt_BR.ron 2020-07-06 01:57:34 +00:00
Nícolas Wildner
0654addb98 Updating pt_BR translation 2020-07-05 22:52:42 -03:00
Forest Anderson
c7ffe3dbeb Merge branch 'nancok/fix-es-translations' into 'master' 
Update es_la.ron

See merge request veloren/veloren!1151
 2020-07-04 03:54:55 +00:00
Monty Marz
89400264dc Loot ChatType, Update german translation, map zooming 2020-07-01 19:05:44 +00:00
Luciano
4a8443f743 Update es_la.ron 2020-06-29 14:19:12 +00:00
Forest Anderson
be6d139e26 Merge branch 'Swedneck/add-veloren-swedish-translation' into 'master' 
Add swedish translation

See merge request veloren/veloren!824
 2020-06-29 01:55:18 +00:00
Forest Anderson
c50a2c8ac2 Fixed Veloren spelling 2020-06-28 20:41:22 -04:00
Patro
4bfe195336 final tweaks in translation 2020-06-28 20:41:22 -04:00
Patro
b37ed5f3a4 Fixed some spelling errors and retranslated some sentences to make them sound better 2020-06-28 20:41:22 -04:00
Redo11
54babe6615 Change uncanny valley to wildness as merged in 
6c4e3eb00a (be21cb369b4dfb9d7a565ddff0161533680a3583)
 2020-06-28 20:41:22 -04:00
Redo11
ecca666521 Add translated comments and add back opensans as default font, as special characters still aren't supported. 2020-06-28 20:41:22 -04:00
Redo11
2c17ecbc99 Add waypoints 2020-06-28 20:41:22 -04:00
jshipsey
622fa88b41 polish 2020-06-28 20:41:22 -04:00
Tim Stahel
3b246dee42 add swedish translation 2020-06-28 20:37:27 -04:00
Forest Anderson
07298cdbeb Merge branch 'nwilder/add-brazilian-portugese-translation' into 'master' 
Nwilder/add brazilian portugese translation

See merge request veloren/veloren!1128
 2020-06-28 21:29:08 +00:00
Forest Anderson
985b0e2bfd Merge branch 'wusyong/tchinese' into 'master' 
Add Traditional Chinese translation

See merge request veloren/veloren!885
 2020-06-28 21:23:57 +00:00
Forest Anderson
f5cede6a90 Merge branch 'nancok/add-spanish-translation' into 'master' 
Add Spanish translation

See merge request veloren/veloren!822
 2020-06-28 21:22:16 +00:00
Forest Anderson
cda757f96c Merge branch 'FixFromDarkness/fix-russian-translations' into 'master' 
Update ru_RU.ron: Fix typos

See merge request veloren/veloren!1126
 2020-06-28 19:56:40 +00:00
Treeco
4098d69a69 Fixed up a few things 
Added fonts section to translation file required by changes to
translation system
Removed unneeded copy of translation file
 2020-06-28 14:50:42 -04:00
Luciano
9e33fd5131 Upload Latin America Spanish translation 2020-06-28 14:50:42 -04:00
CapsizeGlimmer
3d29c3254a Add setting for displaying character names in chat. Placate cargo clippy. 2020-06-27 17:43:46 -04:00
CapsizeGlimmer
92127292d4 Added option to disable speech bubble icons. Aligned settings>gameplay menu again. 2020-06-27 17:40:03 -04:00
WelshPixie
281ca44d3a Added text when NPCs attacked 2020-06-25 22:45:27 +02:00
Songtronix
f44df23935 feat: add server whitelist 2020-06-24 17:36:19 +02:00
Yusuf Bera Ertan
479e64277e Add missing strings, fix a few translations 2020-06-08 21:47:30 +00:00
Invisible Fox
cdcb14d26e Update ru_RU.ron: Fix typos 2020-06-08 10:31:29 +00:00
Pfauenauge90
1c1d0d9ca6 Added spanish translation file 2020-06-06 21:46:53 +02:00
Pfauenauge90
de7ab9f5ed update default keybindings file, en.ron, de_DE.ron 2020-06-06 21:29:35 +02:00
Joey Maher
458ac4af5e Adds simple auto walk functionality. Toggleable or push to hold 2020-06-06 13:09:01 -05:00
Nícolas Wildner
9ed713b334 Replace pt_BR.ron 2020-06-04 12:52:00 +00:00
Monty Marz
6c0587393e update german translation 2020-06-03 19:32:54 +00:00
Monty Marz
b34da9b07b More item drops 2020-06-03 17:59:09 +00:00
Monty Marz
f7d6f76a04 Added 36 Swords 
I added 36 sword models to the code.
 2020-05-29 18:23:00 +00:00
CapsizeGlimmer
78a06550d0 Only NPCs speak when hit. Farm animal alignment changed from NPC to Tame 2020-05-27 13:49:18 +02:00
CapsizeGlimmer
3cea76b82f NPCs now call for help when you hit them. Redraw speech bubble dark mode. 2020-05-27 13:49:18 +02:00
CapsizeGlimmer
3c07d02218 Add a dark mode to speech bubbles; consistantly use 'speech bubble' instead of 'chat bubble' 2020-05-27 13:49:17 +02:00
Monty Marz
9d7e0aad12 Aeronic/forest tune 2020-05-21 04:09:59 +00:00
Monty Marz
ecb7963730 Pfau/0.6 bg 2020-05-16 12:48:29 +00:00
jshipsey
855fe5da34 brazilianportugese 2020-05-15 19:19:14 -04:00
CapsizeGlimmer
0a723614f9 Popup message when setting waypoint 2020-05-14 16:56:10 +00:00
Shane Handley
e852e0cfab - Update the stats of characters individually, reverting the change with 
big combined updates.
- Add a timer to the stats persistence system and change the frequency
that it runs to 10s
- Seperate the loading of character data for the character list during
selection, and the full data we will grab during state creation. Ideally
additional persisted bits can get returned at the same point and added
to the ecs within the same block.
 2020-05-13 09:14:09 +10:00
CapsizeGlimmer
8d3463e2f1 Update english welcome message 2020-05-09 22:54:15 -04:00
S Handley
5a13b54cbf - Load characters after login. 
- Make the character screen load with an empty character list from the server, send event to the server for character creation with data, but not yet saving them to the DB.
- Working but messy character saving to DB
- Add the character_data to the client, rather than keep it in the GLobalState.
 2020-05-09 15:41:25 +00:00
CapsizeGlimmer
4e7f8c686a Equipped lanterns now provide an illumination effect. 2020-05-04 15:15:31 +00:00
Monty Marz
4521791591 UI Fixes 2020-04-26 01:44:56 +00:00
Pfauenauge90
3421b3d8da sprites VD slider visuals 2020-04-25 21:44:23 +01:00
Songtronix
e10f27f480 fix: misspelling in english translation 2020-04-24 18:30:58 +02:00
Treeco
dd08def18f Add camera smoothing setting 2020-04-23 22:59:34 +00:00
Pfauenauge
25a9d5bf2f resolved comments 2020-04-12 21:45:19 +02:00
Pfauenauge90
66b283209b Update de_DE.ron 2020-04-12 18:41:04 +02:00
Pfauenauge90
88a938653b translation fix 2020-04-12 18:41:04 +02:00
Pfauenauge90
f24ba71d94 hotbar keybindings 2020-04-12 18:41:03 +02:00
Pfauenauge90
2263b9be95 starter chest, removed unused key commands 2020-04-12 18:41:02 +02:00
Pfauenauge
479fcaa603 bag tooltips translation entries 2020-04-12 18:41:01 +02:00
Pfauenauge
9b2785aeae german translation update 2020-04-12 18:41:01 +02:00
Carbonhell
198c875559 Carbonhell/keybindings 2020-04-08 17:36:37 +00:00
Monty Marz
07242644ca Small UI fixes 2020-04-04 21:51:06 +00:00
Monty Marz
1af82604b5 German Translation 2020-04-04 14:39:54 +00:00
YuWeiWu
619ab8ba39
Reduce characters not supported by current font 2020-04-04 21:44:03 +08:00
YuWeiWu
62b765ebc5
Use license compatible font instead 2020-04-04 14:58:34 +08:00
YuWeiWu
3dbc268a76
Add font that is able to display Chinese/Japanese 2020-04-04 14:36:08 +08:00
YuWeiWu
169f50abb1
Roll back to current fonts 2020-04-04 14:36:08 +08:00
YuWeiWu
4c9680b073
Add Traditional Chinese translation 2020-04-04 14:36:08 +08:00
Yusuf Bera Ertan
d62770fd6e Update Turkish translation to include new strings 2020-04-02 16:46:59 +00:00
Imbris
97148cb6bb Merge branch 'master' into 'combat' 
# Conflicts:
#   CHANGELOG.md
 2020-04-01 20:42:27 +00:00
Yusuf Bera Ertan
c5331cbabe Add Turkish (Turkey) translation file 2020-03-31 19:52:45 +02:00
Capucho
abc1a041fa Added a portuguese translation 2020-03-30 22:57:26 +02:00
Jack Rubino
bb293c4442 Add Italian translation 2020-03-29 13:40:57 +02:00
S Handley
1cb93b92ed Add Italian translation 2020-03-29 01:47:18 +00:00
Capucho
15ecdfb9b4 Added an option for hold and added everything to the settings 2020-03-27 18:35:52 +00:00
Pfauenauge90
50b7206577 asset cleanup, map visuals 2020-03-27 04:06:27 +01:00
timokoesters
fe2aa7da7b Merge remote-tracking branch 'origin/master' into combat 2020-03-26 23:43:33 +01:00
Capucho
03396eb77e Implement #505 2020-03-26 21:22:21 +00:00
Imbris
41c424ac13 Optimized uses of emitters, cleanup 2020-03-22 00:49:46 -04:00
Pfauenauge90
7ded921ecc more UI visuals 2020-03-16 22:58:19 +01:00
Pfauenauge90
db6099a62f reenabled inventory slots 2020-03-15 19:48:02 +01:00
Songtronix
d2e12fd166 feat(auth): localisation of authentication errors 2020-03-08 22:58:43 +01:00