3008 Commits

Author	SHA1	Message	Date
Sam	4a690840e4	Savage sense	2023-07-29 18:53:47 -04:00
Sam	3e8b2b283a	Triple chop	2023-07-29 18:53:44 -04:00
Sam	80ab9c26ec	Initial setup	2023-07-29 18:53:38 -04:00
Samuel Keiffer	026b61baee	Merge branch 'maxicarlos08/chieftain-mask-fix' into 'master' ... Maxicarlos08/chieftain mask fix See merge request veloren/veloren!4024	2023-07-29 01:22:28 +00:00
Marcel	3ad6517aa1	Merge branch 'czech-translation-supply-missing-files' into 'master' ... Czech translation - adding missing files See merge request veloren/veloren!4018	2023-07-24 15:02:13 +00:00
Maxicarlos08	9901ba691e	fix alignment of wanderer's hat and a typo	2023-07-14 00:59:27 +02:00
Maxicarlos08	b16b1bf51f	Fix alignments and remove unused variations	2023-07-13 17:11:07 +02:00
flo666	326d33d935	re-add helmet definitions & fix offsets, add missing helmets in image and drop manifest	2023-07-13 16:25:43 +02:00
Maxicarlos08	d057e9d4d6	remove incorret chieftain mask definitions	2023-07-13 14:19:04 +02:00
Monty Marz	102945b9e7	Dungeon rework initial patch	2023-07-09 20:03:09 +00:00
Jaroslav Lichtblau	e0212f4470	Czech translation - adding missing files	2023-07-09 12:59:58 +02:00
Marcel	fd5fdd1840	Merge branch 'fix-typos-czech-translation' into 'master' ... Typos fixed in Czech localisation See merge request veloren/veloren!4016	2023-07-08 10:36:50 +00:00
Marcel	9b73fa0807	Merge branch 'sglorch/translation-de' into 'master' ... sglorch/translation-de See merge request veloren/veloren!3996	2023-07-07 15:11:16 +00:00
Stefan Glorch	4cf73b2eb4	sglorch/translation-de	2023-07-07 15:11:16 +00:00
Hugo Famechon	a648c68233	Sort items in inventory by quantity	2023-07-05 19:07:16 +00:00
Jaroslav Lichtblau	bade2a176a	Typos fixed in Czech localisation	2023-07-05 18:44:24 +02:00
Marcel	32c7994cca	Merge branch 'tygyh/Update-swedish-translations' into 'master' ... Update swedish translations See merge request veloren/veloren!4009	2023-07-05 13:01:08 +00:00
Samuel Keiffer	dab040baa4	Merge branch 'trade-thirdconfirm' into 'master' ... Added additional confirmation when trading for nothing. See merge request veloren/veloren!3997	2023-07-03 23:45:59 +00:00
Marcel	620c58fecc	Merge branch 'bd/esperanto' into 'master' ... Esperanto translation See merge request veloren/veloren!3432	2023-07-03 23:34:36 +00:00
Brandon Dyer	a7ff12f012	Esperanto translation	2023-07-03 23:34:35 +00:00
tygyh	0b2ad222dc	Update swedish translations	2023-07-03 21:10:37 +02:00
walpo	9c0046f790	i18n: add bulgarian (bg) translation	2023-07-02 08:50:17 +00:00
Joshua Barretto	ffabace13d	Fixed bloom sample UV, added Cinematic shader	2023-06-28 12:21:16 +01:00
Monty Marz	5c3ab74bdf	login background	2023-06-27 21:37:19 +02:00
Avi Weinstock	ced6880168	Added additional confirmation when trading for nothing.	2023-06-26 10:39:30 -04:00
Youssef Fahmy	65ea69bef3	Small balance changes	2023-06-19 01:16:42 +00:00
Samuel Keiffer	079e7bfed6	Merge branch 'uniior/cacti' into 'master' ... New/revamped cacti sprites See merge request veloren/veloren!3986	2023-06-18 01:22:33 +00:00
unknown	413befadae	Lowercase asset files	2023-06-17 20:35:28 -04:00
unknown	1269cfe00d	Lowercase asset files	2023-06-17 20:20:05 -04:00
Imbris	69dcc12dcd	Merge branch 'gradientsobel' into 'master' ... Add `GradientSobel` experimental filter that adds object outlines based on the normal map. See merge request veloren/veloren!3975	2023-06-08 16:59:20 +00:00
Avi Weinstock	d023f9db54	Only bind the materials texture in the postprocess bindgroup if it's needed.	2023-06-07 16:21:28 -04:00
Avi Weinstock	025831d9a2	Add GradientSobel experimental filter that adds object outlines based on the normal map.	2023-06-07 15:39:57 -04:00
unknown	526386e51c	Initial cacti work	2023-06-07 14:46:54 -04:00
walpo	b919312d1b	Make i18n language identifiers comply with IETF BCP 47	2023-06-07 13:12:34 +00:00
Justin Shipsey	d90926e4a3	Merge branch 'master' into 'master' ... updating fr_FR translations See merge request veloren/veloren!3966	2023-06-04 09:32:10 +00:00
Isse	a884e0e058	Various rtsim related stuff	2023-06-03 22:14:18 +00:00
flo	16d58c6b4e	plant creatures	2023-06-03 13:59:52 +00:00
Thomas S	7e7017d705	adding fr_FR translations	2023-06-01 20:17:51 +02:00
Pedro H	25c3fe3657	Add all missing pt_br translations	2023-05-31 21:19:23 +00:00
Joshua Barretto	2064ad5d80	Added color dither	2023-05-31 19:10:09 +01:00
Joshua Barretto	2a9e43b847	Draw distinction between bilinear filtering and nearest neighbour	2023-05-31 18:26:53 +01:00
Joshua Barretto	b2051767ff	More experimental shaders	2023-05-31 17:07:22 +01:00
Marcel	b5c4b435ff	Merge branch 'vasco-steam' into 'master' ... Italian translation See merge request veloren/veloren!3949	2023-05-26 15:01:05 +00:00
Marcel	5b7005f8f4	Merge branch 'tygyh/Update-swedish-translations' into 'master' ... Update swedish translations See merge request veloren/veloren!3929	2023-05-26 15:01:01 +00:00
Jonathan Berglin	fc4e1c8a87	Update swedish translations	2023-05-26 15:01:00 +00:00
Francesco Vasco	713533da0b	Italian translation	2023-05-24 22:45:09 +02:00
flo	a55276ea73	seachapel_rework	2023-05-24 18:13:29 +00:00
DaforLynx	1555797675	Merge branch 'thanosfisherman/loudness_adjustments' into 'master' ... adjusted eq and loudness to align with the majority of tracks See merge request veloren/veloren!3941	2023-05-21 21:54:30 +00:00
Thanos Psaridis	8dad923c3a	adjusted eq and loudness to align with the majority of tracks	2023-05-21 21:54:29 +00:00
Joshua Barretto	2219797142	Merge branch 'zesterer/shader-block-kinds' into 'master' ... Added support for block kinds in shaders See merge request veloren/veloren!3932	2023-05-21 17:19:51 +00:00
Francesco Vasco	c6ab618d2e	Italian translation	2023-05-20 11:49:07 +02:00
Joshua Barretto	00b2bcb7b4	Merge branch 'zesterer/one-way-walls' into 'master' ... One-way walls See merge request veloren/veloren!3943	2023-05-19 17:55:13 +00:00
Joshua Barretto	423e6f0348	Adjusted particle offset	2023-05-19 15:05:18 +01:00
Joshua Barretto	2893f400f8	Better particle lighting	2023-05-19 14:58:59 +01:00
Joshua Barretto	4961ca2f6d	Fixed particle effect UB	2023-05-19 14:46:22 +01:00
Joshua Barretto	c73848b932	Fixed minor issues with walls, better particles	2023-05-19 14:25:49 +01:00
Joshua Barretto	c94d6c502a	Added one-way wall sprites	2023-05-19 13:24:45 +01:00
Marcel	d5ca004d2b	Merge branch 'vasco-adlet' into 'master' ... Italian translation See merge request veloren/veloren!3934	2023-05-19 09:35:30 +00:00
Tao In Way	f18297ec75	taoist/charms	2023-05-19 03:07:44 +00:00
Joshua Barretto	a634da2d07	Addressed review comments	2023-05-17 22:22:54 +01:00
Francesco Vasco	295e7003af	Italian translation	2023-05-16 17:50:56 +02:00
Joshua Barretto	aeb72bcf22	Added support for block kinds in shaders	2023-05-15 17:31:21 +01:00
flo666	0ba58d8785	map icon fix & set difficulty indicator to 2	2023-05-13 09:32:28 -04:00
flo666	c7831a8ca9	loot_tables yeti&elder , ... change drum to wildskin_drum, add map icons, yeti attacks buff	2023-05-13 09:32:27 -04:00
flo666	7739aaff78	add more loot	2023-05-13 09:32:24 -04:00
flo666	9a6ab28c3d	adlet elder tweaks	2023-05-13 09:32:24 -04:00
flo666	ed260f832d	add loot, reduce enemies	2023-05-13 09:32:21 -04:00
flo666	c2cf88da3d	- bigger yetipit mob rooms ... - tweaks	2023-05-13 09:32:20 -04:00
flo666	25ef582f1a	- sprites IceCrystal, GlowIceCrystal for yetipit ... - rough creature balance	2023-05-13 09:32:16 -04:00
flo666	38a6cc67f9	add models: bone_door, bone_keyhole, bone_key	2023-05-13 09:31:29 -04:00
flo666	6668df9f08	add adlet elder	2023-05-13 09:30:56 -04:00
flo666	86803c43bf	adlet tracker tweaks	2023-05-13 09:30:54 -04:00
flo666	f936c2f00e	rocky yetipit entrance & AdletTrap object	2023-05-13 09:30:54 -04:00
Sam	95347e8a60	Spear magic	2023-05-13 09:30:53 -04:00
Sam	92e28f09fc	Adlet abilities	2023-05-13 09:30:51 -04:00
flo666	715a0b7b20	rebase	2023-05-13 09:30:50 -04:00
flo666	1750c9a0f2	structure work	2023-05-13 09:30:48 -04:00
jshipsey	da3c2369e5	initial setup	2023-05-13 09:30:13 -04:00
Joshua Barretto	4253833aaf	Add photorealistic experimental shader	2023-05-12 14:02:23 +01:00
Joshua Barretto	1924c67033	Adjusted night ambience	2023-05-12 13:47:01 +01:00
Marcel	5ade37e0a5	Merge branch 'tygyh/Update-swedish-translations' into 'master' ... Tygyh/update swedish translations See merge request veloren/veloren!3922	2023-05-10 15:25:12 +00:00
Jonathan Berglin	448b06ca0a	Tygyh/update swedish translations	2023-05-10 15:25:12 +00:00
Isse	2bc63d22ae	Merge branch 'isse/sittable-sprites' into 'master' ... Sprites on airships, and mountable sprites See merge request veloren/veloren!3886	2023-05-10 13:55:51 +00:00
Francesco Vasco	9508fd05bb	Italian translation	2023-05-10 08:17:13 +02:00
Isse	f6f332af6a	send full matrix to shader	2023-05-09 19:43:10 +02:00
Isse	c4cffff92f	apply shader changes from zesterer	2023-05-09 19:43:10 +02:00
Isse	b4c3868dd4	different translation key for mounting Helm	2023-05-09 19:43:10 +02:00
Isse	a35a1a34c4	more sprites on airships	2023-05-09 19:43:09 +02:00
Isse	6674cce2cc	intercat with sprites on ships	2023-05-09 19:43:09 +02:00
Isse	1710dcc111	fix shadows	2023-05-09 19:43:09 +02:00
Isse	fcb7011cde	sprites on volumes	2023-05-09 19:43:09 +02:00
Isse	2928eb8d15	sit on sprites	2023-05-09 19:43:08 +02:00
Joshua Barretto	1cc221f653	Merge branch 'zesterer/rtsim-tweaks' into 'master' ... Started adding wandering rtsim monsters See merge request veloren/veloren!3908	2023-05-09 14:51:15 +00:00
Marcel	9ac654baa9	Merge branch 'tygyh/Update-swedish-translations' into 'master' ... Update swedish translations See merge request veloren/veloren!3920	2023-05-09 13:22:43 +00:00
Francesco Vasco	232d4c932e	Italian translation	2023-05-08 19:29:24 +02:00
tygyh	7f17520163	Update swedish translations	2023-05-08 17:58:45 +02:00
Sam	a38f336c9e	Added dual wielding sword contextual abilities.	2023-05-07 20:43:51 -04:00
Vitalya	b3a1d7af6c	Update ukrainian translation	2023-05-05 09:51:34 +00:00
Joshua Barretto	79dd1e2629	Fixed ambient lighting	2023-05-04 19:57:28 +01:00
Joshua Barretto	f000347cac	Make NPCs respond to each other	2023-05-04 11:53:01 +01:00
Joshua Barretto	2ff0118df0	More rtsim monsters	2023-05-04 10:13:02 +01:00
Isse	a89fcd1a38	swedish subtitles	2023-05-03 13:07:36 +02:00
Isse	99463a37f8	subtitles	2023-05-03 13:07:35 +02:00
Isse	1c9b502f69	move flashing lights to accessability settings tab	2023-05-03 13:07:35 +02:00
Isse	b37a2bf1c7	Merge branch 'hannibal/ui-change' into 'master' ... Change Other Players to Players See merge request veloren/veloren!3909	2023-05-02 18:35:28 +00:00
BigKhan	811061062a	Change Other Players to Players	2023-05-02 13:45:19 -04:00
Joshua Barretto	0f92f38967	Started adding wandering rtsim monsters	2023-05-01 18:29:32 +01:00
DaforLynx	7bf6df5ec1	Small music update	2023-04-29 05:34:28 +00:00
Marcel	0b9181ef56	Merge branch 'Terraaaagd/update-es_LA' into 'master' ... Terraaaagd/update Spanish Latino translation See merge request veloren/veloren!3878	2023-04-27 21:16:11 +00:00
Marcel	88b26e8db8	Merge branch 'tygyh/Update-swedish-translations' into 'master' ... Update swedish translations See merge request veloren/veloren!3858	2023-04-27 19:38:28 +00:00
Jonathan Berglin	d5a8829cfd	Update swedish translations	2023-04-27 19:38:28 +00:00
Marcel	53746e5a2c	Merge branch 'AMAIOLAMO/update-zh_CN' into 'master' ... Amaiolamo/update zh_CN translation See merge request veloren/veloren!3880	2023-04-27 10:24:30 +00:00
Marcel	bd2e211cbd	Merge branch 'walpo/update_es_es_translation' into 'master' ... Update the Spanish (Castilian) translation See merge request veloren/veloren!3896	2023-04-25 17:26:27 +00:00
walpo	ba70f72fb7	Update the Spanish (Castilian) translation	2023-04-25 17:26:27 +00:00
pegasus4903	534454cf05	Fix french errors	2023-04-22 19:17:05 +00:00
Isse	1494d93fc8	fix cloud tearing	2023-04-19 22:46:35 +02:00
Isse	1442dd29f1	fix NaN issue in apply_point_glow_light	2023-04-19 21:14:19 +02:00
Isse	4b831f884e	reduce the offset of clouds on the horizon	2023-04-19 21:01:30 +02:00
CxRedix	9a47ef63a6	Ability.ftl translation finished	2023-04-18 15:41:57 +08:00
CxRedix	1768be43d6	added the missing Guillotine ability translation	2023-04-18 14:58:02 +08:00
Christof Petig	025713e2c0	Merge branch 'christof/fix_orichalcum_drop' into 'master' ... introduce optional model indices for drop items as well (fixing orichalcum armor drops) See merge request veloren/veloren!3884	2023-04-17 07:07:40 +00:00
Christof Petig	4c1c84030f	introduce optional model indices for drop items as well (fixing orichalcum armor drops)	2023-04-16 22:56:04 +02:00
Julian Tölle	865b50fff2	rtsim: positive sentiment gain for killing enemies ... As per the age old saying: "the enemy of my enemy is my friend". NPCs will start liking the killer of their enemy more.	2023-04-16 18:08:09 +02:00
CxRedix	b24efdbcd7	reviewed and finalized some more translations	2023-04-16 16:49:09 +08:00
CxRedix	fe67ef86b0	made some skills & abilities consistent with the previous translator	2023-04-16 16:04:08 +08:00
CxRedix	7d5f15a5c9	finalized & added some translations in abilities.ftl to make them more easier to read	2023-04-16 15:51:55 +08:00
CxRedix	1ad0ec8c70	added some missing translation from 3 files: char_selection.ftl, common.ftl, gameinput.ftl	2023-04-16 14:36:26 +08:00
CxRedix	4d086bbbe6	added most of the new missing translations for buff.ftl	2023-04-16 14:33:29 +08:00
CxRedix	8141100cf6	added all new npc dialogue	2023-04-16 14:24:38 +08:00
CxRedix	c8b99c44c2	added most of the missing hud translations	2023-04-16 13:58:15 +08:00
CxRedix	0b6abe27f6	added abilities.ftl with most of the translation done	2023-04-16 13:57:31 +08:00
Terraaaagd	c1ecd16cba	Terraaaagd/update Spanish Latino translation	2023-04-15 22:08:23 -03:00
Corvella	0fe4bea421	Let women's voices be heard!	2023-04-15 07:24:59 +00:00
Joshua Barretto	504ea158d2	Merge branch 'zesterer/towns' into 'master' ... Improvements to towns and NPCs See merge request veloren/veloren!3867	2023-04-13 21:03:02 +00:00
Joshua Barretto	daacadaedb	Made NPCs give directions to nearby towns, fixed player death propagation	2023-04-13 14:34:31 +01:00
Joshua Barretto	2a1ea63910	Allow NPCs to migrate away from towns with a high population density	2023-04-13 12:00:59 +01:00
Imbris	b58a8a9ec3	Ensure in-world UI elements are snapped to pixel borders.	2023-04-13 00:10:12 -04:00
Samuel Keiffer	7aa43e9e8a	Merge branch 'taoist/better-dullahan' into 'master' ... taoist&floppy/cyclops&dullahan See merge request veloren/veloren!3859	2023-04-12 22:53:38 +00:00
Tao In Way	e32460f9ee	taoist&floppy/cyclops&dullahan	2023-04-12 22:53:38 +00:00
Joshua Barretto	cf701fb604	Localised rtsim NPC speech	2023-04-11 17:00:08 +01:00
Joshua Barretto	efbab102a5	Make LoD towns glow	2023-04-09 19:25:58 +01:00
flo	1cca6cfa74	fix_salamander tail_front offset	2023-04-09 10:46:57 +00:00
Imbris	54c39c03f7	Merge branch 'imbris/pixel-perfection-v2' into 'master' ... Move image scaling into the UI shaders rather than precomputing it on the CPU Closes #257 See merge request veloren/veloren!3573	2023-04-08 07:06:19 +00:00
Imbris	5881e44e61	Address review on 3573	2023-04-08 02:19:14 -04:00
Imbris	2a9a63a60e	Clippy fixes	2023-04-08 00:51:50 -04:00
Imbris	63096b2042	Complete GPU based alpha premultiplication impl and make the CPU version ... even faster. * GPU based version started in previous commit, but this fixes errors and bugs and gets it actually compiling and running. * Add a way to batch together images to use the same render pass for GPU premultiplication if they all target the same texture. * Pending premultiplication uploads are automatically done when calling `Drawer::third_pass`. * `fast-srgb8` dep removed, we no longer convert to `f32`s to do the premultiplication. Two `[u16; 256]` tables are combined to compute the alpa premultiplied color within the same error bounds used by the `fast-srgb8` crate. We also no longer use explicit simd. * Remove explicit lifetimes from `PlayState::render` since `&self` and `Drawer<'_>` don't need to have the same lifetime. * Fix existing bug where invalidated cache entries were never set to valid when reusing them. * `prepare_graphic` now runs some heuristics to determine whether premultiplication should be executed CPU side or GPU side and then returns a bool indicating if GPU premultiplication is needed.	2023-04-08 00:28:31 -04:00
Imbris	efd932c71e	Progress on GPU premultiplication. ... * General progress in setting up code paths to support GPU premultiplication. * Created `PremultiplyUpload` type to represent an initiated image upload where the premultiply pass needs to be ran to complete it. * Converted from compute pass to render pass since current limitations make it difficult to write directly to a srgb image from a compute shader. * Replace `CachedDetails::Immutable` with keeping track of the parameters used to create the texture (i.e. the border color). * Create `TextureRequirements`, `TextureParamters`, and `CacheKey` types to encode parameters that go into texture creation and image caching and to determine when the space in texture memory should be reused when replacing a graphic. * Add custom texture creation logic for the UI textures since those need certain usage combinations.	2023-04-08 00:28:31 -04:00
Imbris	1d51aae3b2	Start attempt to premultiply alpha on the GPU.	2023-04-08 00:28:31 -04:00
Imbris	eb6d16b02c	Rename draw_graphic -> prepare_graphic since it is no longer always ... specifically rendering an image at the provided dimensions. Start working on alpha premultipication which is necessary for being able to properly sample colors on the GPU with bilinear filtering. Various tweaks to comments and misc changes.	2023-04-08 00:28:31 -04:00
Imbris	69a1a661b6	fixes and tweaks (various minor changes related to UI image scaling on ... GPU)	2023-04-08 00:28:31 -04:00
Imbris	d62bf8a790	init (scaling UI images during sampling on the GPU instead of on the CPU)	2023-04-08 00:28:28 -04:00
Sam	4ec2798262	Fix velorite sprite offset	2023-04-06 10:57:19 -04:00
Sam	038929d66d	New models for ores and repair bench	2023-04-06 10:57:17 -04:00
Monty Marz	29a7520a48	adjusted death message, fixed repair bench text	2023-04-06 10:57:17 -04:00
Sam	a68ef7af30	Tweaks	2023-04-06 10:57:16 -04:00
Sam	e4ebd17363	Addressed feedback	2023-04-06 10:57:12 -04:00
Sam	ca879173be	Added a repair equipped and a repair all button. Cleaned up some hacks that used to exist.	2023-04-06 10:56:55 -04:00
Sam	658de93c59	Repairing UI	2023-04-06 10:56:53 -04:00
Sam	011b6c3feb	Changed how durability was persisted so that a more general system can be used for future item properties.	2023-04-06 10:54:49 -04:00
Sam	c3f5bc13f1	Equipment can now be repaired at sprites in town.	2023-04-06 10:54:48 -04:00
Sam	a555e08d0b	Added durability to item tooltips	2023-04-06 10:54:47 -04:00
Christof Petig	8d2b9b9a9c	single file orichalcum armor	2023-04-04 23:46:20 +02:00
Christof Petig	4da41b0dd0	move alchemist set to single file (with reduced hat size)	2023-04-04 23:46:20 +02:00
Christof Petig	e26cbffa0c	correct offsets from animation settings	2023-04-04 23:46:20 +02:00
Christof Petig	fb06bb651b	a single llama file (smaller)	2023-04-04 23:46:20 +02:00
Christof Petig	b1dc85dc0f	llama in one vox file	2023-04-04 23:46:20 +02:00
Joshua Barretto	b3cd1c1e56	Merge branch 'inventory-list' into 'master' ... Add a list mode to inventories to make it easier to see item names at merchants. See merge request veloren/veloren!3755	2023-04-04 16:54:15 +00:00
Marcel	914f93e18a	Merge branch 'tygyh/Update-swedish-translations' into 'master' ... Update swedish translations See merge request veloren/veloren!3847	2023-04-03 21:40:32 +00:00
Avi Weinstock	8facf7b58d	Add a list mode to inventories to make it easier to see item names at merchants.	2023-04-03 14:43:14 -04:00
Joshua Barretto	ab5561df61	Removed redundant things	2023-04-02 01:09:12 +01:00
Monty Marz	ca18da8061	UI tweaks	2023-04-01 21:54:48 +02:00
Joshua Barretto	9645172135	Slightly smoother FxUpscale	2023-04-01 18:06:20 +01:00
Joshua Barretto	19db823092	Proper next/prev site buttons	2023-04-01 12:34:58 +01:00
tygyh	dedf93c6ad	Fix issue #1758 for Swedish	2023-03-31 21:02:41 +02:00
tygyh	4067990847	Update swedish translations	2023-03-31 17:36:17 +02:00
Joshua Barretto	c28e61383d	Added target to starting site map	2023-03-31 16:25:24 +01:00
Joshua Barretto	acec45b756	Initial implementation of starting site choice	2023-03-31 14:24:14 +01:00
Monty Marz	d1a7884ac8	Merge branch 'more_spot_things' into 'master' ... grave models, spot fixes, sword overlay See merge request veloren/veloren!3842	2023-03-31 02:57:39 +00:00
Isse	c34e5ad4ed	Small fixes	2023-03-29 23:11:59 +00:00
Monty Marz	e4c5e50fb2	grave models, spot fixes, sword overlay	2023-03-29 13:10:49 +02: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	ac115055ac	Final icons	2023-03-21 20:18:34 -04:00
Sam	1301fff800	Agility stance ability icons.	2023-03-21 20:18:33 -04:00
Sam	8b0a59c0dd	Heavy stance ability icons.	2023-03-21 20:18:33 -04:00
Monty Marz	3e37586ba5	icons	2023-03-21 20:18:32 -04:00
Sam	4d0b192fbd	Icons for crippling stance abilities.	2023-03-21 20:18:32 -04:00
Monty Marz	3a3dc0d0f9	3 more icons	2023-03-21 20:18:31 -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	e37e4016d6	Balance tweaks	2023-03-21 20:10:44 -04:00
Monty Marz	cbbbab6bff	moar icons ... quickdraw icon	2023-03-21 20:10:43 -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	9ea70d71e5	more icons	2023-03-21 20:03:21 -04:00
Monty Marz	ca9fdfa291	more icons	2023-03-21 20:03:18 -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
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
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	6eedc02286	Changed character deletion to go via batch update	2023-03-12 23:21:53 +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
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
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	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	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
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
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
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
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
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
Monty Marz	a763a865fe	Musical Instruments part 2	2022-11-10 20:59:53 +00: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