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
13,705 Commits 151 Branches 18 Tags 2.1 GiB
458acce5ac
Commit Graph

839 Commits

Author SHA1 Message Date
Isse
c34e5ad4ed Small fixes 2023-03-29 23:11:59 +00:00
Samuel Keiffer
a737a1862c Merge branch 'sam/sword-balance-0' into 'master' 
Sword Tweaks

See merge request veloren/veloren!3838
 2023-03-29 01:26:33 +00:00
Sam
c9af470cc7 Final tweaks 2023-03-28 20:55:21 -04:00
Marcel
864666a73b Merge branch 'tygyh/Update-swedish-translations' into 'master' 
Update swedish translations

See merge request veloren/veloren!3835
 2023-03-28 23:34:22 +00:00
kinoshi
f0fa766410 Update russian translations 2023-03-28 23:26:11 +00:00
Sam
cdaf9e5c0e Ability changes 2023-03-26 21:41:22 -04:00
Sam
8574066176 Made descriptions more informative 2023-03-21 20:16:58 -04:00
Sam
610d47f787 Effect power now affects more than just poise 2023-03-21 20:16:55 -04:00
Sam
f866bc053c Added note in ability descriptions about which ones are modified by stances. 2023-03-21 20:08:20 -04:00
Monty Marz
6b5ae2b6fe Update sword_bg.png 
positioning, wording, more icons

positioning, first icons
 2023-03-21 19:59:06 -04:00
Sam
39b30b3458 Decontextualized some sword abilities, added UI for sword skill tree. 2023-03-21 19:59:05 -04:00
Sam
f43d25d3fe Ability icons 2023-03-21 19:59:04 -04:00
Sam
e552cf579e Added english localization for sword abilities. 2023-03-21 19:59:04 -04:00
Sam
86dfa34ec9 Cleaving stance required abilities 2023-03-21 19:59:00 -04:00
Sam
a3d655970e Heavy stance required abilities 2023-03-21 19:56:32 -04:00
Sam
b376228d45 Primary and secondary abilities can now be contextual. BasicStance character state added. 2023-03-21 19:38:15 -04:00
tygyh
cb3c6f72c5 Update swedish translations 2023-03-20 22:34:08 +01:00
Imbris
61cb0ad39b Merge branch 'imbris/small-tweaks' into 'master' 
Various small tweaks / fixes

Closes #1475

See merge request veloren/veloren!3817
 2023-03-18 00:52:20 +00:00
Imbris
94dd8c2b70 Address review on 3817 2023-03-17 20:17:46 -04:00
Pexxxzz
04398dba49 Add "You" selector for hud-loot-pickup-msg 2023-03-14 21:22:07 -04:00
Ben Wallis
6eedc02286 Changed character deletion to go via batch update 2023-03-12 23:21:53 +00:00
Marcel
607220b3d7 Merge branch 'DuckLuck/translations_updates_pt-BR' into 'master' 
Update translation for pt_BR

See merge request veloren/veloren!3821
 2023-03-12 07:52:22 +00:00
Imbris
6b8e22d6cc Improvements and fixes for interacting/collecting 
* Inert entities like arrows no longer block interactions like picking
  up items! Logic looking for the closest entity will skip them.
* When pickaxe is not equipped and wielded we now show "Needs Pickaxe"
  as the hint text for mineable blocks.
* Mineable blocks that aren't pointed at now show the mining text hint
  instead of the text hint used for regular collectible blocks.
* Fixed recent bug where all interactables were showing the open text hint.
* Split `BlockInteraction` out of the `Interaction` enum in voxygen
  since we were using this enum for two different things.
 2023-03-11 21:17:27 -05:00
Pexxxzz
1d9eb08a95 Update translation 
Add new translations;
Remove 1 unused translation;
Create quest.ftl and they translations.
 2023-03-11 20:08:32 -04:00
Marcel
2ad53aaa36 Merge branch 'vasco/zoom' into 'master' 
Italian translations

