2200 Commits

Author	SHA1	Message	Date
jshipsey	523a15e5cc	more spots	2021-09-04 00:18:58 -04:00
Marcel	ad5cb064e2	Merge branch 'juliancoffee/i18n_formatting' into 'master' ... (en) i18n cleaning See merge request veloren/veloren!2798	2021-09-01 22:47:36 +00:00
juliancoffee	f157f8efca	(en) i18n cleaning	2021-09-01 19:38:59 +03:00
Imbris	16e2550e46	Merge branch 'capucho/naga' into 'master' ... Replace shaderc with naga See merge request veloren/veloren!2749	2021-08-31 22:38:17 +00:00
João Capucho	446d93dda0	Replace shaderc with naga	2021-08-31 22:53:10 +01:00
Monty Marz	13c15b3840	fix witch hut smoke	2021-08-30 12:03:13 +02:00
Monty Marz	7ced7e184e	witch lantern	2021-08-28 14:53:31 +01:00
Monty Marz	a8aaeaebec	emergency single voxel window fix	2021-08-28 14:53:30 +01:00
Monty Marz	771a380e6c	witch stuff	2021-08-28 14:53:30 +01:00
Marcel	738136e70f	Merge branch 'alxly/update-ru_RU' into 'master' ... alxly/update-ru_RU: add ru_RU missed translations See merge request veloren/veloren!2757	2021-08-17 12:18:33 +00:00
AlxlY	4b62797f03	alxly/update-ru_RU: update translation for GPU profiler and mouse sensevity	2021-08-16 22:04:17 +02:00
Marcel	7158ae1936	Merge branch 'update_pt_BR_20210810' into 'master' ... update pt_br translation 2021_08_10 See merge request veloren/veloren!2753	2021-08-13 07:17:01 +00:00
Nícolas Wildner	dc4574aa49	update pt_br translation 2021_08_10	2021-08-13 07:17:01 +00:00
AlxlY	bd26d2ad2a	alxly/update-ru_RU: updated transation after review.	2021-08-12 00:16:45 +02:00
AlxlY	b8f37f474b	alxly/update-ru_RU: fix translation based on @CodeReview comments.	2021-08-11 13:37:05 +02:00
Marcel	0bedfde53e	Merge branch 'trade-window-improvements' into 'master' ... UI: Fixes and enhancements to the trading window See merge request veloren/veloren!2738	2021-08-11 09:25:17 +00:00
AlxlY	d47620959b	alxly/update-ru_RU: added proper translations after review. changed indentation to spaces	2021-08-11 00:48:48 +02:00
AlxlY	18a6ff3f31	alxl/update-ru_RU: add ru_RU missed translations	2021-08-10 23:36:02 +02:00
Samuel Keiffer	d5feca45c5	Merge branch 'pacmanmati/veloren-pacmanmati/1224-consolidate-redundant-stage-sections' into 'master' ... Consolidate redundant stage sections See merge request veloren/veloren!2748	2021-08-10 01:23:26 +00:00
Sam	2103abbb76	Fixed sfx file after consolidation.	2021-08-09 20:24:04 -04:00
Snowram	dddb47a385	Makes dungeons start at level 1 visually	2021-08-09 16:36:37 +02:00
Xeriab Nabil	8e7939a921	UI: Fixes and enhancements to trading window	2021-08-08 20:11:54 +03:00
juliancoffee	16c72b8667	Add hotkey to toggle Egui Debug	2021-08-06 22:58:36 +03:00
Xeriab Nabil	ea5de81f9b	UI: Fixes and enhancements to trading window	2021-08-06 17:11:54 +03:00
João Capucho	c4214fedbe	Don't use derivatives in vertex shader	2021-08-04 23:14:08 +01:00
Monty Marz	a1e22df944	Merge branch 'transp---opacity-in-UI' into 'master' ... transparency -> opacity See merge request veloren/veloren!2714	2021-08-02 21:30:37 +00:00
Monty Marz	bceed44614	transp -> opacity	2021-08-02 22:49:10 +02:00
Imbris	a1026c36f5	Make bloom intensity configurable, make whether less blurred layers are added in toggleable, hold onto copy of pipeline modes instead of returning it from pipeline creation	2021-08-01 18:50:39 -04:00
Imbris	6cabd74871	Make bloom optional with a config option that is not exposed in the UI (to give artists time to refine bloom before exposing the option)	2021-08-01 18:50:38 -04:00
Imbris	bfdee903dd	Add some of the changes from zesterer's patch including decreasing figure glow power, increasing glow of some particles, and fixing water normal normalization	2021-08-01 18:50:38 -04:00
Imbris	7da064fb23	Add ability to edit shader to enable filtering dim values for experimentation	2021-08-01 18:50:38 -04:00
Imbris	29bfee26c0	Add bloom passes in character select screen, use proper source image for bloom after clouds are applied, add blurred and less blurred stages of bloom together (experimental could remove), add filtering downsample pass that is not yet used	2021-08-01 18:50:37 -04:00
Imbris	74e01f10e3	Fixes and extra bloom	2021-08-01 18:50:37 -04:00
Imbris	2d83ef1c0e	Initial bloom impl	2021-08-01 18:50:37 -04:00
Marcel Märtens	5012e2ba8b	rename hud_settings to settings	2021-08-01 13:47:03 +02:00
Marcel Märtens	bb026ca21b	move vector map out of manifest and switch to new manifest format	2021-08-01 13:12:01 +02:00
Marcel Märtens	49072702bc	fix #1258	2021-08-01 11:20:51 +02:00
Marcel Märtens	2fd26bf41c	make folders POSIX style and move skills to hud	2021-08-01 10:56:10 +02:00
Joshua Barretto	f51c4ed860	Merge branch 'zesterer/menacing' into 'master' ... Added menacing, made agent code less hacky See merge request veloren/veloren!2707	2021-08-01 00:27:02 +00:00
Imbris	97e5ad02ff	Merge branch 'imbris/stamina-energy' into 'master' ... Replace stamina with energy Closes #1214 See merge request veloren/veloren!2704	2021-08-01 00:26:59 +00:00
João Capucho	82489782b4	Fix uniformity bug in ui shader	2021-07-31 21:34:29 +01:00
Joshua Barretto	422e1c30f4	Added menacing, made agent code less hacky	2021-07-31 20:33:28 +01:00
Monty Marz	f3d0d3f46a	fix i18n	2021-07-31 18:17:34 +02:00
Imbris	c5c8ae4d30	Replace stamina -> energy in english localization strings	2021-07-31 01:35:28 -04:00
Imbris	89eee332c9	Replace stamina -> energy in code, i18n keys, and asset names	2021-07-31 01:34:40 -04:00
Monty Marz	14eb0f9aa2	Remove sceptre, add swords	2021-07-29 22:38:35 +00:00
João Capucho	c56ecee988	Fix non uniform control flow in shader	2021-07-29 18:05:27 +01:00
Marcel	7ef11a41ef	Merge branch 'fungoid/add_fr_translation_for_gameinput.greet' into 'master' ... Added fr translation for gameinput.greet See merge request veloren/veloren!2685	2021-07-28 15:52:16 +00:00
Marcel	7a3755b7b0	Merge branch 'tygyh/Update-missing-swedish-translations' into 'master' ... Tygyh/update missing swedish translations See merge request veloren/veloren!2667	2021-07-27 11:14:52 +00:00
Jonathan Berglin	a564602495	Tygyh/update missing swedish translations	2021-07-27 11:14:52 +00:00
Nico Janzen	84b010f16f	Fix spelling errors in German translations	2021-07-27 11:06:22 +00:00
Alexis Maheu	9ed6abd3d7	Added fr translation for gameinput.greet	2021-07-26 20:29:30 -04:00
DanTheOne	18b5c1c35a	Add shortcut to toggle chat	2021-07-26 02:42:35 +02:00
juliancoffee	7386da743e	(uk_UA) address feedback	2021-07-24 18:34:57 +03:00
juliancoffee	2e72f5e1c2	(uk_UA) misc hud translation	2021-07-24 01:50:14 +03:00
juliancoffee	d1f9e34fc3	(uk_UA) force update	2021-07-24 01:13:50 +03:00
juliancoffee	0e3e3bef4e	(uk_UA) MEAT translation	2021-07-24 01:13:02 +03:00
juliancoffee	eb3dd0a812	(uk_UA) graphics settings translation	2021-07-24 00:26:38 +03:00
juliancoffee	70a390e1d2	(uk_UA) frozen outcome translation	2021-07-24 00:12:41 +03:00
juliancoffee	c55bcd3475	(uk_UA) gameinput.greet translation ... Здоровенькі були	2021-07-24 00:07:26 +03:00
juliancoffee	d0b15fa042	(uk_UA) update debuff translation	2021-07-24 00:03:34 +03:00
juliancoffee	a1bc725654	(uk_UA) update mining skills translation	2021-07-23 23:07:15 +03:00
juliancoffee	226dcb9f1a	(uk_UA) update healing aura skill translation	2021-07-23 22:44:14 +03:00
juliancoffee	5516e91cfe	(uk_UA) update bow skills translation	2021-07-23 22:18:49 +03:00
schnippl0r	342de16d2e	Added en and de_DE translations for gameinput.greet.	2021-07-20 21:59:18 +02:00
Snowram	09cbb90f61	Make the mounter animations dependant of the mountee animation	2021-07-18 15:03:57 -04:00
Joshua Barretto	2e6fcd1f37	Merge branch 'zesterer/better-sunsets' into 'master' ... More sunset variation for higher graphics modes See merge request veloren/veloren!2630	2021-07-18 00:59:22 +00:00
Joshua Barretto	7686023430	Merge branch 'aweinstock/hats' into 'master' ... Basic implementation of hat visuals. See merge request veloren/veloren!2485	2021-07-17 19:42:26 +00:00
Joshua Barretto	5bdea9249c	More sunset variation for higher graphics modes	2021-07-17 19:00:12 +01:00
Forest Anderson	54eb2a3ff7	Merge branch 'aylana/asp-sfx' into 'master' ... Princess-Lana - Add asp sound effects for the game See merge request veloren/veloren!2611	2021-07-17 01:49:20 +00:00
Avi Weinstock	13fc4de561	Add per-species head offsets.	2021-07-16 19:22:28 -04:00
Avi Weinstock	0a33c98268	Basic implementation of hat visuals.	2021-07-16 18:49:40 -04:00
Samuel Keiffer	f38cde9d40	Merge branch 'knightresspaladin/healing-aura' into 'master' ... Knightresspaladin/healing aura See merge request veloren/veloren!2587	2021-07-16 21:32:03 +00:00
Monty Marz	01c9d6d6d0	icon	2021-07-16 18:39:14 +02:00
Marcel	1aa816a780	Merge branch 'zesterer/sfx' into 'master' ... Clipped arrow sound effects for more immediate feedback See merge request veloren/veloren!2476	2021-07-16 10:32:29 +00:00
Aylana	a3da5b31d6	Add asp sound effects	2021-07-15 20:15:36 +02:00
Sam	997da21001	Particles for healing aura	2021-07-13 20:54:43 -05:00
Monty Marz	e379aacf8c	char selection frames, adjustments	2021-07-13 13:31:01 +02:00
Knightress Paladin	42c3872528	Added healing aura duration skill to voxygen UI	2021-07-10 20:02:36 -07:00
Szabó Lambert	0140e75ed4	Updating the Hungarian translation (minor changes in 6 files, major changes in 14 files)	2021-07-10 17:25:56 +00:00
Samuel Keiffer	351a68944b	Merge branch 'juliancoffee/skill_truth' into 'master' ... Move skill boost modifiers to skills module See merge request veloren/veloren!2540	2021-07-09 23:05:48 +00:00
Monty Marz	7c8d73a0c6	Minimap modes, Danari customizations update & bald hairstyles	2021-07-08 00:01:08 +00:00
juliancoffee	20c0c7f44f	Use code-spliced values for i18n skill description	2021-07-07 17:51:30 +03:00
Swagazaki	cb3e932832	Just updated common.ron to correct a few French translations!	2021-07-07 10:55:15 +00:00
Ács Zoltán	9fbd8ae5ce	Add Hungarian translation	2021-07-05 15:14:35 +02:00
Ács Zoltán	5f3251ce60	Add support for ő and ű to the haxrcorp font	2021-07-05 15:12:27 +02:00
Joshua Barretto	269c6171e4	Merge branch 'DaforLynx/aeh' into 'master' ... Sfx fixes and new test See merge request veloren/veloren!2529	2021-06-30 11:43:01 +00:00
DaforLynx	a757bf3dbd	Sfx fixes and new test	2021-06-30 11:43:00 +00:00
juliancoffee	21a29ecf74	Add CorruptionSpores ... - New lootable food which you can find as husk or darkhound drop	2021-06-30 03:33:06 +03:00
Sam	1978b590aa	Destringified consumables	2021-06-29 05:59:02 -05:00
Snowram	aaf5f89076	Merge branch 'snowram/death-outcome' into 'master' ... Adds an outcome to death with SFX and VFX See merge request veloren/veloren!2519	2021-06-28 23:18:45 +00:00
Snowram	3ec5306ed0	Adds an outcome to death with SFX and VFX	2021-06-29 00:14:05 +02:00
Imbris	20a9a420c6	Merge branch 'imbris/bind-order' into 'master' ... Ensure bind groups are ordered with the most frequently changed ones in later slots See merge request veloren/veloren!2496	2021-06-28 15:39:31 +00:00
Marcel	f063dcd939	Merge branch 'alphyr/assets_manager0_5' into 'master' ... Update `assets_manager` to 0.5 See merge request veloren/veloren!2501	2021-06-27 15:50:16 +00:00
Nícolas Wildner	81010e8465	Update pt br 20210627	2021-06-27 03:26:44 +00:00
Benoît du Garreau	1cba7db9b6	Update assets_manager to 0.5	2021-06-26 12:05:40 +02:00
Justin Shipsey	f983295318	Merge branch 'swilliams/jewellery' into 'master' ... Gem Rings and small change to trading. See merge request veloren/veloren!2500	2021-06-26 02:44:04 +00:00
Scott Williams	8d0a1ad7b4	Gem Rings and small change to trading.	2021-06-26 02:44:02 +00:00
Snowram	6e8daefa97	Merge branch 'snowram/new-npcs-batch' into 'master' ... Snowram/new npcs batch See merge request veloren/veloren!2495	2021-06-25 20:29:41 +00:00
Snowram	379e755006	Increases base damage of husk attack, rename some cultist weapons	2021-06-25 21:18:28 +02:00
Joshua Barretto	b66957bf74	Merge branch 'AldanTanneo/smooth-layers-shader-fix' into 'master' ... Fixes a block noise issue at specific layers (z=434 among others) See merge request veloren/veloren!2494	2021-06-25 12:43:27 +00:00
Snowram	d7f25627ab	Ajustments to new npcs	2021-06-24 19:31:21 +02:00
Snowram	8760b69345	Husk brute animations	2021-06-24 19:31:19 +02:00
Snowram	58b95d12d4	Adds alpaca and llama npcs	2021-06-24 19:30:15 +02:00
Snowram	fef0f407d3	Removes warlord and warlock armours	2021-06-24 19:30:11 +02:00
Snowram	87ca00fac0	Adds new species	2021-06-24 19:29:44 +02:00
juliancoffee	1eb9c165be	(uk_UA) small fitting fix	2021-06-24 19:52:38 +03:00
Imbris	58f237eaf5	Ensure bind groups are ordered with the most frequently changed ones in later slots	2021-06-24 00:47:59 -04:00
Sam	aac24ad601	Added ensnared debuff icon.	2021-06-23 22:38:16 -05:00
Sam	0a32b676c8	Vines now ensnare you by applying a buff.	2021-06-23 22:38:16 -05:00
Sam	ed503236d6	Slightly functional sprite summon.	2021-06-23 22:38:16 -05:00
AldanTanneo	f1b83962bd	Fixed smooth layer at z=434 (and a few other)	2021-06-23 21:13:15 +02:00
Joshua Barretto	b84708ca75	Added chat toggle	2021-06-21 20:16:03 +01:00
Joshua Barretto	8ab222bf80	Selectively disable glow flicker for small wins on low-end systems	2021-06-21 17:06:43 +01:00
Joshua Barretto	e41a62aadc	Clipped arrow sound effects for more immediate feedback	2021-06-18 16:01:00 +01:00
Joshua Barretto	05c375a8b0	Merge branch 'zesterer/meta' into 'master' ... Optimising for size See merge request veloren/veloren!2468	2021-06-18 12:35:16 +00:00
Joshua Barretto	f6d64a424f	Added JPEG backgrounds	2021-06-18 12:28:55 +01:00
Joshua Barretto	0265da1074	Added support for JPEG backgrounds	2021-06-18 12:27:39 +01:00
DaforLynx	c85238014a	More npc sfx	2021-06-18 06:24:57 +00:00
DaforLynx	9a5b95bc16	Added npc hurt sfx	2021-06-17 05:49:09 +00:00
jshipsey	0941f03608	buffs to stretch progression	2021-06-16 20:50:46 -04:00
Joshua Barretto	b8749dc219	Added more cow noises, prepare for merge	2021-06-16 17:23:54 +01:00
Joshua Barretto	9510869870	Significantly more efficient sound effect processing, more NPC sounds	2021-06-16 17:23:22 +01:00
Joshua Barretto	e3c44ba7fe	More voice kinds, more opportunities for sounds	2021-06-16 17:23:22 +01:00
Joshua Barretto	0ef29a6989	VoiceKind for better sound effect specs	2021-06-16 17:23:22 +01:00
Joshua Barretto	559311e1b0	Chasing sounds	2021-06-16 17:23:22 +01:00
K. Kisa	fbb34b7331	Veloren/veloren/master	2021-06-15 16:36:41 +00:00
Snowram	f2c7836161	Makes summon range inclusive	2021-06-15 09:49:13 +02:00
Snowram	97ce50e5d4	Add troll variants and roc npcs	2021-06-15 09:49:13 +02:00
Marcel	1b36f6cab3	Merge branch 'aweinstock/forcemove-no-pushback' into 'master' ... Don't apply e2e pushback during a forced movement character state. See merge request veloren/veloren!2429	2021-06-14 14:42:01 +00:00
Marcel	4cafdb3bfd	Merge branch 'aweinstock/mining-skill-tree' into 'master' ... Mining skill tree. See merge request veloren/veloren!2406	2021-06-14 14:19:06 +00:00
Marcel	0ef6cc6576	Merge branch 'Veloren_Kisa-master-patch-51169' into 'master' ... Не полный перевод навыков, исправлены оригинальные описания и названия. See merge request veloren/veloren!2432	2021-06-13 21:55:57 +00:00
Marcel	4ea189f056	Merge branch 'Veloren_Kisa-master-patch-14791' into 'master' ... Полный перевод на русский язык See merge request veloren/veloren!2434	2021-06-13 21:55:55 +00:00
Marcel	f791f19edb	Merge branch 'Veloren_Kisa-master-patch-17326' into 'master' ... Upload New File See merge request veloren/veloren!2435	2021-06-13 21:55:53 +00:00
Monty Marz	45f79059d0	mining exp sct color and icon; add mining to skill_preset	2021-06-13 14:34:42 -04:00
Monty Marz	01a04a80fa	icons and naming	2021-06-13 14:34:42 -04:00
Avi Weinstock	0e394029de	Mining skill tree.	2021-06-13 14:34:42 -04:00
K. Kisa	883297d4cc	Upload New File	2021-06-13 13:30:42 +00:00
K. Kisa	acb0589277	Полный перевод на русский язык	2021-06-13 13:24:57 +00:00
K. Kisa	2e305744fe	Не полный перевод навыков, исправлены оригинальные описания и названия.	2021-06-13 13:08:52 +00:00
Monty	c17e3ad996	Cactus Colada ... Made cacti lootable Cactus colada recipe and item price balance fmt "make it 8 and drop it to 20 or 25? Not really sure tbh"	2021-06-13 13:52:56 +02:00
Avi Weinstock	d02ff2db20	Don't apply e2e pushback during a forced movement character state.	2021-06-12 11:10:06 -04:00
João Victor Cardoso Kdouk	228d2f05a6	Small fixes to pt_br language.	2021-06-09 14:36:10 +00:00
Marcel Märtens	e96dc21d30	fix swedish ron files	2021-06-07 12:02:02 +02:00
Marcel	97b7c8d68a	Merge branch 'master' into 'master' ... Update Swedish translation See merge request veloren/veloren!2380	2021-06-07 09:42:09 +00:00
Sam	0488b2fcd0	Adressed comments on energy and armor functions.	2021-06-07 11:06:25 +02:00
Snowram	76ca99ece4	Derive str from Material, better deserialization	2021-06-07 11:03:50 +02:00
jshipsey	4deeb42155	cave adjustments	2021-06-07 11:02:34 +02:00
jshipsey	1d23b7aebf	finalize stats ... t	2021-06-07 11:02:03 +02:00
jshipsey	9034d0f25d	comment addressing, cave tweaks	2021-06-07 11:01:46 +02:00
jshipsey	0e269b59d7	tooltip work	2021-06-07 11:01:32 +02:00
jshipsey	5fdb2ac01d	migration	2021-06-07 11:01:04 +02:00
Snowram	29a38e6d4f	Split tags into material class and material	2021-06-07 11:00:57 +02:00
Snowram	3fa7d0b6d4	Add material and armor class tags	2021-06-07 11:00:31 +02:00
jshipsey	7a573efab7	proper recipes, tanning racks, various fixes	2021-06-07 11:00:14 +02:00
jshipsey	8acd3832e3	more loot tables, overworld ores, more items	2021-06-07 11:00:00 +02:00
jshipsey	05de96c94b	ore deposits, flower drops	2021-06-07 10:59:50 +02:00
jshipsey	1c17d8fe5e	cave changes	2021-06-07 10:59:44 +02:00
jshipsey	754b60d810	crafting stations	2021-06-07 10:59:35 +02:00
jshipsey	58bd51a9e8	icon work, more models	2021-06-07 10:58:27 +02:00
jshipsey	18e9b5b890	recipes, re-organization, cleanup	2021-06-07 10:58:05 +02:00
jshipsey	74fbe9a123	cloth/metallic armor	2021-06-07 10:56:54 +02:00
jshipsey	ffc9a0ae22	more drops, armors	2021-06-07 10:56:16 +02:00
jshipsey	f387b8d259	hides/leathers	2021-06-07 10:56:04 +02:00
jshipsey	451ccf8d73	more meat	2021-06-07 10:55:50 +02:00
jshipsey	ca907f1b87	added some meat	2021-06-07 10:55:34 +02:00
Monty	336d83fc49	new bgs	2021-06-06 19:30:37 +02:00
Marcel	521e1eacf3	Merge branch 'aweinstock/add-models-20210603' into 'master' ... Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty. See merge request veloren/veloren!2371	2021-06-06 16:56:21 +00:00
hqurve	39fc48ac17	Widened recipe list in crafting menu and added quality indicators to names in the list	2021-06-06 15:55:11 +00:00
Filip Bengtsson	172c96d83d	Missed strings	2021-06-06 17:48:09 +02:00
Snowram	edfe713076	Cyclops, basilisk, air balloon offsets	2021-06-06 14:12:08 +02:00
Filip Bengtsson	cba9affbb3	Strings in various files	2021-06-06 01:05:08 +02:00
Filip Bengtsson	fcc266bfa8	Translate trade.ron	2021-06-06 00:42:50 +02:00
Filip Bengtsson	1b6c43dfe2	Translate social.ron	2021-06-06 00:42:07 +02:00
Filip Bengtsson	3e37549518	Translate sct.ron	2021-06-06 00:40:30 +02:00
Filip Bengtsson	5191a90432	Translate misc.ron	2021-06-06 00:39:55 +02:00
Filip Bengtsson	3cbf362462	Translate hud/map.ron	2021-06-06 00:34:06 +02:00
Filip Bengtsson	28c44b6bb9	Translate hud/hud_setting.ron	2021-06-06 00:32:16 +02:00
Filip Bengtsson	12ba5e1848	Translate hud/group.ron	2021-06-06 00:07:53 +02:00
Filip Bengtsson	1841923795	Translate hud/crafting.ron	2021-06-06 00:07:03 +02:00
Filip Bengtsson	f9e42f4107	Translate hud/chat.ron	2021-06-06 00:06:05 +02:00
Filip Bengtsson	10ac6b3d4c	Translate hud/char_window.ron	2021-06-06 00:00:51 +02:00
Filip Bengtsson	fd608ccb6f	Translate hud/bag.ron	2021-06-05 23:39:24 +02:00
Filip Bengtsson	f111b87fe5	template.ron boilerplate	2021-06-05 23:33:54 +02:00
Filip Bengtsson	6277106e78	Start translating skills.ron	2021-06-05 23:25:11 +02:00
Filip Bengtsson	cf051fd9fb	Translate main.ron	2021-06-05 23:13:42 +02:00
Filip Bengtsson	37c12977c1	Translate most of gameinput.ron	2021-06-05 23:08:59 +02:00
Filip Bengtsson	cb0f00d447	Translate esc_menu.ron	2021-06-05 23:04:55 +02:00
Filip Bengtsson	35f7c206e5	Translate most of common.ron	2021-06-05 23:03:48 +02:00
Filip Bengtsson	8db65e0554	Translate char_selection.ron	2021-06-05 22:45:55 +02:00
Filip Bengtsson	d663d05f4f	Translate buff.ron	2021-06-05 22:28:01 +02:00
Filip Bengtsson	d0bb260057	Translate _manifest.ron	2021-06-05 14:26:00 +02:00
Filip Bengtsson	6df35564c2	Copy files from English	2021-06-05 13:26:41 +02:00
Sam	93f90d514c	Particles for ice spikes	2021-06-04 18:17:15 -05:00
Sam	81f7e690fd	Snowball attack.	2021-06-04 18:17:15 -05:00
Sam	a82984b925	Added base ability set	2021-06-04 18:17:14 -05:00
Sam	eaf87a53bb	Final tweaks.	2021-06-03 21:39:47 -05:00
Sam	5bf99eac11	Added totem ability, totem ai, totem ability set, particles for totem abilities, and totem voxel model.	2021-06-03 21:39:15 -05:00
Sam	c81e1534f7	First 3 abilities for tidal warrior functional. Added bubble particles.	2021-06-03 21:39:13 -05:00
Avi Weinstock	05c699878f	Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty.	2021-06-03 19:24:34 -04:00
Imbris	2b8eaae572	Update wgpu, cleanup a bit of commented shader code, improve sprite LOD selection code	2021-06-03 00:10:06 -04:00
Imbris	01aa6af1fd	Address various TODOs introduced in wgpu transition	2021-06-03 00:10:06 -04:00
Imbris	8403e4c483	address/remove TODOs, fix comment typos, enable wgpu/trace feature by default (So no recompile is needed to collect an API trace)	2021-06-03 00:10:06 -04:00
Avi Weinstock	cf6717ac90	Show hitbox cylinders based on actual ECS data, and add a settings toggle in voxygen for it.	2021-06-03 00:10:06 -04:00
Avi Weinstock	7b04599a3b	Implement a Debug pipeline for hitboxes and pathfinding lines. ... - Implements mesh generation for cylinders and lines. - Implements an Id-allocator so that clients can mutate positions efficiently. - Is split into pipeline and scene modules. - Contains simple shaders that just pass through a position and color.	2021-06-03 00:10:06 -04:00
Imbris	b84c8b2915	Remove weird syntax in cloud shader that was probably introduced when switching to textureLod	2021-06-03 00:10:06 -04:00
Imbris	5749983868	Make shadow vert shaders always contain their content but ensure they are never used when shadow maps are disabled, remove uneeded shadow frag shader	2021-06-03 00:10:06 -04:00
Imbris	d7683673ee	Properly account for negative sun_dir.z in pow use in sky shaders	2021-06-03 00:10:06 -04:00
Imbris	d8520c8743	Add localization text for GPU timing checkbox	2021-06-03 00:10:06 -04:00
Imbris	9ec4fd5b4b	Remove commented out sprite code, including the code for getting verts for sprites with a texture rather than a storage buffer	2021-06-03 00:10:06 -04:00
Imbris	9be424de53	Remove unused waves texture	2021-06-03 00:10:05 -04:00
Imbris	7f9ba17dee	Remove unused shadow bind group from the cloud pipeline	2021-06-03 00:10:05 -04:00
Imbris	77689d1420	Comment out lod depth tweaks not designed for reverse depth, convert waves image to rgba before constructing a texture, misc fix after rebase	2021-06-02 23:59:50 -04:00
Synis	c7cab3e19e	Fix missing include	2021-06-02 23:59:50 -04:00
Imbris	086ea42ad7	Cloud and sprite shader fixes after rebase	2021-06-02 23:59:50 -04:00
Imbris	aa1e292b03	Fix dx12 shader issues	2021-06-02 23:59:50 -04:00
Imbris	577caa3047	Implement screenshots	2021-06-02 23:59:50 -04:00
Imbris	64398f6c0a	Try out using storage buffer for sprite vertices	2021-06-02 23:59:50 -04:00
Imbris	b9931588e4	Fix bugs with sprite rendering	2021-06-02 23:59:50 -04:00
Imbris	a90373604e	Fix sprite vertex lookup, normalize sprite ... normals in vert shader	2021-06-02 23:59:50 -04:00
Imbris	8d63446300	Almost implement instance merging for sprites (validation error), rebase ... fix	2021-06-02 23:59:50 -04:00
Imbris	0f1c4080c4	Start sprite refactor	2021-06-02 23:59:49 -04:00
Imbris	ad2b6c9014	Fix texture sampling syntax	2021-06-02 23:59:49 -04:00
Imbris	a8851b6561	Switch to index rendering for most quad-like things	2021-06-02 23:59:49 -04:00
Imbris	e1af485e5f	Add setting for the PresentMode	2021-06-02 23:59:49 -04:00
Imbris	2f69c41b00	fix nametag depth culling as well as a tweak to maybe make the main menu not flicker on intel iGPU	2021-06-02 23:59:49 -04:00
Imbris	261fd24dfd	Fix lod alt texture filtering	2021-06-02 23:59:49 -04:00
Imbris	c532f50e64	Remove wgpu patch/update wgpu, rebase fixes, remove use of deprecated ... vek functions for left, right, up, down, forward_rh, forward_lh	2021-06-02 23:59:49 -04:00
Joshua Yanovski	93568754a0	Inverse depth planes. ... Also added a function that has extensive details about what the projection options mean, and set our near plane much closer (0.25 to 0.0625) and far plane much farther (100000.25 to 524288.0625). In the future we may completely remove the far plane (opting for an infinite one) and may possibly improve accuracy elsewhere using analysis of other floating point values.	2021-06-02 23:59:48 -04:00
Joshua Yanovski	adf3f83b4b	Fix point shadows.	2021-06-02 23:59:48 -04:00
Joshua Yanovski	868293a802	More frustration with shadows.	2021-06-02 23:59:48 -04:00
Joshua Yanovski	c97a42fdb7	Various fixes for shadows.	2021-06-02 23:59:48 -04:00
Capucho	23f1144fe2	Fix the shadow drawing code ... Very poorly optimized	2021-06-02 23:59:48 -04:00
Capucho	b6c37be299	Re enable sprite rendering	2021-06-02 23:59:48 -04:00
Imbris	97bed5752b	Fix clouds	2021-06-02 23:59:48 -04:00
Imbris	f30588ea94	Fix flipping in post-processing stages and precompute the uv in those in the vert shader	2021-06-02 23:59:48 -04:00
Imbris	bae0310cc7	Somewhat fix lod, prevent particles spamming new buffers when disabled	2021-06-02 23:59:48 -04:00
Imbris	553c1c18a9	Add skybox	2021-06-02 23:59:48 -04:00
Capucho	1083d04c73	Reenable terrain rendering ... Refractor col lights	2021-06-02 23:59:48 -04:00
Capucho	0db2a35955	Fix the orientation of the rendering ... Reenable the rendering of the player	2021-06-02 23:59:47 -04:00
Capucho	1668e834f8	Renable the figure and terrain drawing code (not working yet)	2021-06-02 23:59:47 -04:00
Capucho	4c83e19c83	Remove the depth buffer from the Third drawer	2021-06-02 23:59:47 -04:00
Capucho	2c7d49b69f	Shader fixes	2021-06-02 23:59:47 -04:00
Imbris	da0423ab2a	Almost make clouds/postproccess run	2021-06-02 23:59:47 -04:00
Imbris	124d69d7ad	Render Ui	2021-06-02 23:59:45 -04:00
Imbris	97ca278d89	fixed validation errors when creating pipelines	2021-06-02 23:56:43 -04:00
Imbris	f540366676	Made shaders compile by adding locations and bindings and splitting textures and samplers out into two things and adding guards for double including shaders	2021-06-02 23:56:43 -04:00
Avi Weinstock	6d3dcc3835	Address MR 2301 review comments. ... - Replace tabs with spaces in map-related i18n. - Use `retain` in `remove_unloaded_chunks`.	2021-06-02 00:39:58 -04:00
Avi Weinstock	cbe7521259	Add toggle for minimap, fix scaling formula, reduce minimap VD for better performance, and add changelog entry.	2021-06-02 00:39:04 -04:00
Adam Whitehurst	77cb2ae783	fix: commas	2021-05-30 14:47:42 -07:00
Adam Whitehurst	9eefa89f90	feat: add frozen debuff icon, en strings	2021-05-30 08:49:32 -07:00
Justin Shipsey	d7c7f6bf5d	Merge branch 'sam/rework-bow' into 'master' ... Bow Rework See merge request veloren/veloren!2310	2021-05-26 04:44:09 +00:00
juliancoffee	940655dcb6	Adding different chests for each dungeon	2021-05-24 23:00:44 +03:00
hqurve	854930bc1a	Item pickups are shown in separate window and "inventory-full" messages are shown above the item attempted to be picked up	2021-05-22 20:47:08 +00:00
Sam	7828112486	Balance tweaks.	2021-05-22 15:00:05 -05:00
Illia Denysenko	1b5f06cff9	update uk ua	2021-05-22 18:58:11 +00:00
Sam	1014ac45bf	Made new skills for reworked bow. ... Created migration to reset bow skills.	2021-05-22 12:33:21 -05:00
Monty Marz	30bcc6aaa3	Ferocious armour for t5-dungeon minibosses	2021-05-22 10:55:36 +00:00
Samuel Keiffer	a0599ac046	Merge branch 'sam/extra-equip-slots' into 'master' ... Added Extra Loadout Slots See merge request veloren/veloren!2295	2021-05-21 20:28:53 +00:00
hqurve	6974ab9199	Added swap_equipped_weapons icon and resized inactive weapons	2021-05-17 15:35:27 -04:00
Nícolas Wildner	68f3359238	Update pt br 20210517	2021-05-17 18:12:20 +00:00
hqurve	a4384b81c7	Add offhand weapons to bag ui	2021-05-16 20:43:19 -04:00
Marcel	740ec3208d	Merge branch 'xMAC94x/czech' into 'master' ... add czech language. fixed #1044 Closes #1044 See merge request veloren/veloren!2297	2021-05-16 16:39:51 +00:00
Marcel	695ffa96b9	Merge branch 'juliancoffee/update-it_IT' into 'master' ... update Italian translation by 'Чингис Хан' See merge request veloren/veloren!2305	2021-05-14 15:35:05 +00:00
juliancoffee	776f772b58	update Italian translation by 'Чингис Хан'	2021-05-14 17:31:01 +03:00
Marcel	7d5ca0e7bf	Revert "Merge branch 'snowram/hacky-mount' into 'master'" ... This reverts merge request !2219	2021-05-14 13:43:20 +00:00
Marcel	7fe0db2261	Merge branch 'snowram/hacky-mount' into 'master' ... Allow for collars to make QuadMed npcs mountable See merge request veloren/veloren!2219	2021-05-14 12:27:19 +00:00
hqurve	95a6e35a3a	Added chat tabs	2021-05-14 12:27:15 +00:00
Snowram	8745fb803a	Use Body to determine mountee offsets	2021-05-14 00:11:54 +02:00
Marcel Märtens	962f8b982c	add czech language. fixed #1044	2021-05-12 22:36:11 +02:00
Sam	7acd953923	Changed particles to a switch statement.	2021-05-10 19:58:32 -05:00
jshipsey	770d07ac90	anims	2021-05-10 18:54:03 -05:00
Snowram	47a2bf7de8	Adds haniwa sentry object	2021-05-10 18:53:48 -05:00
Sam	5fa4358e74	Clay golem attacks done.	2021-05-10 18:53:01 -05:00
Monty Marz	fab3794bf3	Fix 1h-axes	2021-05-10 20:44:09 +00:00
Monty Marz	a17bb0ad73	Better inactive/active audio slider logic	2021-05-09 09:51:41 +00:00
Snowram	ad3a63fc80	Merge branch 'snowram/craftmats-ron-fix' into 'master' ... Fixes object manifest See merge request veloren/veloren!2273	2021-05-07 21:06:37 +00:00
Nícolas Wildner	f517b06d50	Update pt br 20210507	2021-05-07 20:07:14 +00:00
Snowram	ec3fa365d0	Fixes object manifest	2021-05-07 22:04:57 +02:00
Snowram	831bfd0be9	Snowram/craft mats	2021-05-07 17:03:45 +00:00
Illia Denysenko	07ba3e659d	Update uk_UA	2021-05-07 14:32:03 +00:00
Sam	062c290e49	Made buff commands exhaustive	2021-05-04 09:54:28 -04:00
Sam	d99623b298	Buff icons	2021-05-04 08:45:14 -04:00
Sam	2652660a58	Addressed comments and more testing feedback.	2021-05-04 08:45:14 -04:00
Sam	5c241850f1	Added sfx. Addressed comments.	2021-05-04 08:45:12 -04:00
Sam	164fd0de04	Particles for frenzy buff and ground cleave.	2021-05-04 08:45:10 -04:00
jshipsey	c886accaf1	anims	2021-05-04 08:45:08 -04:00
Sam	d1139c3b7c	Added frenzy ability to minotaur. ... Added self-buff character state. Added frenzied buff kind. Added better comments on each buff kind.	2021-05-04 08:45:07 -04:00
Illia Denysenko	f04a4f907a	Add possibility to translate buff outcomes	2021-05-03 23:02:59 +00:00
Avi Weinstock	be39054767	Make terrain compression a checkbox instead of a bandwidth (throughput?) heuristic.	2021-05-03 00:09:44 -04:00
James Melkonian	f553700e8c	Add map markers for lakes and mountains	2021-05-03 02:00:23 +00:00
Joshua Barretto	d0953fcab0	Added map marker	2021-05-01 16:26:13 +00:00
Jan Dre	8f5370f372	German translation	2021-04-30 11:58:31 +00:00
DaforLynx	7334cce426	Poise (stun) SFX and fix for town music	2021-04-29 23:36:22 +00:00
Sam	91bb6392bb	Removed old 2h variants of 1h weapons.	2021-04-29 13:18:04 -04:00
DaforLynx	2e0272ce28	Town music	2021-04-28 05:07:59 +00:00
Marcel	aa963493e8	Merge branch 'james/sound-unwraps' into 'master' ... Remove an unwrap and move outcome sfx to ron See merge request veloren/veloren!2206	2021-04-27 21:01:06 +00:00
James Melkonian	2f00af83d8	Remove an unwrap and move outcome sfx to ron	2021-04-27 21:01:06 +00:00
Marcel	876686893b	Merge branch 'duelsik/translations-PL-27-04-2021' into 'master' ... Polish translations update. See merge request veloren/veloren!2205	2021-04-27 20:54:48 +00:00
Daniel Mizerski	ec55c176fe	Polish translations update.	2021-04-27 17:33:30 +02:00
Ludvig Böklin	34660462e9	Glider physics	2021-04-27 14:41:48 +00:00
Samuel Keiffer	3f451ef7b3	Merge branch 'juliancoffee/fix_campfire_heal_message' into 'master' ... Fix campfire heal buff description See merge request veloren/veloren!2165	2021-04-25 23:06:48 +00:00
Illia Denysenko	efd54021a7	Fix campfire heal buff description	2021-04-25 23:06:47 +00:00
Joshua Barretto	559e16e035	Apply flat earth hack to mist	2021-04-25 23:28:19 +01:00
Joshua Barretto	3e4afc5a45	Capped light access	2021-04-25 22:49:20 +01:00
Joshua Barretto	98f660e486	More realistic cloud light extinction model	2021-04-25 22:26:07 +01:00
Joshua Barretto	fa262d2a5c	Fixed near cloud bug	2021-04-25 20:04:00 +01:00
Monty	2e24fcf165	Add i18n, change SCT Blocked col and string	2021-04-25 13:09:09 -04:00
Sam	d2d8d43410	Addressed testing feedback. ... Particles better.	2021-04-25 13:09:08 -04:00
alfy	73cb6d19ff	Fixed the sounds since they were seemingly empty, as well as a new more organic wind sound	2021-04-25 13:09:06 -04:00
alfy	9f79c80072	block and parry sounds added	2021-04-25 13:09:06 -04:00
Snowram	8f54a0bf31	More phoenix AI work ... More phoenix AI work	2021-04-25 04:07:12 +02:00
Snowram	8cf8e51962	Phoenix npc + AI (WIP)	2021-04-25 04:07:11 +02:00
Snowram	ab26efa970	Improves bird_large anims	2021-04-25 04:07:09 +02:00
Snowram	fd177c9669	Breathe and stun anims	2021-04-25 02:14:50 +02:00
Snowram	eb98360183	Cockatrice bird_large conversion	2021-04-25 02:14:50 +02:00
Snowram	bc95484863	Swaps bird_small skeleton to a new bird_large	2021-04-25 02:14:49 +02:00
Ada Lovegirls	01c30868eb	Add option to load English string as fallback if string missing	2021-04-24 14:39:35 +00:00
Ben Wallis	c6205875ee	Merge branch 'xvar/server-version-check' into 'master' ... Added client/server version mismatch warnings See merge request veloren/veloren!2184	2021-04-24 09:05:45 +00:00
Ben Wallis	2e08c2f76f	Added client/server version mismatch message when a network error is encountered during client init. ... Added warning banner on character select when successfully connected to a server with a mismatched version.	2021-04-24 09:08:30 +01:00
holychowders	516f2fec4a	Fix grammatical error in NPC message	2021-04-23 22:43:37 -07:00
Illia Denysenko	4e7aba5b3f	update uk_UA localization	2021-04-23 21:30:46 +00:00
Nícolas Wildner	6188bb9e96	update pt_br 20210422	2021-04-23 01:00:41 +00:00
Monty Marz	b69eb61e7b	Add handles to lanterns, fix cooking pot scale	2021-04-22 17:12:07 +00:00
Joshua Barretto	19184a49a7	Made the pit of tartarus less bad	2021-04-21 22:18:44 +01:00
Joshua Barretto	81ba200e48	Improve dynamic light reflection for hill climbing	2021-04-21 17:10:53 +01:00
Monty	a1b4e0bdaf	remove old craftsman hammer, add migration	2021-04-20 03:34:11 +02:00
Joshua Barretto	11ba02130c	Made sprite/block selection effect more subtle	2021-04-20 02:46:07 +02:00
Joshua Barretto	483276b082	Made sprite/block selection effect more subtle	2021-04-20 02:46:06 +02:00
Monty	a4d56e7843	more sprite stuff and crafting UI update ... fix item images fix CR display	2021-04-20 02:46:06 +02:00
Monty	a1fe7c12c3	fmt, add sprites	2021-04-20 02:46:04 +02:00
Joshua Barretto	c5455fa1a1	Merge branch 'zesterer/small-fixes' into 'master' ... Small fixes See merge request veloren/veloren!2163	2021-04-19 21:54:26 +00:00
Joshua Barretto	4ad5257e40	Rebalanced mist	2021-04-19 22:26:56 +01:00
Joshua Barretto	86287e8f0a	Fixed negative cloud density bug	2021-04-19 22:02:47 +01:00
Imbris	8c9d4dc3dd	Merge branch 'capucho/inactive-master' into 'master' ... Lower volume of window on focus loss See merge request veloren/veloren!2150	2021-04-19 20:39:49 +00:00
Marcel	c5caec4921	Merge branch 'capucho/map-kb-zoom' into 'master' ... Add keybindings for map/minimap zoom See merge request veloren/veloren!2161	2021-04-19 19:52:27 +00:00
João Capucho	164411cb43	Voxygen: Added translations for map zoom	2021-04-19 20:27:02 +01:00
Marcel	3c3aa3d325	Merge branch 'juliancoffee/update-uk_UA' into 'master' ... Update localization for uk_UA See merge request veloren/veloren!2155	2021-04-19 19:26:20 +00:00
Illia Denysenko	ef8926bc5c	Update localization for uk_UA	2021-04-19 19:26:20 +00:00
João Capucho	f23b515dd8	Voxygen: Add master volume sliders to the settings	2021-04-19 19:58:14 +01:00
Joshua Barretto	f0f3da529b	Fixed water shader, sky shader	2021-04-19 14:42:49 +01:00
Sam	ce7581037c	Overhauled dash melee.	2021-04-18 18:36:12 -04:00
Samuel Keiffer	60d38cc03b	Merge branch 'aweinstock/dodgesplosion' into 'master' ... Unlock dodge roll iframes and staff explosion by default. See merge request veloren/veloren!2146	2021-04-18 20:46:15 +00:00
Avi Weinstock	0404250300	Unlock dodge roll iframes and staff explosion by default.	2021-04-18 16:16:06 -04:00
Marcel	62fcdcd998	Merge branch 'nwildner/update_pt_BR_20210417' into 'master' ... update pt_br 20210417 See merge request veloren/veloren!2143	2021-04-18 19:33:39 +00:00
Nícolas Wildner	24b55d0f07	update pt_br 20210417	2021-04-18 19:33:39 +00:00
Ben Wallis	a4cdb89987	Implemented inventory sorting	2021-04-17 22:04:08 +01:00
Marcel	2a0c8e575f	Merge branch 'kinggred-master-patch-80352' into 'master' ... Update main.ron See merge request veloren/veloren!2123	2021-04-17 18:28:31 +00:00
Samuel Keiffer	a1d9ba15d9	Merge branch 'DaforLynx/normalize' into 'master' ... Normalize + shrink all sfx; tweaks to combat music; change footstep sounds See merge request veloren/veloren!2120	2021-04-16 00:35:15 +00:00
DaforLynx	f441c8c206	Normalize + shrink all sfx; tweaks to combat music; change footstep sounds	2021-04-16 00:35:13 +00:00
Samuel Keiffer	c962c5f12e	Merge branch 'gGmMsS/Burning' into 'master' ... Added burning debuff for Staff M2 See merge request veloren/veloren!2134	2021-04-15 23:51:33 +00:00
gGmMsS123	e33961e1fa	M2 Staff Final Touch	2021-04-16 00:34:24 +03:00
gGmMsS123	0d956610ec	Added burning debuff for Staff M2	2021-04-15 23:34:28 +03:00
Avi Weinstock	2fb7575d60	Address MR 2126 comments.	2021-04-15 15:17:39 -04:00
Avi Weinstock	50d0314a75	Add a toggle to negotiate the use of server-authoritative physics.	2021-04-15 08:50:17 -04:00
Stanisław Grupiński	fd7bf41678	Update main.ron	2021-04-14 12:40:02 +00:00
jshipsey	ea9b871374	loot tables, clippy, animation tweaks	2021-04-13 20:18:59 -04:00
jshipsey	9a26024acb	alpha attacks	2021-04-13 20:18:59 -04:00
jshipsey	b53e1653f6	initial wield testing	2021-04-13 20:18:58 -04:00
Yuri Socher Bichibichi	c6dea3acca	Updates the Brazilian Portuguese (pt-BR) translation	2021-04-13 11:56:58 -03:00
Samuel Keiffer	e1020945dd	Merge branch 'aweinstock/combat-music' into 'master' ... Add combat music transitions based on number of enemies in player radius. See merge request veloren/veloren!2077	2021-04-12 06:01:19 +00:00
Marcel	e4a67a9ba2	Merge branch 'juliancoffee/update-uk_UA' into 'master' ... Update localization for Ukrainian See merge request veloren/veloren!2107	2021-04-12 02:28:56 +00:00
Illia Denysenko	4ac8015ed9	Update localization for Ukrainian	2021-04-12 02:28:55 +00:00
Avi Weinstock	df4f44d946	Address MR 2077 review comments.	2021-04-11 22:08:42 -04:00
Avi Weinstock	7c34a96934	Make fade timings configurable, and stop combat music on death.	2021-04-11 22:08:41 -04:00
Avi Weinstock	f1b022cdee	Add new version of combat soundtrack, and change details of how transitions between tracks work.	2021-04-11 22:08:41 -04:00
Avi Weinstock	5bfdd5f1af	Add combat music transitions based on number of enemies in player radius.	2021-04-11 22:08:40 -04:00
Marcel	54024ce401	Merge branch 'DaforLynx/more-music' into 'master' ... Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds See merge request veloren/veloren!2102	2021-04-12 00:43:08 +00:00
DaforLynx	9db290d4ea	Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds	2021-04-12 00:43:08 +00:00
Marcel	5e7adc6767	Merge branch 'trade-help-tooltips' into 'master' ... Show ctrl-click and shift-click usage in item tooltips during trades. See merge request veloren/veloren!2101	2021-04-11 22:56:03 +00:00
Rickey Chamblee	8a25ebb59a	Show ctrl-click and shift-click usage in item tooltips during trades.	2021-04-11 22:56:02 +00:00
Marcel	d7a9ab7e23	Merge branch 'master' into 'master' ... Update and fix zh_CN See merge request veloren/veloren!2103	2021-04-11 22:56:00 +00:00
law4x	4403cd71a5	Update and fix zh_CN	2021-04-11 22:55:59 +00:00
Marcel	eca27a30b5	Merge branch 'danielduel/PL-local' into 'master' ... Add/Extend PL locale See merge request veloren/veloren!2091	2021-04-11 22:55:58 +00:00
BuildTools	c4294d968d	Add/modify Polish translations	2021-04-11 19:10:09 +02:00
Vincent Foulon	a2e92c6715	add new loader + move some images	2021-04-11 16:35:25 +02:00
Snowram	52a53963ec	Lossless compression of UI assets	2021-04-11 16:35:25 +02:00
Vincent Foulon	95f69fea36	remove unused images	2021-04-11 16:35:23 +02:00
Vincent Foulon	2097fbcacd	optimized all images	2021-04-11 16:35:23 +02:00
Vincent Foulon	7128c3d3f6	Asset reorganization + removed some unused and duplicates + reduce size of some images	2021-04-11 16:35:17 +02:00
Monty Marz	6772e71aaa	UI fixes and more	2021-04-11 03:49:47 +00:00
Marcel	99e494976d	Merge branch 'ccm7676/lang_bug_fix' into 'master' ... fixed the Select a Language text on languages where it was broken See merge request veloren/veloren!2089	2021-04-10 15:47:28 +00:00
Marcel	e6683bb764	Merge branch 'juliancoffee/uk_UA-localizaion' into 'master' ... Update localization files for Ukrainian See merge request veloren/veloren!2090	2021-04-10 14:54:13 +00:00
Illia Denysenko	4717ad25a8	Update localization files for Ukrainian	2021-04-10 14:54:12 +00:00
Marcel	12c3ee440e	Merge branch 'MigraineX/update-es-ES' into 'master' ... Updated the Spanish (ES) translation See merge request veloren/veloren!2094	2021-04-10 14:20:40 +00:00
MigraineX	07fd6f16f8	Updated the Spanish (ES) translation	2021-04-10 14:31:57 +02:00
Joshua Yanovski	af94753ad9	Remove panics and unwraps, part 1. ... Also fixes various other miscellaneous bugs.	2021-04-10 10:03:21 +02:00
Carl Marino	d2151ad76c	fixed the Select a Language text on languages where it was broken	2021-04-09 18:39:53 +02:00
hqurve	be42cc60c4	Added search to crafting and social windows, added i18n support to crafting tabs, fixed social window offset when group open, removed tabs in social window	2021-04-07 20:24:22 +00:00
Vincent Foulon	5e23c164e6	Add missing translations + Add "enemy_killed" text for villagers	2021-04-07 13:26:15 +02:00
James Melkonian	16871208f2	Add topographic option to map	2021-04-06 09:16:17 -07:00
Marcel	187a85e056	Merge branch 'renamenorsk_norskbokmål' into 'master' ... Rename Norsk to Norsk bokmål See merge request veloren/veloren!2064	2021-04-06 11:37:54 +00:00
Kim André Moen Bjørkede	2380f9e8c2	Rename Norsk to Norsk bokmål	2021-04-06 11:37:51 +00:00
Marcel	2ed85a2dc0	Merge branch 'tonyvu0605/VietTranslation' into 'master' ... Started Vietnamese Translation See merge request veloren/veloren!2059	2021-04-06 10:48:03 +00:00
Joshua Barretto	de9ad0942f	Merge branch 'zesterer/follow-cam' into 'master' ... Added auto camera setting See merge request veloren/veloren!2071	2021-04-06 04:23:40 +00:00
Samuel Keiffer	3c50321a80	Merge branch 'sam/consolidate-roll' into 'master' ... Flattened roll progression. See merge request veloren/veloren!2073	2021-04-06 03:31:46 +00:00
Samuel Keiffer	f79493f7d0	Merge branch 'sam/sceptre-nerfs' into 'master' ... Sam/sceptre nerfs See merge request veloren/veloren!2072	2021-04-06 02:41:56 +00:00
Joshua Barretto	60e2ed3e7d	Added auto camera setting	2021-04-05 23:24:31 +01:00
Sam	ba0b6c309b	Flattened roll progression.	2021-04-05 17:50:53 -04:00
Sam	a7e39bc8c9	Nerfs	2021-04-05 17:38:52 -04:00
theCow61	b99c02401d	Change to auto walk/glide.	2021-04-05 16:07:17 -05:00
Marcel	88079cfd30	Merge branch 'japanese' into 'master' ... Add Japanese message translation See merge request veloren/veloren!2049	2021-04-05 13:38:30 +00:00
Monty Marz	06bbb7f0ff	Crafting Tabs and more item tags	2021-04-04 13:02:27 +00:00
DaforLynx	6734198104	Adds on-hit combat sfx	2021-04-04 03:04:02 +00:00
tonyvu0605	e0dbd5566d	Started Vietnamese Translation	2021-04-03 22:17:57 -04:00
Samuel Keiffer	8d9f63404e	Merge branch 'sam/combat-ratings' into 'master' ... Tweaks to Combat Rating Calculation See merge request veloren/veloren!2051	2021-04-03 17:33:34 +00:00
Sam	ca1a93ba21	Actually committed bone staff fix.	2021-04-03 10:26:32 -04:00
Justin Shipsey	debf88e42f	Merge branch 'vfoulon80/refine-item-icons' into 'master' ... Refine some item icons See merge request veloren/veloren!2045	2021-04-03 11:19:36 +00:00
Snowram	9a3f6d8261	Substitutes DPS for CR in item tooltip	2021-04-03 00:10:31 -04:00
Sam	27f178286d	Removed all rng matches in code to determine loot tables, and moved to loot tables specific for each sprite, creature, or dungeon.	2021-04-02 23:24:55 -04:00
Jun NOGATA	129a3de2eb	Add Japanese message translation	2021-04-03 01:50:10 +09:00
Vincent Foulon	62b2ad80fb	Refine Sewing Set	2021-04-02 18:19:39 +02:00
Vincent Foulon	49be1fd70c	Refine some item icons	2021-04-01 21:46:57 +02:00
Vincent Foulon	dcde8df365	address review comments	2021-04-01 19:13:08 +02:00
Vincent Foulon	c2a8feada5	Add dialogue when the Merchant is busy and randomize some trading dialogues	2021-03-31 19:06:41 +02:00
Snowram	4128f7fe45	Merge branch 'snowram/new-weapons-fix' into 'master' ... Fix a staff icon, some offset fixes, lower wolf spawn rate See merge request veloren/veloren!2025	2021-03-30 01:04:37 +00:00
Snowram	606dd64741	Fix a staff icon, some offset fixes, lower wolf spawn rate	2021-03-30 00:27:03 +02:00
Joshua Barretto	8f3233365d	Improved hit particles	2021-03-29 21:52:05 +01:00
Joshua Barretto	b0acbda236	Improved archery with feedback sfx and particles	2021-03-29 21:52:04 +01:00
Snowram	6adaac8106	Addresses comments	2021-03-29 18:35:12 +02:00
Snowram	b8ac90d049	Changelog, cleanup, clippy	2021-03-29 18:35:10 +02:00
Snowram	508e35ca17	Add several new i18n lines	2021-03-29 18:34:45 +02:00
Snowram	aa71dcb9c7	Make the new tooltip item specific	2021-03-29 18:34:45 +02:00
Sam	f6e4626887	Fix emerald sceptre. Remove duplicate asset.	2021-03-28 21:19:01 -04:00
Snowram	c8e191e138	Merge branch 'snowram/new-scepters-starves' into 'master' ... Add new batch of starves and scepter (by Gemu) See merge request veloren/veloren!2022	2021-03-29 00:08:19 +00:00
Snowram	5295894105	Add new batch of starves and scepter (by Gemu)	2021-03-29 01:27:55 +02:00
Joshua Barretto	b660c53b4c	Revert to old sky colours for no clouds	2021-03-28 17:07:41 +01:00
Joshua Barretto	34a7667410	Toned down aurora	2021-03-28 17:07:41 +01:00
Joshua Barretto	f16c2b8b4c	Made clouds adjust to world dimensions correctly	2021-03-28 17:02:17 +01:00
Joshua Barretto	d8117b3b3d	Make caves and rtsim entities scale with map size, more cloud detail	2021-03-28 17:02:16 +01:00
Joshua Barretto	0bed52f63c	Properly simulate atmospheric scattering	2021-03-28 17:01:53 +01:00
Joshua Barretto	d53042c852	Client-side time of day interpolation	2021-03-28 17:01:53 +01:00
Joshua Barretto	19ef00085d	Softer and faster clouds with more verticality	2021-03-28 17:01:51 +01:00
Monty	345ef1ca22	decay display for groups and overhead bars	2021-03-27 21:05:17 -04:00
jshipsey	558c82ee54	flayer anims	2021-03-27 21:05:16 -04:00
Monty Marz	345b725478	decayed health texture	2021-03-27 21:05:14 -04:00
Monty Marz	cc70560027	WIP animation	2021-03-27 21:05:13 -04:00
Sam	50e832b6d0	Mindflayer summons husks instead of dogs now	2021-03-27 21:05:10 -04:00
Snowram	39c8efe11f	Adds husk npc	2021-03-27 21:05:09 -04:00
Sam	f1156c9ce5	Added necrotic vortex attack to mindflayer	2021-03-27 21:05:03 -04:00
Sam	0d3795112c	Added cursed flame attack to mindflayer	2021-03-27 21:05:03 -04:00
Scott Williams	9ca0388561	Character Creation Randomization Fix	2021-03-27 15:58:34 +00:00
aljazerzen	0ea102dc9c	refactor handling of duplicate login	2021-03-25 12:33:56 +01:00
Lippy13	ff2583b3b9	Add missing seashells to the sprite manifest	2021-03-25 04:37:27 +00:00
Avi Weinstock	4ec6b43693	Add a vertical camera clamp option and toggle to voxygen.	2021-03-23 18:22:32 -04:00
Joshua Barretto	7ae4230dc8	Merge branch 'zesterer/pick' into 'master' ... Pickaxe See merge request veloren/veloren!1959	2021-03-22 00:19:42 +00:00
Joshua Barretto	6ea5aa796b	Faster pick, less vibrant block selection	2021-03-21 20:38:08 +00:00
Marcel	983523c463	Merge branch 'vfoulon80/climbing-skill' into 'master' ... Add climbing speed and cost See merge request veloren/veloren!1950	2021-03-21 18:35:44 +00:00
Joshua Barretto	347e1022a0	Initial implementation of pickaxe	2021-03-21 16:09:16 +00:00
Vincent Foulon	e06870702f	Add skill for swimming speed	2021-03-21 15:58:38 +01:00
Vincent Foulon	985c26dd0a	improve climbing icon	2021-03-21 13:26:44 +01:00
Vincent Foulon	71d3bf5821	fix typo in sceptre aura skill	2021-03-20 22:12:43 +01:00
Vincent Foulon	8ef30dd2f3	fix one line from custist_alarm vector	2021-03-20 20:53:27 +01:00
Vincent Foulon	d4fbc78d06	Translate cultist_alarm in FR	2021-03-20 17:37:59 +01:00
Vincent Foulon	d0aa68a9d2	Add climbing speed and cost	2021-03-20 17:17:28 +01:00
Snowram	cb3bf0c884	Fix a missing dwarf hairstyle	2021-03-19 12:45:08 +01:00
Snowram	e5afb2fcf7	Various visual fixes	2021-03-18 22:53:06 +01:00
Sarra	eaaf65127d	cleaning up some tools	2021-03-18 22:52:50 +01:00
Sarra	d1e16a2a00	tweaking glow and shine	2021-03-18 22:52:40 +01:00
Marcel	9c95e971f2	Merge branch 'vfoulon80/loading-animations' into 'master' ... Add new random loading animations See merge request veloren/veloren!1931	2021-03-18 02:28:34 +00:00
DaforLynx	fbf4defa04	Adds sfx for Sceptre aura	2021-03-17 23:54:49 +00:00
Vincent Foulon	eafa69ee4c	allow loading animations to be contributed from a manifest file	2021-03-17 23:41:28 +01:00
Vincent Foulon	62b945dab1	Add new random loading animations	2021-03-17 18:15:25 +01:00
Marcel	6e6878ca9e	Merge branch 'tormeh/add-monologue-strings' into 'master' ... Add monologue strings. See merge request veloren/veloren!1925	2021-03-17 08:45:27 +00:00
Marcel	684789c886	Merge branch 'vfoulon80/fr-skills' into 'master' ... [FR] translate skills.ron + missing keys See merge request veloren/veloren!1901	2021-03-17 01:25:12 +00:00
Vincent Foulon	6b0028907d	[FR] translate skills.ron + missing keys	2021-03-17 01:25:11 +00:00
Tormod G. Hellen	f695b11171	Add monologue strings.	2021-03-17 01:58:12 +01:00
Monty Marz	e9cbac387e	new loading bg, staff models ... item images fix paths loot tables, adjustments Update main.ron	2021-03-16 23:23:24 +00:00
James Melkonian	6ea43cfd75	Various RtSim and Agent Interaction Fixes	2021-03-16 01:30:35 +00:00
Imbris	a558d42da7	Merge branch 'snowram/new-npcs' into 'master' ... Snowram/new npcs See merge request veloren/veloren!1896	2021-03-15 00:10:46 +00:00
DaforLynx	f924e047ac	Renamed 'Upscale Factor' to 'Internal Resolution' as per what was decided in #981	2021-03-14 12:18:29 -07:00
Snowram	60dd47cdea	Theropod charge attack	2021-03-14 18:10:40 +01:00
PersianKnight	b87514266d	Bug fix debug info hotkey and axe skill tree text	2021-03-14 20:16:54 +03:30
Snowram	9d7e8957bb	Add new npcs	2021-03-14 14:24:35 +01:00
DaforLynx	99261bf105	Many small changes to audio code, mainly sfx - changelog in MR	2021-03-12 15:00:09 -08:00
jshipsey	49f496e290	intitial values	2021-03-12 00:58:12 -05:00
Marcel	93cab075f8	Merge branch 'xMAC94x/non_blocking_register' into 'master' ... Auth requests are now done async, the register system is fetching it, via a PendingLogin component See merge request veloren/veloren!1875	2021-03-11 21:51:55 +00:00
Joshua Barretto	a9bcaf0a37	Merge branch 'PersianKnight/Reset_to_Defaults_Buttons' into 'master' ... Add Reset to Default Buttons for Interface, Gameplay and Sound Settings See merge request veloren/veloren!1877	2021-03-11 21:29:11 +00:00
PersianKnight	3b3ffe30e9	Add Reset to Default Buttons for Interface, Gameplay and Sound Settings	2021-03-11 22:09:30 +03:30
Joshua Barretto	f479231b15	Merge branch 'glowy-shiny-pretty' into 'master' ... Glowy shiny pretty See merge request veloren/veloren!1874	2021-03-11 17:37:33 +00:00
Samuel Keiffer	9b198b5cda	Merge branch 'sam/sceptre-overhaul' into 'master' ... Overhaul sceptre Closes #768 See merge request veloren/veloren!1845	2021-03-11 16:47:50 +00:00
Marcel Märtens	728bff610b	Allow HTTP auth servers again. ... only `localhost` are allowed in a release build. when debug assertions are on, others are also allowed. This change undoes the changes to the settings, so compared to master, there is no effect	2021-03-11 17:24:52 +01:00
Marcel Märtens	a98e72c391	Auth requests are now done async, the register system is fetching it, via a PendingLogin component ... The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without. correct is now `auth.veloren.net` incorrect is: `https://auth.veloren.net`	2021-03-11 17:05:02 +01:00
Joshua Barretto	6e0807f3f5	Cheaper and less broken material reflection/glow	2021-03-11 13:56:11 +00:00
omm	ef7b215f07	File structure for lang es_ES aligned with EN	2021-03-11 12:08:37 +00:00
Joshua Barretto	d1b58ebb36	More reflective weapons	2021-03-10 18:59:04 +00:00
Joshua Barretto	09e32cb952	Initial implementation of glow/shininess	2021-03-10 18:58:25 +00:00
Sam	de5ef03ac4	Auras will now refresh buffs if a buff was already present that had a lesser duration. ... Attack effects can now have multiple requirements. Fix for sceptre heal not requiring energy. Nerfed warding aura protection. Added icon for warding aura. Changelog.	2021-03-09 18:03:06 -05:00
Sam	16222948a3	Sceptre skill tree and migration.	2021-03-09 18:02:07 -05:00
Sam	d711c77468	Aura particles.	2021-03-09 17:59:45 -05:00
Monty Marz	935aec743d	cleanup, icons	2021-03-09 17:59:45 -05:00
Sam	cb1b26d717	Beam particle tweaks	2021-03-09 17:59:43 -05:00
Monty	49fcd6ee13	adjusted combo counter anim	2021-03-09 17:59:43 -05:00
Sam	398370ca51	Changed lifesteal beam particles to look better. ... Warding aura now just provides damage reduction instead of invulnerability. Also with a longer duration and less movespeed penalty.	2021-03-09 17:59:41 -05:00
Sam	c6a222340e	Particles for lifesteal beam. Changed how frontend recognized beams.	2021-03-09 17:59:39 -05:00
Marcel	ee0ab197da	Merge branch 'updated_spanish_es_strings' into 'master' ... Updated strings Added missing translations in Spanish es_ES and retrieving localized text See merge request veloren/veloren!1866	2021-03-09 12:59:03 +00:00
tukilo	cea895ea24	Updated strings Added missing translations in Spanish es_ES and retrieving localized text	2021-03-09 12:30:53 +01:00
Adam Blanchet	16b66f9cd6	Add reset button to graphics settings	2021-03-08 18:48:38 +01:00
Marcel	e29964ead1	Merge branch 'sarrakitty/fireworks' into 'master' ... added a white firework See merge request veloren/veloren!1856	2021-03-07 18:37:35 +00:00
Joshua Barretto	36d20e6990	Better docs, faster terrain meshing	2021-03-07 14:25:07 +00:00
Joshua Barretto	9910398917	Fixed snow biome trees	2021-03-07 14:25:07 +00:00
Joshua Barretto	0cbdc2b1b7	Better tree names	2021-03-07 14:25:07 +00:00
Joshua Barretto	db573f6b2d	Turn giant trees into proper sites	2021-03-07 14:25:07 +00:00
Monty	b6ac4e46fb	tree icon UI works and hover icon	2021-03-07 14:25:07 +00:00
Joshua Barretto	a54a3da102	Added tree map icon	2021-03-07 14:25:05 +00:00
Joshua Barretto	d4ce69df99	Static light flickering	2021-03-07 14:25:02 +00:00
Joshua Barretto	1d16f14dd5	Small fixes	2021-03-07 14:25:02 +00:00
Joshua Barretto	331375fd8f	Adjusted static lighting	2021-03-07 14:25:02 +00:00
Joshua Barretto	fe2479ee4c	Better LoD water prediction	2021-03-07 14:25:01 +00:00
Monty	8214c9df82	PoI icon	2021-03-07 14:25:01 +00:00
Joshua Barretto	31832e1245	Fixed wall leaking with dynamic light ambiance	2021-03-07 14:25:01 +00:00
Joshua Barretto	aabe1d7cfd	Point light ambiance for less harsh shadows	2021-03-07 14:25:01 +00:00
Joshua Barretto	100cafa91b	Directional baked lights for figures	2021-03-07 14:25:01 +00:00
Joshua Barretto	0c302bb020	Lanterns in trees	2021-03-07 14:25:01 +00:00
Joshua Barretto	185b1c3053	Specialised giant trees	2021-03-07 14:25:01 +00:00
Joshua Barretto	7d526da735	Experimental giant mother trees	2021-03-07 14:25:01 +00:00
Sarra	db3bc1b9bb	added a white firework	2021-03-07 03:48:50 -05:00
Imbris	e724ac072e	Merge branch 'sarrakitty/fireworks' into 'master' ... made firework explosions colorful See merge request veloren/veloren!1851	2021-03-05 17:48:56 +00:00
Snowram	e2d4799f7d	Merge branch 'vfoulon80/convert-fr-translations' into 'master' ... Split the french translation into multiple files See merge request veloren/veloren!1672	2021-03-05 12:23:08 +00:00
Vincent Foulon	6e66cecce7	Split the french translation into multiple files	2021-03-05 12:23:08 +00:00
Sarra	4284ce0411	made firework explosions colorful	2021-03-05 01:22:29 -05:00
Marcel	cb305536e8	Merge branch 'vfoulon80/skilltree-icons' into 'master' ... implement the new skilltree icons See merge request veloren/veloren!1794	2021-03-04 18:37:33 +00:00
Vincent Foulon	fb953cc7f4	implement the new skilltree icons	2021-03-04 18:37:32 +00:00
Snowram	2b7b9f887b	Fixes leather sets	2021-03-02 19:28:29 +01:00
Justin Shipsey	9ad8804b60	Merge branch 'armor-org' into 'master' ... armor org See merge request veloren/veloren!1835	2021-03-02 01:29:46 +00:00
jshipsey	308045cfc9	final asset corrections, fix glider anim	2021-03-01 17:37:47 -05:00
Samuel Keiffer	0497a437a4	Merge branch 'sam/invulnerability-buff' into 'master' ... Invulnerability Buff Closes #965 See merge request veloren/veloren!1834	2021-03-01 05:46:46 +00:00
jshipsey	8944115f8e	more asset organization	2021-02-28 22:18:43 -05:00
Samuel Keiffer	537efdd47e	Merge branch 'aweinstock/trade-requestitem' into 'master' ... During a trade, allow requesting items from the counterparty's inventory... See merge request veloren/veloren!1829	2021-03-01 02:39:36 +00:00
Sam	6ab4e2264e	Buff icon	2021-02-28 17:31:35 -05:00
Sam	531c38c3ad	Factored formatting of buff text out to a single function.	2021-02-28 16:04:33 -05:00
Imbris	b7bd0306e6	Merge branch 'Lerg/Issue_#976' into 'master' ... Issue #976 Some inputs are missing the ability to be rebound See merge request veloren/veloren!1832	2021-02-28 18:23:30 +00:00
Justin Shipsey	13df691f69	Merge branch 'heydabop/966-controller-y-invert' into 'master' ... #966 - Setting to invert controller Y axis See merge request veloren/veloren!1817	2021-02-28 18:02:04 +00:00
Lerg	94bd1f2605	Issue #976 Some inputs are missing the ability to be rebound because they are missing from the input iterator	2021-02-28 19:02:32 +03:00
Avi Weinstock	7e458ecd40	During a trade, allow requesting items from the counterparty's inventory (prequisite for NPC trading).	2021-02-28 10:13:49 -05:00
Monty Marz	e5273e3a8e	reroute the F1 key to open the controls settings, removed loading screen tips about levels and the stats button	2021-02-27 19:02:26 +00:00
jshipsey	16720a6826	weapon/manifest tweaks	2021-02-27 10:44:55 -05:00
jshipsey	0a353576dc	address comments	2021-02-27 01:42:47 -05:00
Snowram	17112926e7	Adds harvester npc	2021-02-27 01:42:47 -05:00
jshipsey	51bc74b2a5	visual weapon variation, adjust minotaur dash, keyframed golem quake	2021-02-27 01:42:47 -05:00
jshipsey	16a44cd532	minotaur moves, added claygolem	2021-02-27 01:42:47 -05:00
jshipsey	e06ebf3507	initial balance	2021-02-27 01:42:47 -05:00
Snowram	858fbe1a6c	Adds yeti npc	2021-02-27 01:42:46 -05:00
Snowram	1b9815dc34	Adds 3 new npcs, tusk ram new design	2021-02-27 01:42:46 -05:00
Sam	53b0ba286a	Ice particles for Wendigo	2021-02-27 01:42:46 -05:00
jshipsey	ce3b2141e1	theropod retrofit, some more moves	2021-02-27 01:42:46 -05:00
jshipsey	5792faa992	some new moves, combine biped weapons into one file	2021-02-27 01:42:46 -05:00
jshipsey	57d5e90ddd	full bipedsmall armor swaps	2021-02-27 01:42:46 -05:00
Sam	df70976ff5	Fixed particles.	2021-02-27 01:42:46 -05:00
jshipsey	cb59c8017e	anim tweaks, more loadout setup	2021-02-27 01:42:46 -05:00
Timo Kösters	a4513fe09d	Improve particles	2021-02-27 01:42:46 -05:00
jshipsey	aa4237b019	BL improvements, various fixes	2021-02-27 01:42:45 -05:00
jshipsey	0dc8b2e482	rendering	2021-02-27 01:42:45 -05:00
jshipsey	ca3248cc93	new dungeon setups, new npcs, weapon specific loadouts, anims	2021-02-27 01:42:45 -05:00
jshipsey	ac16a8900d	bow	2021-02-27 01:42:45 -05:00
jshipsey	66664f3f89	the stabs	2021-02-27 01:42:45 -05:00
jshipsey	6a57dd25d0	wielding	2021-02-27 01:42:45 -05:00
jshipsey	31208e29ee	run anim tweaks	2021-02-27 01:42:45 -05:00
unknown	559ece5ede	More npcs work	2021-02-27 01:42:45 -05:00
unknown	6f18d16aa2	Add new quadmeds npcs with rough offsets	2021-02-27 01:42:44 -05:00
Snowram	f48fea57f4	Sahagin, Adlet npcs	2021-02-27 01:42:43 -05:00
jshipsey	7cf723bb9d	gnome	2021-02-27 01:42:43 -05:00
jshipsey	266986626d	biped_small setup	2021-02-27 01:42:43 -05:00
Snowram	1172c2f2c3	Merge branch 'Sarrakitty/OceanFlora' into 'master' ... added coral reefs, kelp forests, and seagrass See merge request veloren/veloren!1819	2021-02-27 01:52:33 +00:00
Sarra	02eb76416f	tweaking coral models and seagrass spawns	2021-02-25 23:39:41 -05:00
Samuel Keiffer	8e07174c1d	Merge branch 'aweinstock/coin-item' into 'master' ... Add a coin item and make amounts visible on dropped items. See merge request veloren/veloren!1821	2021-02-26 04:17:12 +00:00
Avi Weinstock	7d2e8f72eb	Add a coin item and make amounts visible on dropped items.	2021-02-25 21:31:30 -05:00
Sarra	1d4b8d4d99	correcting formatting and removing commented out code that wasn't supposed to be there	2021-02-25 20:41:57 -05:00
Snowram	2bab3cdced	Fixes weapons model and icon offsets	2021-02-26 02:37:59 +01:00
Sarra	f39f5ab5d3	added coral reefs, kelp forests, and seagrass	2021-02-25 05:33:18 -05:00
Sam	017e037e69	Weapon offsets in humanoid manifest	2021-02-24 21:52:32 -05:00
Sam	b0b4a07b9e	Bows	2021-02-24 20:37:43 -05:00
Sam	84a5b3dcc5	Axes	2021-02-24 19:11:41 -05:00
Sam	ee5c9d78ca	Swords	2021-02-24 18:54:06 -05:00
heydabop	d4e3a3f29f	#966 - Add setting to invert controller camera Y axis	2021-02-24 10:39:44 -06:00
Snowram	914266c705	Merge branch 'nwildner/pt_BR_trade-updates' into 'master' ... pt br trade updates See merge request veloren/veloren!1810	2021-02-23 23:21:30 +00:00
Nícolas Wildner	e4f8a9ed6c	pt br trade updates	2021-02-23 23:21:30 +00:00
Snowram	14c252d8b2	Merge branch 'snowram/turret' into 'master' ... Object animation, beam fixes, turret implementation See merge request veloren/veloren!1805	2021-02-23 20:16:56 +00:00
Imbris	f33d3873b4	Merge branch 'aweinstock/modular-weapon-rigging' into 'master' ... Support modular weapon voxel meshes being made by assembling their components. See merge request veloren/veloren!1806	2021-02-23 00:45:26 +00:00
Avi Weinstock	c3ac8a1b51	Support modular weapon voxel meshes being made by assembling their components.	2021-02-23 00:45:26 +00:00
Marcel	72bd0f42fc	Merge branch 'xMAC94x/prot_improvements' into 'master' ... xMAC94x/prot_improvements See merge request veloren/veloren!1796	2021-02-22 22:47:43 +00:00
Justin Shipsey	56f8e66d5d	Merge branch 'steanne-master-patch-91284' into 'master' ... Update _manifest.ron for minor typos in villager statements See merge request veloren/veloren!1807	2021-02-22 22:10:38 +00:00
Snowram	684961b15c	Adds look_dir to anims, humanoid heads pivot fixes	2021-02-22 20:00:06 +01:00
Marcel Märtens	3f5c64bec0	Client::new can now resolve DNS requests, better networking error messages	2021-02-22 17:35:19 +01:00
steanne	838a0d8928	Update _manifest.ron for minor typos in villager statements	2021-02-22 00:04:02 +00:00
Snowram	4078eeb877	Various fixes to object animation, cleanup	2021-02-21 19:56:46 +01:00
Snowram	775224983b	Initial turret implementation	2021-02-21 18:23:54 +01:00
Samuel Keiffer	479cf9fc4e	Merge branch 'sam/dual-wielding' into 'master' ... Dual wielding backend See merge request veloren/veloren!1787	2021-02-20 05:12:17 +00:00
Sam	eaf3e02e39	Addressed comments ... Fixed audio test	2021-02-19 19:55:23 -05:00
Sam	cfadd6da04	Added 1h swords.	2021-02-19 19:33:26 -05:00
Sam	d5ccc33abc	Factored out duplicate code into closures, consolidated ability handling logic to a single function.	2021-02-19 18:45:48 -05:00
Sam	411b4083b1	Added 1h hammers. ... Fixed audio tests.	2021-02-19 17:30:24 -05:00
Sam	50cbe42b07	Added one-handed axes.	2021-02-19 17:30:23 -05:00
Sam	341affdae2	Added hands field to all ron files of weapons. ... Removed weapons that were duplicated in weapons and npc_weapons from npc_weapons. Added migration to convert npc_weapons that ended up in anyone's inventory to weapon version. Consolidated debug boost and possess sticks into one debug_stick, and renamed the admin sword (with name cultist_purp_2h_boss-0) to admin_sword	2021-02-19 17:30:20 -05:00
Avi Weinstock	559ad7b7f5	Client-side trade improvements. ... - Add item tooltips in trade. - More localization support. - Fix bindings (R for trade, B for bag).	2021-02-19 15:20:27 -05:00
Nícolas Wildner	7a29cc9eff	creating char_selection.ron plus minor portuguese fixes for better formal language (like olhos - eyes and not olho)	2021-02-17 08:28:04 +00:00
TheThirdSpartan	f10f88081d	Small chat message formatting changes and fixed missing player alias during admin entity possession	2021-02-17 02:15:45 +00:00
Felix Huettner	b8d5b812e1	Allow minimap to always face north ... Some players prefer their minimap to always face north for better orientation.	2021-02-16 19:57:19 +01:00
Avi Weinstock	abb5684883	Trade implementation progress. ... - Accept/decline buttons that submit the proper messages - A phase2 screen that renders the (item, quantity) pairs as text - More checks in the trade state machine server-side.	2021-02-12 18:43:10 -05:00
Avi Weinstock	e2b55e0706	Implement enough of a trade UI that dragging & dropping items into it round-trips between clients.	2021-02-12 18:43:09 -05:00