Commit Graph

3403 Commits

Author SHA1 Message Date
Pexxxzz
04398dba49 Add "You" selector for hud-loot-pickup-msg 2023-03-14 21:22:07 -04:00
Isse
29d9c9dcae move key and lockpick models to voxel folder 2023-03-13 00:54:29 +01:00
Ben Wallis
45c8934b79 Merge branch 'xvar/queue-char-deletes' into 'master'
Changed character deletion to go via batch update

See merge request veloren/veloren!3562
2023-03-12 23:21:54 +00:00
Ben Wallis
6eedc02286 Changed character deletion to go via batch update 2023-03-12 23:21:53 +00:00
Samuel Keiffer
8febcf6b3d Merge branch 'sam/buffs' into 'master'
Auras and buffs no longer need to tick every tick

See merge request veloren/veloren!3814
2023-03-12 22:06:48 +00:00
Isse
fd34e48d15 Merge branch 'floppy_bird_medium_scale' into 'master'
bird_medium_scale

See merge request veloren/veloren!3820
2023-03-12 18:08:21 +00:00
flo
704af5ef7b bird_medium_scale 2023-03-12 18:08:21 +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
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
Sam
9efac9957d Changed buff effects so they did not need to mutably change buffs every tick. Buff system now no longer mutably accesses buffs component. 2023-03-11 16:45:11 -05:00
Sam
89aa934c3c Initial work 2023-03-11 16:45:10 -05: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
Joshua Barretto
de1c961141 Fixed apple sprite offset 2023-03-01 12:09:41 +00:00
Samuel Keiffer
01da8b6a82 Merge branch 'tursus_werewolf_anim&spawn_loot_tweaks' into 'master'
spawn and loot tweaks, tursus and werewolf anims

See merge request veloren/veloren!3790
2023-02-22 01:32:05 +00:00
flo
98e93d1a1c spawn and loot tweaks, tursus and werewolf anims 2023-02-22 01:32:05 +00:00
Marcel
63c8baffe1 Merge branch 'tygyh/Update-swedish-translations' into 'master'
Remove unused 'hud-chat-mod' entry

See merge request veloren/veloren!3793
2023-02-17 10:04:09 +00:00
flo
bf81ffc029 frost_gigas 2023-02-15 00:10:37 +00:00
flo
0531b40fae bird_medium_2 2023-02-14 23:17:20 +00:00
tygyh
85d01a990c Remove unused 'hud-chat-mod' entry 2023-02-08 20:58:43 +01:00
James Melkonian
87f5a3345d Fix sword sfx 2023-02-07 16:57:22 +00:00
Avi Weinstock
707e189034 Nerf non-potion drinks. 2023-02-01 20:39:29 -05:00
Marcel
2153196294 Merge branch 'misc_creatures' into 'master'
misc_creatures

See merge request veloren/veloren!3783
2023-02-01 10:41:01 +00: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
Marcel
4beb732630 Merge branch 'update-pt_BR' into 'master'
Update pt br - 2021-01-30

See merge request veloren/veloren!3785
2023-01-31 22:32:41 +00:00
flo666
e63ab8338e don't spawn tursus 2023-01-31 20:47:56 +01:00
flo666
d219cdd97c spawns & hitboxes 2023-01-31 20:34:41 +01:00
flo666
9c09000256 - change bristlemane to bristleback
- axebeak tweaks
2023-01-31 20:34:41 +01:00
flo666
e109f5c377 axebeak, tursus 2023-01-31 20:34:40 +01:00
flo666
75bfbff2c3 bristlemane 2023-01-31 20:34:40 +01:00
flo666
271b80b832 seal 2023-01-31 20:34:40 +01: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
Christof Petig
f306b6ee69 make lamps, embers and campfires use glowing indices for the brightest fiery colors 2023-01-29 18:53:18 +01:00
Marcel
c165d28e7d Merge branch 'wyvern_wings' into 'master'
wyverns

See merge request veloren/veloren!3720
2023-01-28 21:25:17 +00:00
flo
5e1fd02095 wyverns 2023-01-28 21:25:17 +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