See merge request veloren/veloren!3813
 2023-03-11 23:57:45 +00:00
Marcel
bac621e6ca Merge branch 'Rovetown/update-de_DE' into 'master' 
Updated the German translation for the ability.ftl

See merge request veloren/veloren!3819
 2023-03-11 23:41:54 +00:00
Marcel
7c8fc7191b Merge branch 'tygyh/Update-swedish-translations' into 'master' 
Update swedish translations

See merge request veloren/veloren!3811
 2023-03-11 22:41:39 +00:00
Jonathan Berglin
cdcc605464 Update swedish translations 2023-03-11 22:41:38 +00:00
Rovetown
26b88537da Updated the German translation for the ability.ftl 2023-03-11 22:41:44 +01:00
Monty Marz
277a402781 Initial quest window work, spot fixes 2023-03-10 22:16:26 +00:00
Francesco Vasco
30e327d357 Italian translations 2023-03-08 19:00:11 +01:00
Cat Stevens
83e4cdfe76 Allow locking camera zoom 
Allow the camera's zoom to be locked by a keybind
	or a Gameplay setting. The zoom lock
	behavior can be changed between Toggle
	and Auto, where Auto only locks the camera
	zoom while specific movement/combat inputs
	are being pressed. (closes !1528)

A temporary fading notification is shown at the
	top of the screen, informing the player of
	the setting change (when the keybind is
	used) or that the zoom is locked (when
	the player might have forgotten the zoom
	is locked, and is trying to zoom).

i18n strings are added for English and German,
	but no other languages.

To implement the simplistic fading text, the
	behavior was extracted into an impl
	called `ChangeNotification`, where
	reasons are quantified by `NotificationReason`.
 2023-03-05 11:30:27 -05:00
Monty Marz
9a025cfcc8 More spot features 2023-03-03 23:21:37 +00:00
tygyh
85d01a990c Remove unused 'hud-chat-mod' entry 2023-02-08 20:58:43 +01:00
Marcel
76b6da55f6 Merge branch 'MadirexRus/russian-translation-update' into 'master' 
Madirex rus/russian translation update

See merge request veloren/veloren!3782
 2023-02-01 10:40:58 +00:00
MadirexRus
f0f2aac93b Madirex rus/russian translation update 2023-02-01 10:40:58 +00:00
Nicolas Wildner
34c69a2c30 Updating some translations, reordering others to match order with EN language - part 2 2023-01-30 02:13:31 +00:00
Nicolas Wildner
0e212f61bf Updating some translations, reordering others to match order with EN language 2023-01-30 00:59:46 +00:00
Isse
d949348661 Moderator badge 2023-01-28 03:10:24 +01:00
Marcel
436453556b Merge branch 'Teffmasterjeff/update-ko_KR' into 'master' 
Update the Korean translation

See merge request veloren/veloren!3777
 2023-01-26 22:54:02 +00:00
Francesco Vasco
2843852457 Italian translation: buff-*-potionsickness 2023-01-26 12:36:45 +01:00
Marcel
91d0227c1b Merge branch 'jdbp/update_es_ES_translation' into 'master' 
feat(i18n): update the Spanish (Castilian) translation

See merge request veloren/veloren!3773
 2023-01-26 08:10:17 +00:00
tygyh
4159ea5b48 Update swedish translations 2023-01-24 16:56:12 +01:00
walpo
4502b2fd68 feat(i18n): update the Spanish (Castilian) translation 
The Spanish translation (es_ES) has "Unused" and "NotFound" strings that need to be fixed
 2023-01-24 15:21:25 +01:00
Marcel
1904740ffd Merge branch 'niniko/update-fr_FR' into 'master' 
Update the French translation

See merge request veloren/veloren!3764
 2023-01-24 08:49:18 +00:00
Zaixun
c02015c6c3 Update the Korean translation 2023-01-23 00:32:21 -07:00
Avi Weinstock
78845a0d73 Implement potion sickness, which causes diminishing returns on healing from potions. 2023-01-19 15:06:12 -05:00
Marcel
3a186caf5e Merge branch 'vasco-stamina-energia' into 'master' 
Italian: stamina -> energia

