3580 Commits

Author	SHA1	Message	Date
Sam	fed96b2e15	Crippling stance required abilities	2023-03-21 19:58:13 -04:00
Sam	c3026d388a	Defensive stance required abilities	2023-03-21 19:58:11 -04:00
Sam	69665b5418	Agility stance required abilities	2023-03-21 19:56:35 -04:00
Sam	a3d655970e	Heavy stance required abilities	2023-03-21 19:56:32 -04:00
Sam	e73236819a	Cross cut	2023-03-21 19:39:42 -04:00
Sam	d64c155115	Cascade	2023-03-21 19:39:41 -04:00
Sam	f8c246e5fc	Skewer	2023-03-21 19:39:41 -04:00
Sam	cdaff6bec1	Fell strike	2023-03-21 19:39:40 -04:00
Sam	e0a7449a99	Crescent slash	2023-03-21 19:39:40 -04:00
Sam	fce9211d49	Secondaries for all stances	2023-03-21 19:39:39 -04:00
Sam	596fe715b8	Cleaving stance skill abilities.	2023-03-21 19:39:39 -04:00
Sam	070c6d94a5	Crippling stance skill abilities.	2023-03-21 19:39:38 -04:00
Sam	d544010c05	Defensive stance skill abilities.	2023-03-21 19:39:38 -04:00
Sam	c23139d501	Agile stance skill abilities.	2023-03-21 19:39:37 -04:00
Sam	ed0de15a5a	Heavy stance skill abilities.	2023-03-21 19:39:35 -04:00
Sam	57806d7be9	Sword M1 abilities	2023-03-21 19:39:22 -04:00
Sam	61f0b424b9	Old sword mostly torn out, new sword framework in place	2023-03-21 19:39:22 -04:00
Sam	7ec9a7677f	Stances change secondary abilities now. Contextual abilities try to fallback to no context if skill not owned for contextual ability.	2023-03-21 19:38:18 -04:00
Sam	b376228d45	Primary and secondary abilities can now be contextual. BasicStance character state added.	2023-03-21 19:38:15 -04:00
Sam	9875008efa	Added stance component that persists even after sheathing weapon (does not yet work with M1 replacement).	2023-03-21 19:29:34 -04:00
tygyh	cb3c6f72c5	Update swedish translations	2023-03-20 22:34:08 +01:00
flo666	897d1e5fe5	fix_ngoubou_jaw	2023-03-20 22:07:23 +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
Christof Petig	b555d619fb	prefer imbris syntax proposal, documentation and changelog	2023-03-17 22:35:47 +01:00
Christof Petig	28da420c82	enable spot addition via ron file	2023-03-17 22:35:47 +01:00
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
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
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
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
Joshua Barretto	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
Joshua Barretto	d9552f7ff4	Added support for glowing sprites	2023-01-19 21:59:02 +00:00
Avi Weinstock	aba6f6654e	Add a new particle mode for potion sickness.	2023-01-19 15:06:14 -05:00
Avi Weinstock	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
Avi Weinstock	78845a0d73	Implement potion sickness, which causes diminishing returns on healing from potions.	2023-01-19 15:06:12 -05:00
Joshua Barretto	da9cd79973	Merge branch 'zesterer/canary' into 'master' ... Added canary asset See merge request veloren/veloren!3770	2023-01-18 23:02:07 +00:00
Joshua Barretto	44f4dcc6f7	Added canary asset	2023-01-18 22:01:00 +00: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
Joshua Barretto	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
Thanos Psaridis	2bf23b26a0	Minor soundtrack improvements.	2023-01-15 19:15:59 +00:00
Joshua Barretto	c12e6426fa	Fixed rain drop normals and wind direction for sprites	2023-01-15 19:13:18 +00:00
Joshua Barretto	295e3c4109	Merge branch 'floppy-autodelete_of_summoned_sprites' into 'master' ... autodelete of summoned sprites See merge request veloren/veloren!3735	2023-01-15 18:28:38 +00:00
flo	650ef9a5e2	autodelete of summoned sprites	2023-01-15 18:28:38 +00:00
Marcel	20610bae23	Merge branch 'jdbp/update_font_file' into 'master' ... fonts: add missing characters to a font file and include its license See merge request veloren/veloren!3757	2023-01-15 16:04:34 +00:00
Isse	5378d1b11d	Fix doors	2023-01-15 05:13:02 +00:00
jdbp	509f786a7c	font: add license of existing font file ... The font license is stated here: https://fontstruct.com/fontstructions/show/330387/haxrcorp_4089_cyrillic_altgr	2023-01-14 01:34:19 +01:00
walpo	6875de439b	haxrcorp_4089_cyrillic_altgr_extended.ttf: add missing characters	2023-01-14 01:25:26 +01:00
Joshua Barretto	47edca8740	Merge branch 'zesterer/graphics-fixes' into 'master' ... Fixed internal water reflections and improved underwarper See merge request veloren/veloren!3754	2023-01-13 17:30:04 +00:00
Marcel	beb934a677	Merge branch 'floppy_dark_guitar&icy_talharpa' into 'master' ... dark_guitar & icy_talharpa See merge request veloren/veloren!3753	2023-01-13 13:37:45 +00:00
flo	0eba37ce6a	dark_guitar & icy_talharpa	2023-01-13 13:37:45 +00:00
Joshua Barretto	fc564f5313	Fixed internal water reflections and improved underwarper	2023-01-13 11:37:27 +00:00
Joshua Barretto	b127cff26c	Merge branch 'zesterer/gbuffers-ssr' into 'master' ... Use normal and material gbuffer to improve quality of SSR See merge request veloren/veloren!3734	2023-01-12 20:26:41 +00:00
Joshua Barretto	49749c86a7	Made emissive figures behave correctly	2023-01-12 18:44:26 +00:00
Monty Marz	e21e4a6dd4	Add 0.14 background image	2023-01-12 17:56:50 +00:00
Joshua Barretto	4d7526b920	Made point shadows with shadow mapping an experimental shader	2023-01-12 15:39:11 +00:00
Joshua Barretto	0bdc66b10a	Addressed review comments, minor fixes	2023-01-12 15:30:13 +00:00
tygyh	3fb7674e6a	Update swedish translations	2023-01-05 10:30:11 +01:00
DaforLynx	b493a89b7f	Soundtrack fix...	2023-01-03 22:27:19 +00:00
Marcel	2ff24259be	Merge branch 'zesterer/lod-models' into 'master' ... New LoD model, wind sway pays attention to wind velocity See merge request veloren/veloren!3739	2023-01-02 14:51:00 +00:00
Marcel	10bb78792a	Merge branch 'thanosfisherman/new_music_track_rectifications' into 'master' ... Thanosfisherman/new music track rectifications See merge request veloren/veloren!3740	2023-01-02 12:14:39 +00:00
Thanos Psaridis	7bafd5f63c	Thanosfisherman/new music track rectifications	2023-01-02 12:14:39 +00:00
Francesco Vasco	a20c563ccd	Added hud-bag-sort_by_tag in italian	2023-01-01 22:42:39 +01:00
Marcel	081f48e73c	Merge branch 'thanosfisherman/add_music_track' into 'master' ... Thanosfisherman/add music track See merge request veloren/veloren!3737	2023-01-01 19:36:22 +00:00
Thanos Psaridis	2608e63316	Thanosfisherman/add music track	2023-01-01 19:36:22 +00:00
Joshua Barretto	0067825187	Reflection smearing	2022-12-31 19:19:52 +00:00
Joshua Barretto	f48e1ca951	Make wind sway change according to weather wind velocity	2022-12-31 17:40:40 +00:00
Joshua Barretto	873d3fb7a4	Added dead trees to LoD	2022-12-31 15:32:56 +00:00
Joshua Barretto	1f2d56c032	Better reflections	2022-12-31 13:04:28 +00:00
Matas Minelga	040c9fe6ee	Inventory: Implemented dynamic and better ordering by Category	2022-12-31 02:32:41 +02:00
Joshua Barretto	313527cf46	Correct material for LoD water	2022-12-30 19:22:07 +00:00
Joshua Barretto	6e344f58e8	Remove unnecessary cloud sampling from shiny water	2022-12-30 17:33:54 +00:00
Joshua Barretto	799bb17d75	Fixed underground sky blend test	2022-12-30 17:24:36 +00:00
Joshua Barretto	4bd7ec26d3	Fixed drop shadows	2022-12-30 17:01:26 +00:00
Joshua Barretto	367ec3e8f4	Added ViewMaterials experimental shader	2022-12-30 16:42:56 +00:00
Joshua Barretto	9098abc3d2	Merge reflections on horizontal border	2022-12-30 16:30:29 +00:00
Joshua Barretto	78fbaa82b3	Fixed ViewNormals	2022-12-30 16:26:32 +00:00
Joshua Barretto	c6fc833acb	Don't blend sky for underwater reflections	2022-12-30 16:23:38 +00:00
Joshua Barretto	d50bda8d09	Better SSR sky blending	2022-12-30 16:01:06 +00:00
Joshua Barretto	26a98a3d9b	Use normal and material gbuffer to improve quality of SSR	2022-12-30 15:33:23 +00: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
Christof Petig	0fba3a73e4	Merge branch 'raresgmihalcea/update_flashing_lights_description' into 'master' ... Update description of the flashing lights setting See merge request veloren/veloren!3727	2022-12-29 13:01:59 +00:00
Monty Marz	6b74437c8c	Bag icon improvement	2022-12-23 15:22:13 +00:00
Marcel	5f4f285523	Merge branch 'christmas-2022' into 'master' ... Christmas 2022 changes See merge request veloren/veloren!3721	2022-12-22 21:06:51 +00:00
DaforLynx	5e282340ba	Christmas 2022 changes	2022-12-22 21:06:51 +00:00
Joshua Barretto	1798cdcffe	Merge branch 'zesterer/floofy-clouds' into 'master' ... Floofy Clouds (improved cloud performance and visuals) See merge request veloren/veloren!3726	2022-12-17 15:41:08 +00:00
Joshua Barretto	dcc4762106	Fixed moon lighting of clouds	2022-12-17 15:04:57 +00:00
Joshua Barretto	5cf3aefb87	Better storm clouds	2022-12-17 14:57:55 +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
Joshua Barretto	94c0e3749e	Improved cloud visuals and performance	2022-12-15 23:56:28 +00: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	44bca9a1b0	Merge branch 'floppy_dagon_kit' into 'master' ... dagon_kit See merge request veloren/veloren!3696	2022-11-30 15:27:21 +00:00
flo	466ed2c382	dagon_kit	2022-11-30 15:27:21 +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
DaforLynx	d338906b19	More music and artist links	2022-11-25 18:48:56 +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
Justin Shipsey	a75b1bc21c	Merge branch 'mossdrake_and_wood_fix' into 'master' ... reduce mossdrake, fix woodgolem loottable See merge request veloren/veloren!3700	2022-11-21 14:22:16 +00:00
flo	e7b802712d	reduce mossdrake, fix woodgolem loottable	2022-11-21 14:22:15 +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
Marcel	833ae2331a	Merge branch 'tygyh/Swedish-translations' into 'master' ... Update swedish translations See merge request veloren/veloren!3682	2022-11-20 18:12:59 +00:00
Samuel Keiffer	5709427e63	Merge branch 'sam/small-fixes' into 'master' ... Small fixes for sword See merge request veloren/veloren!3694	2022-11-16 23:33:12 +00:00
Marcel	997c5a4e61	Merge branch 'ythern/more_unique_abilities' into 'master' ... Ythern/roshwalr kit See merge request veloren/veloren!3692	2022-11-15 09:58:06 +00:00
Eternalisime	7c66c94fa2	fix loot table	2022-11-13 22:49:29 +01:00
Eternalisime	48e23dba49	combat: reverted tweak on shockwave and changed loot table	2022-11-13 22:45:05 +01:00
Eternalisime	6e18683d98	combat: tweak on shockwave	2022-11-13 22:24:01 +01:00
Eternalisime	71e59e4b81	combat: tweaks and modified shockwave animation	2022-11-13 22:04:00 +01:00
Sam	4784b61656	Small fixes	2022-11-13 14:03:37 -05:00
Justin Shipsey	aa2fabcd45	Merge branch 'mossdrake' into 'master' ... Moss Drake See merge request veloren/veloren!3693	2022-11-12 13:00:44 +00:00
flo	0351bf1d63	Moss Drake	2022-11-12 13:00:42 +00:00
Justin Shipsey	420e824a3e	Merge branch 'train-track-shadows' into 'master' ... Train track shadows See merge request veloren/veloren!3688	2022-11-12 13:00:24 +00:00
Eternalisime	ed25a84c72	combat: tweaked roshwalr melee detection and range	2022-11-12 13:51:27 +01:00
Christof Petig	a820eee289	Merge branch 'floppy-bat-wing-tweaks' into 'master' ... tweak bat wing animation See merge request veloren/veloren!3684	2022-11-12 10:18:11 +00:00
flo	df70381a7c	tweak bat wing animation	2022-11-12 10:18:10 +00:00
Eternalisime	13980861f8	combat: tweaked roshwalr AI	2022-11-11 16:37:58 +01:00
Eternalisime	8f4863be28	combat: balance tweaks on roshwalr	2022-11-11 10:22:23 +01:00
Monty Marz	a763a865fe	Musical Instruments part 2	2022-11-10 20:59:53 +00:00
Eternalisime	918d5eb345	combat: added a unique kit to roshwalr	2022-11-10 13:53:12 +01:00
DaforLynx	b2b14e7ab4	Event music can use more than one event at a time. Added test for soundtracks.	2022-11-07 22:39:25 +00:00
Avi Weinstock	18657fdb66	Render train tracks to the shadow map.	2022-11-06 20:54:58 -05:00
Avi Weinstock	db251273ed	Apply shadow map shadows to train tracks.	2022-11-06 18:09:07 -05:00
Samuel Keiffer	72bffe0df8	Merge branch 'train-tracks' into 'master' ... Train tracks See merge request veloren/veloren!3679	2022-11-05 22:56:07 +00:00
Avi Weinstock	f5c1293e9f	Address review comments for MR 3679: ... - Fix normal vectors/lighting for train tracks. - Adjust chat command logging statement. - Remove train tracks when their chunks get unloaded. - Create a struct for the 6-tuple returned from `get_nearest_ways`. - Move code that creates the train tracks into `layers::apply_trains_to`.	2022-11-03 15:20:53 -04:00
Joshua Barretto	b64ca9e698	Tweaked door opening, many entities push grass	2022-11-02 14:44:18 +00:00
Avi Weinstock	ff5acf18d7	Doors now animate opening when entities are near them.	2022-11-01 19:29:51 -04:00
flo	da65485228	bats	2022-11-01 15:01:18 +00:00
tygyh	abd2e0832f	Update swedish translations	2022-11-01 11:05:51 +01:00
Avi Weinstock	f83afcd5a8	Make train tracks configurable as a worldgen feature. Fixes for clippy and fmt.	2022-10-29 14:50:52 -04:00
Avi Weinstock	08a50afd9f	Mostly working train tracks.	2022-10-28 21:36:42 -04:00
Kuba 1001	92465bfe59	lang(pl_PL): update polish translations	2022-10-28 17:46:17 +02:00
Sam	7022350693	Sword AI now randomly rolls again	2022-10-27 20:07:11 -04:00
Sam	d60839010a	Rebase commit	2022-10-27 20:07:10 -04:00