4042 Commits

Author	SHA1	Message	Date
Maxicarlos08	0c9a942027	refactor teleporter system and include nearby pets	2023-08-15 12:24:49 +02:00
Maxicarlos08	92ab8dab9a	require interaction to start teleportation	2023-08-15 12:24:49 +02:00
Maxicarlos08	ac68f0af7b	addressed review comments and added hud interaction	2023-08-15 12:24:49 +02:00
Maxicarlos08	bb2034ca92	portal particles	2023-08-15 12:24:48 +02:00
Maxicarlos08	09f7087ac6	buildup time adjustments	2023-08-15 12:24:48 +02:00
Maxicarlos08	3343ddf4cc	go into blink state at half buildup time	2023-08-15 12:24:48 +02:00
Maxicarlos08	25fcb04ad3	buildup times and portal model update	2023-08-15 12:24:48 +02:00
Maxicarlos08	0f2db68498	added portals	2023-08-15 12:24:17 +02:00
Maxicarlos08	ed8fe545f8	Fixed temperate dungeon entrance height and wall artifacts around dungeons	2023-08-15 12:24:17 +02:00
Maxicarlos08	1ea0f249f5	display if pet is currently following or staying	2023-08-15 11:10:54 +02:00
TelepathicWalrus	4bdbb3ff6b	Move stay position to agent	2023-08-15 11:10:54 +02:00
TelepathicWalrus	e611d695b1	Add stay/follow option for pets	2023-08-15 11:10:52 +02:00
Gaxrodi	e54ca7e80d	ukrainian translation of all files	2023-08-14 21:54:31 +03:00
Gaxrodi	1c8d62f147	ukrainian translation of ability.ftl, trade.ftl	2023-08-12 13:17:33 +03:00
tygyh	67dcb2a778	Update swedish translations	2023-08-11 15:04:56 +02:00
Michal Sroczynski	3a6c3ac669	Small adjustments	2023-08-11 14:09:31 +02:00
Michal Sroczynski	daa1e1b00d	Small adjustments	2023-08-11 11:55:25 +02:00
Michal Sroczynski	c8feb568ba	Bosses loot overhaul p1	2023-08-11 09:47:13 +02:00
Youser Nayme	5ef300c72c	Add keybinding for zooming the camera	2023-08-10 16:55:09 +00:00
Michał	97725a3147	Reliable leather pack	2023-08-09 20:44:51 +00:00
Isse	58b541490b	Merge branch 'fix_sea_wyvern_head_offset' into 'master' ... fix sea wyvern head offset See merge request veloren/veloren!4059	2023-08-09 12:44:27 +00:00
Isse	d74a743d4f	update shovel voxel files to fit animations better	2023-08-08 20:44:37 +02:00
flo666	607af6f227	shovel sfx & particles	2023-08-03 21:52:55 +02:00
flo666	5f7895ffa0	wyverns: parallel loot drops - All()	2023-08-03 20:11:51 +02:00
Isse	5e225d7f35	add to changelog	2023-08-03 19:38:31 +02:00
Isse	a39923e4d6	digging shovel	2023-08-03 19:32:09 +02:00
flo666	9bd5003d31	fix sea wyvern head offset	2023-08-03 19:25:55 +02:00
UncomfySilence	4c953cd36a	teeny tweak	2023-08-02 22:53:49 +02:00
Michal Sroczynski	2c23781d22	Remove tiers from dungeons names	2023-08-02 18:48:01 +02:00
Michal Sroczynski	c1b8544065	Fix	2023-08-02 18:48:01 +02:00
Michal Sroczynski	4879f75069	Various loot changes	2023-08-02 18:47:59 +02:00
Michal Sroczynski	a577ed1d36	Changes to Gnarling Tree	2023-08-02 18:45:40 +02:00
Isse	b08b9cf8e8	Merge branch 'spawn_wyverns' into 'master' ... spawn wyverns See merge request veloren/veloren!3994	2023-08-02 07:55:10 +00:00
flo	57fe2c4adb	spawn wyverns	2023-08-02 07:55:10 +00:00
Michal Sroczynski	2805509c12	Brinestone armor recipe fix	2023-08-02 09:06:02 +02:00
DaforLynx	32f3437fb0	Combat music toggle	2023-07-30 08:10:36 +00:00
Sam	d2cbcbe698	Changelog and rebase fixes	2023-07-29 19:12:54 -04:00
Sam	4bc6d9a6dc	Added documentation	2023-07-29 19:04:44 -04:00
Sam	e3ad16ef47	Addressed review comments	2023-07-29 19:04:11 -04:00
Sam	d6fcd893bf	Addressed testing feedback	2023-07-29 19:04:10 -04:00
Sam	df0244c5e7	Balancing feedback	2023-07-29 19:04:09 -04:00
Sam	6e2dff7136	Weapon stats adjustments and ability icon revisions	2023-07-29 19:04:09 -04:00
Sam	30bafec247	Icons	2023-07-29 19:04:08 -04:00
Monty Marz	a4bfa1d242	skills_bg	2023-07-29 19:04:08 -04:00
Sam	9fa556b165	Axe AI	2023-07-29 19:04:07 -04:00
Sam	68181e9b5b	Axe skill tree	2023-07-29 19:04:06 -04:00
Sam	93ddb36c0a	Axe skill icons	2023-07-29 19:04:06 -04:00
Sam	834a811def	Buff icons	2023-07-29 19:04:05 -04:00
Sam	9b126dc502	Localization for english	2023-07-29 19:04:05 -04:00
Sam	27f590352f	Capsize	2023-07-29 19:04:04 -04:00
Sam	976ecaa0b6	Bulkhead	2023-07-29 19:04:04 -04:00
Sam	98f33f0633	Keelhaul	2023-07-29 19:04:03 -04:00
Sam	188be17b95	Defiance	2023-07-29 19:04:03 -04:00
Sam	c62626cec1	Plunder	2023-07-29 19:04:02 -04:00
Sam	820f8dca94	Sunder	2023-07-29 19:04:02 -04:00
Sam	daea14f8e5	Skull bash	2023-07-29 19:04:01 -04:00
Sam	9a6cb01da3	Fracture now scales with combo and consumes only half of combo	2023-07-29 19:04:01 -04:00
Sam	42e804578e	Riptide	2023-07-29 19:04:01 -04:00
Sam	41f69d28ac	Lacerate	2023-07-29 19:04:00 -04:00
Sam	35a05329fc	Fracture	2023-07-29 19:04:00 -04:00
Sam	a2deac19ee	Furor	2023-07-29 19:03:59 -04:00
Sam	1548db3760	Fierce raze	2023-07-29 19:03:59 -04:00
Sam	4b398fb1cf	Bloodfeast	2023-07-29 19:03:58 -04:00
Sam	1cc99c9c4a	Fixes to animations and making ability that the animation system thinks is being used more correct	2023-07-29 19:03:56 -04:00
Sam	38fb7b8cd5	Rake	2023-07-29 18:53:49 -04:00
Sam	ff15780c22	Maelstrom	2023-07-29 18:53:48 -04:00
Sam	0e771c9082	Execute	2023-07-29 18:53:48 -04:00
Sam	6f31067b1a	Adrenaline rush	2023-07-29 18:53:47 -04:00
Sam	4a690840e4	Savage sense	2023-07-29 18:53:47 -04:00
Sam	8c66bf8f70	Rising tide	2023-07-29 18:53:46 -04:00
Sam	af0a9ca3a4	Berserk	2023-07-29 18:53:46 -04:00
Sam	3bdde16881	Brutal swing	2023-07-29 18:53:45 -04:00
Sam	8ff7ee2819	Cleave	2023-07-29 18:53:45 -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
Neras	e72a8f2fcc	Nerasw/defensive stance tweaks	2023-07-28 21:29:32 +00:00
Michal Sroczynski	2c220e5548	Fix	2023-07-26 15:28:32 +02:00
Michal Sroczynski	ced87c08ec	Fix	2023-07-25 20:55:42 +02:00
Michal Sroczynski	ccd469cb0a	Potions fixes	2023-07-25 20:37:51 +02:00
Michal Sroczynski	74a0c9caa3	Revert "Potions fixes" ... This reverts commit 1a52c4d24d.	2023-07-25 20:03:56 +02:00
Michal Sroczynski	1a52c4d24d	Potions fixes	2023-07-25 17:28:21 +02: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
Marcel	90e33e96bd	Merge branch 'qsto/instruments-recipes-fix' into 'master' ... Instruments recipes fix See merge request veloren/veloren!4034	2023-07-23 21:45:56 +00:00
Michał	45170212c5	Instruments recipes fix	2023-07-23 21:45:54 +00:00
Michał	89ce7a5c3a	Wild cyclop loot fix	2023-07-23 21:33:18 +00:00
Michał	29a1a7050b	Loot, foods and salvage tweaks	2023-07-19 14:16:20 +00:00
Maxicarlos08	9901ba691e	fix alignment of wanderer's hat and a typo	2023-07-14 00:59:27 +02:00
Maxicarlos08	2cbb104243	Miner helmet migrations	2023-07-13 17:18:46 +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
Marcel	b79ef70a17	Merge branch 'consumable-improvements' into 'master' ... Small reduction of craftable consumables costs See merge request veloren/veloren!4011	2023-07-06 12:13:14 +00:00
Michał	a8ce3240c2	Loot changes	2023-07-06 12:11:28 +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
Michal Sroczynski	884b881b68	Small reduction of craftable consumables costs	2023-07-04 19:43:34 +02: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
Samuel Keiffer	7380b9b485	Merge branch 'wildlife_spawn_work' into 'master' ... wildlife_spawn_work See merge request veloren/veloren!3992	2023-07-03 23:21:56 +00:00
flo	3611fd2b3d	wildlife_spawn_work	2023-07-03 23:21:56 +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
Samuel Keiffer	272d57b4fa	Merge branch 'cyclops_and_dullahan_tweaks' into 'master' ... npc_attack_tweaks See merge request veloren/veloren!3969	2023-06-03 14:04:11 +00:00
flo	53288d0b22	npc_attack_tweaks	2023-06-03 14:04:10 +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
Joshua Barretto	4fa799e7c7	Fixed volume mount orientation	2023-05-25 03:16:27 +01:00
Joshua Barretto	f986e0793d	Better orientation, axels	2023-05-25 00:28:35 +01:00
Joshua Barretto	6a2796dc17	Everything damage	2023-05-25 00:28:35 +01:00
Joshua Barretto	8a8a5526f1	Added carriage	2023-05-25 00:28:28 +01:00
Joshua Barretto	a09dbf0396	Cleaned up and documented voxel collider code	2023-05-25 00:25:28 +01:00
Joshua Barretto	04687aa0b2	An underwater thing	2023-05-25 00:25:28 +01:00
Joshua Barretto	c2d04501fe	Better skiff	2023-05-25 00:25:28 +01:00
Joshua Barretto	3c1cfe574d	Added skiff	2023-05-25 00:25:28 +01:00
Joshua Barretto	74d4fc8e64	Added sprites to ship models	2023-05-25 00:25:28 +01: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
Joshua Barretto	52b5967914	Fix pet idle movement, add a way to configure agent behaviour through manifests	2023-05-16 18:51:46 +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
Sam	ca070f7ae8	Removed old tier-1 files	2023-05-13 09:32:29 -04: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	19b90d078a	rebase & fix pipeline	2023-05-13 09:32:25 -04:00
Sam	fd3c377d1c	Taught adlet elder how to use leap	2023-05-13 09:32:25 -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
taoist.way	b7c5c22070	mob creature tweaks	2023-05-13 09:32:23 -04:00
flo666	f66cc47554	- adlet melee tweaks ... - fix adlet elder shoot combomelee - adjust trap projectile mass	2023-05-13 09:32:23 -04:00
flo666	ed260f832d	add loot, reduce enemies	2023-05-13 09:32:21 -04:00
Sam	61272757fb	Fix rebase crash	2023-05-13 09:32:20 -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
Sam	8c3b1f23ee	Adlet elder AI	2023-05-13 09:31:31 -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
Sam	71d7a3b780	Ice creature AIs	2023-05-13 09:30:56 -04:00
flo666	c46ea4ae91	-add quadruped_medium/combomelee ... -frostfang ability_set	2023-05-13 09:30:55 -04:00
Sam	5a83f85779	Initial ice drake AI	2023-05-13 09:30:55 -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
flo666	c8bb0050ad	adlet npc work	2023-05-13 09:30:53 -04:00
Sam	2e9f1edef3	Adlet AI	2023-05-13 09:30:52 -04:00
flo666	ef5fe63bc2	tursus npc - add 2 abilities	2023-05-13 09:30:52 -04:00
Sam	680d987e11	Adlet hunter AI	2023-05-13 09:30:51 -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
Sam	76f4db6f70	Tweaked positioning of adlet sites	2023-05-13 09:30:14 -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
Joshua Barretto	b506fe3110	Minor price tweaks	2023-05-12 13:28:11 +01:00
Joshua Barretto	25441df7af	Made antlions less absurd	2023-05-12 12:34:55 +01:00
Marcel Märtens	3a19669d53	use workspace dependencies to make our life easier maintaining them :)	2023-05-10 18:16:25 +02: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	78dc394c48	use sitting animation by default when sprite mounted	2023-05-09 19:43:10 +02:00
Isse	e39790e9e4	make sprites work on multiple ships at once	2023-05-09 19:43:09 +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	7fbe2cd5ec	particles on volume	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
Sam	0ecf4fbe87	Dual wielding weapons of the same kind added as a context	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	6fe102b86d	Fixed cyclops loot table	2023-05-04 19:57:18 +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
Isse	ab4076518f	Add multiloot	2023-04-23 19:17:39 +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
Samuel Keiffer	f14d312ac3	Merge branch 'sam/durability-fixes' into 'master' ... Durability fixes See merge request veloren/veloren!3873	2023-04-15 18:03:18 +00:00
Corvella	0fe4bea421	Let women's voices be heard!	2023-04-15 07:24:59 +00:00
Sam	5ba2ebf6d5	Added repair recipes for twig armor sets.	2023-04-14 18:32:33 -04:00
Sam	985661b674	Added repair recipes for pickaxes and craftsman hammer	2023-04-13 21:19:09 -04: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	8249675a72	Made airship captains invincible	2023-04-13 18:32:04 +01: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
Joshua Barretto	2eaf3c7e92	Spawn dogs and cats in towns	2023-04-09 19:25:57 +01:00
Joshua Barretto	5aaee96cb1	Removed special-casing of merchants	2023-04-09 19:25:56 +01:00
Isse	adb2e1ba85	very simple repopulation	2023-04-09 19:25:55 +01:00
Isse	1a117f1331	rtsim vehicles	2023-04-09 19:25:54 +01:00
Joshua Barretto	077da13a5f	Improved herbalist, hunter, farmer, added cultist factions	2023-04-09 19:25:54 +01:00
IsseW	ca02b5e97c	cleaner entity creation	2023-04-09 19:25:52 +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	f7765a8471	Added some repair recipes for some missed items.	2023-04-06 10:57:15 -04:00
Sam	92165a8fd8	Repair recipes no longer show ingredients as required when they are not damaged enough to need any	2023-04-06 10:57:14 -04:00
Sam	6a8fc3a423	Tweaked repair recipes	2023-04-06 10:57:14 -04:00
UncomfySilence	3dae7b6d4a	small tweaks to repair recipe and addition of cultist, and uncraftable weapon repairs	2023-04-06 10:57:12 -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	536d88a2c7	Repair costs scale based on how damaged the item is.	2023-04-06 10:54:50 -04:00
UncomfySilence	85ceae3354	repair recipes for armor pieces	2023-04-06 10:54:50 -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	0966753699	Added repair recipes	2023-04-06 10:54:48 -04:00