See merge request veloren/veloren!3750
 2023-01-18 18:53:51 +00:00
Francesco Vasco
ed70bd0800 Italian: "crafting" -> "creazione" 2023-01-17 19:54:32 +01:00
Francesco Vasco
36b68f9f85 Italian: stamina -> energia 2023-01-17 19:53:40 +01:00
Nils Ascheuer
d703909557 #1758: fixed in German and English 2023-01-17 10:01:10 +01:00
NiniKo
dbb4772fd2 Update the French translation 2023-01-17 09:42:35 +11:00
tygyh
3fb7674e6a Update swedish translations 2023-01-05 10:30:11 +01:00
Francesco Vasco
a20c563ccd Added hud-bag-sort_by_tag in italian 2023-01-01 22:42:39 +01:00
Matas Minelga
040c9fe6ee
Inventory: Implemented dynamic and better ordering by Category 2022-12-31 02:32:41 +02:00
Joshua Barretto
6070bd6538 Merge branch 'master' into 'master' 
Italian: hud-map-bridge

See merge request veloren/veloren!3717
 2022-12-29 13:09:21 +00:00
Rares
d63f8850a4 Update description of the flashing lights setting 
The lights are supposed to be enabled when the setting is checked
The new description should better reflect the intended behaviour
Only the English descriptions have been updated.
 2022-12-16 21:34:22 +02:00
Marcel Märtens
b8afaafe69 fix spanish file movement 2022-12-15 21:39:59 +01:00
Francesco Vasco
03fae4f434 Italian: hud-map-bridge 2022-12-13 19:36:54 +01:00
Gamma
0e2fe6ff15 update the Spanish translation 2022-12-04 23:43:51 +00:00
rmdlv
f64af1dc86 Russian translation fixes 2022-12-03 19:40:45 +08:00
Marcel
122d2df04f Merge branch 'tygyh/Swedish-translations' into 'master' 
Update swedish translations

See merge request veloren/veloren!3705
 2022-12-01 14:10:00 +00:00
Jonathan Berglin
511026fd65 Update swedish translations 2022-12-01 14:09:59 +00:00
Marcel
f96776b060 Merge branch 'alejandrohernandezcarbonero83-master-patch-36663' into 'master' 
Update npc.ftl

See merge request veloren/veloren!3715
 2022-12-01 13:39:25 +00:00
electro79
dfc31eb0b5 Update npc.ftl 2022-11-30 16:55:10 +00:00
Marcel
ba62cc853e Merge branch 'Madrots/update-es_LA' into 'master' 
Madrots/update-es_LA

See merge request veloren/veloren!3708
 2022-11-30 15:34:33 +00:00
Madrots
605a0a07b0 Madrots/update-es_LA 2022-11-30 15:34:32 +00:00
Marcel
82e4520407 Merge branch 'master' into 'master' 
Added 'hud-skill-set_as_exp_bar' in italian.

See merge request veloren/veloren!3710
 2022-11-30 15:34:29 +00:00
Francesco Vasco
0ba7e5a06e Added 'hud-skill-set_as_exp_bar' in italian. 2022-11-30 15:34:27 +00:00
Marcel
7191ee9325 Merge branch 'alejandrohernandezcarbonero83-master-patch-19384' into 'master' 
Update char_selection.ftl

See merge request veloren/veloren!3711
 2022-11-30 15:18:04 +00:00
IsseW
7296843923 simple bridges 2022-11-30 15:13:52 +01:00
electro79
b5cb66d053 Update char_selection.ftl 2022-11-29 21:56:21 +00:00
Monty Marz
3abfa4d2cc Add Exp-Bar 2022-11-22 11:52:39 +00:00
Marcel
1a92bd7fe1 Merge branch 'master' into 'master' 
Italian transaltion

See merge request veloren/veloren!3687
 2022-11-21 16:24:06 +00:00
