Commit Graph

3388 Commits

Author SHA1 Message Date
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
277a402781 Initial quest window work, spot fixes 2023-03-10 22:16:26 +00:00
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
9a025cfcc8 More spot features 2023-03-03 23:21:37 +00:00
de1c961141 Fixed apple sprite offset 2023-03-01 12:09:41 +00:00
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
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
85d01a990c Remove unused 'hud-chat-mod' entry 2023-02-08 20:58:43 +01:00
87f5a3345d Fix sword sfx 2023-02-07 16:57:22 +00:00
707e189034 Nerf non-potion drinks. 2023-02-01 20:39:29 -05:00
2153196294 Merge branch 'misc_creatures' into 'master'
misc_creatures

See merge request veloren/veloren!3783
2023-02-01 10:41:01 +00:00
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
f0f2aac93b Madirex rus/russian translation update 2023-02-01 10:40:58 +00:00
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
e63ab8338e don't spawn tursus 2023-01-31 20:47:56 +01:00
d219cdd97c spawns & hitboxes 2023-01-31 20:34:41 +01:00
9c09000256 - change bristlemane to bristleback
- axebeak tweaks
2023-01-31 20:34:41 +01:00
e109f5c377 axebeak, tursus 2023-01-31 20:34:40 +01:00
75bfbff2c3 bristlemane 2023-01-31 20:34:40 +01:00
271b80b832 seal 2023-01-31 20:34:40 +01:00
34c69a2c30 Updating some translations, reordering others to match order with EN language - part 2 2023-01-30 02:13:31 +00:00
0e212f61bf Updating some translations, reordering others to match order with EN language 2023-01-30 00:59:46 +00:00
f306b6ee69 make lamps, embers and campfires use glowing indices for the brightest fiery colors 2023-01-29 18:53:18 +01:00
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
d949348661 Moderator badge 2023-01-28 03:10:24 +01:00
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
2843852457 Italian translation: buff-*-potionsickness 2023-01-26 12:36:45 +01:00
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
4159ea5b48 Update swedish translations 2023-01-24 16:56:12 +01:00
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
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
c02015c6c3 Update the Korean translation 2023-01-23 00:32:21 -07:00
75e07c04f0 Merge branch 'zesterer/glowing-sprites' into 'master'
Added support for glowing sprites

See merge request veloren/veloren!3771
2023-01-19 22:31:30 +00:00
d9552f7ff4 Added support for glowing sprites 2023-01-19 21:59:02 +00:00
aba6f6654e Add a new particle mode for potion sickness. 2023-01-19 15:06:14 -05:00
060b8cc0ec Decrease the duration of potion sickness to 45 seconds. Make agents more averse to incurring further stacks of potion sickness, and give villagers iced tea. 2023-01-19 15:06:13 -05:00
78845a0d73 Implement potion sickness, which causes diminishing returns on healing from potions. 2023-01-19 15:06:12 -05:00
da9cd79973 Merge branch 'zesterer/canary' into 'master'
Added canary asset

See merge request veloren/veloren!3770
2023-01-18 23:02:07 +00:00
44f4dcc6f7 Added canary asset 2023-01-18 22:01:00 +00:00
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
ed70bd0800 Italian: "crafting" -> "creazione" 2023-01-17 19:54:32 +01:00
36b68f9f85 Italian: stamina -> energia 2023-01-17 19:53:40 +01:00
d703909557 #1758: fixed in German and English 2023-01-17 10:01:10 +01:00
dbb4772fd2 Update the French translation 2023-01-17 09:42:35 +11:00
696b575611 Merge branch 'zesterer/graphics-fixes' into 'master'
Fixed rain drop normals and wind direction for sprites

See merge request veloren/veloren!3762
2023-01-15 19:52:04 +00:00