Francesco Vasco
d127bcc5d8 Italian transaltion 2022-11-21 16:24:06 +00:00
Marcel
107cc8963f Merge branch 'Halosesparta13-master-patch-90913' into 'master' 
Translation for the "ability.ftl" file to the es_LA folder

See merge request veloren/veloren!3613
 2022-11-20 18:16:49 +00:00
Halosesparta
cfcf197e32 Translation for the "ability.ftl" file to the es_LA folder 2022-11-20 18:16:48 +00:00
Marcel
e5979c78f8 Merge branch 'kuba1001t/update-pl_PL' into 'master' 
Update polish translations

See merge request veloren/veloren!3677
 2022-11-20 18:13:01 +00:00
tygyh
abd2e0832f Update swedish translations 2022-11-01 11:05:51 +01:00
Kuba 1001
92465bfe59 lang(pl_PL): update polish translations 2022-10-28 17:46:17 +02:00
Sam
0fe073fcdc Addressed feedback from testing 2022-10-27 20:07:10 -04:00
Sam
1782408676 Address UX issues of contextual abilities. 2022-10-27 20:07:08 -04:00
Sam
a8212d6f41 Dive melee now scales its attack off of the entity's vertical speed. 
Parries now cause the attacker to effectively have a recover that is either twice as long or 0.5s longer, whichever is more.
Counters now deal twice as much damage to the target if the target is in the buildup portion of an ability.
 2022-10-27 20:06:55 -04:00
Sam
356c26cc66 UI for sword skill tree. 2022-10-27 20:06:54 -04:00
Sam
500e0ae3d0 Heavy abilities 2022-10-27 20:06:34 -04:00
Sam
fd05795b4c Titles and descriptions for each ability. 2022-10-27 20:06:31 -04:00
Joshua Barretto
29d40cf509 Added graphics presets 2022-10-27 01:15:40 +01:00
Marcel
779cccd238 Merge branch 'kevinsmia1939/thai-translate' into 'master' 
Improve and fix Thai translation.

See merge request veloren/veloren!3666
 2022-10-25 21:37:58 +00:00
Kavin Teenakul
40c949c274 Improve and fix Thai translation. 2022-10-25 21:37:58 +00:00
kitswas
9b692d072f Added checkbox in the settings for poisebar 
See [this message on Discord](https://discord.com/channels/449602562165833758/1014778601368997958/1033838446575370351).
 2022-10-24 22:05:11 +05:30
Joshua Barretto
40e47b4f3e Added reflection mode settings 2022-10-23 20:03:21 +01:00
Joshua Barretto
3f2efea4f2 Experimental river velocity in shaders 2022-10-23 01:42:00 +01:00
tygyh
fcc096c599 Update swedish translation 2022-10-05 09:48:18 +02:00
Marcel
f07c0b67ee Merge branch 'update_simplified_chinese' into 'master' 
Upgrade Simplified Chinese Translation

See merge request veloren/veloren!3641
 2022-10-04 22:59:41 +00:00
WanCheng Ye
85b345054e Upgrade Simplified Chinese Translation 2022-10-04 22:59:41 +00:00
Marcel
b9c249940c Merge branch 'galaipa/update-eu' into 'master' 
Translate missing Basque strings

See merge request veloren/veloren!3647
 2022-10-04 22:25:23 +00:00
Bingen Galartza
4c4a1bf80b Translate missing Basque strings 2022-10-04 22:25:23 +00:00
Marcel
4b0033ff91 Merge branch 'Nether190/update-pt_BR' into 'master' 
Nether190/update-pt_BR

See merge request veloren/veloren!3632
 2022-10-04 22:10:11 +00:00
Valter Sanches
60c3d80d57 Nether190/update-pt_BR 2022-10-04 22:10:11 +00:00
Marcel
f584a3f0f6 Merge branch 'fix_Latin-American_translation' into 'master' 
correction in the translation Spanish Latin American

See merge request veloren/veloren!3646
 2022-10-04 21:50:03 +00:00