440 Commits

Author	SHA1	Message	Date
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	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
Yuri Socher Bichibichi	c6dea3acca	Updates the Brazilian Portuguese (pt-BR) translation	2021-04-13 11:56:58 -03:00
Illia Denysenko	4ac8015ed9	Update localization for Ukrainian	2021-04-12 02:28:55 +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
BuildTools	c4294d968d	Add/modify Polish translations	2021-04-11 19:10:09 +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
tonyvu0605	e0dbd5566d	Started Vietnamese Translation	2021-04-03 22:17:57 -04:00
Snowram	9a3f6d8261	Substitutes DPS for CR in item tooltip	2021-04-03 00:10:31 -04:00
Jun NOGATA	129a3de2eb	Add Japanese message translation	2021-04-03 01:50:10 +09: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	606dd64741	Fix a staff icon, some offset fixes, lower wolf spawn rate	2021-03-30 00:27:03 +02: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
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
Avi Weinstock	4ec6b43693	Add a vertical camera clamp option and toggle to voxygen.	2021-03-23 18:22:32 -04: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
Vincent Foulon	e06870702f	Add skill for swimming speed	2021-03-21 15:58:38 +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
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
DaforLynx	f924e047ac	Renamed 'Upscale Factor' to 'Internal Resolution' as per what was decided in #981	2021-03-14 12:18:29 -07:00
PersianKnight	b87514266d	Bug fix debug info hotkey and axe skill tree text	2021-03-14 20:16:54 +03:30
DaforLynx	99261bf105	Many small changes to audio code, mainly sfx - changelog in MR	2021-03-12 15:00:09 -08: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
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
omm	ef7b215f07	File structure for lang es_ES aligned with EN	2021-03-11 12:08:37 +00:00
Sam	16222948a3	Sceptre skill tree and migration.	2021-03-09 18:02:07 -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
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
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
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
Vincent Foulon	fb953cc7f4	implement the new skilltree icons	2021-03-04 18:37:32 +00: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
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	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
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
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
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
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
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
Avi Weinstock	e9b811b62b	Plumb trade requests through the group invite UI, such that they can be accepted/declined without impacting the counterparty's movement.	2021-02-12 18:43:09 -05:00
Avi Weinstock	250391656f	Initial draft of trade UI (creates a placeholder window that acts like crafting in terms of bringing up the bag, defaulting to the "r" key).	2021-02-12 18:43:09 -05:00
Andrii Zymohliad	7be836318b	Update Ukrainian translation	2021-02-03 16:18:49 +00:00
James Melkonian	23b1df3cdd	Add basic NPC interaction and fix NPC chat spamming	2021-01-31 20:29:50 +00:00
DaforLynx	c6e262c4ce	Small audio fixes; addresses #939 and #940	2021-01-29 11:37:10 +00:00
Sam	6dd740feaa	Nerfed bow M1 and M2, slightly buffed bow skillbar ability.	2021-01-24 14:24:59 -05:00
Sam	5e4b6809ca	Sceptre nerfs.	2021-01-22 22:46:18 -05:00
Acrimon	21ecb15571	build tip	2021-01-19 19:02:41 +01:00
Monty	5362000de4	adjusted potions, refined level up message animation ... fixed incorrect translation used on axe double strike regen skill Changed migration so that skills and skill groups foreign key to entity_id instead of character_id	2021-01-19 08:08:14 -05:00
Monty Marz	de5c5702b3	stats display ... Addressed comments. Addressed comments.	2021-01-19 08:08:11 -05:00
Sam	c809569f6b	Added level up sound to skill point gain. Fixed tests. ... Fixed duplicate roll description.	2021-01-19 08:08:08 -05:00
Noé	acbd965e65	implemented en translation for Hammer, Bow, Scepter and Staff skills ... skill tree translation Clamped earning SP to avoid u16 overflow. translation fixes Fixed exp scaling function Fixed exp scaling function remove debug combat rating display Update overhead.rs implemented en translation for Axe	2021-01-19 08:08:02 -05:00
Sam	a606313856	Added scaling exp costs per skill point. ... Fix tooltip being red. multiple fixes, started translation change exp giving items adjust loot tables adjust combat rating indicators fix group frame offsets	2021-01-19 08:07:57 -05:00
Sam	986c05621a	Wired up skill UI to check for prerequisites being met and sufficient skill points. ... available SP check in general HUD, more skill icons Trimmed 2000 lines from a file. UI tweaks	2021-01-19 08:07:45 -05:00
Sam	4b52574750	Skill point gains are displayed in hud. ... level up message visuals and functionality Handles simultaneous skill point gains in UI.	2021-01-19 08:07:41 -05:00
Monty Marz	3f436079e8	Skill-Tree UI ... switchable tabs rework icons, fix cursor toggle auto slot placing Bow leap skill changed to bow glide skill.	2021-01-19 08:07:06 -05:00
Jesus Bracho	ec79890335	Provide buff information on killed entities	2021-01-18 05:46:53 +00:00
Acrimon	c5e3828c64	Merge branch 'master' into 'master' ... Update tr_TR to new multi file format. See merge request veloren/veloren!1671	2021-01-14 12:25:22 +00:00
Ben Wallis	aef2637288	Refactored loadout to have public functions for each slot instead of requiring callers to use the _INDEX consts	2021-01-08 19:12:09 +00:00
Tadabito	db9a6a4cec	Update tr_TR to new multi file format.	2021-01-02 12:04:04 +03:00
Vincent Foulon	da81b2f0b2	Update i18n's README.md to correct grammar and formatting ... Address the following reviews: https://gitlab.com/veloren/veloren/-/merge_requests/1666#note_476145978 https://gitlab.com/veloren/veloren/-/merge_requests/1666#note_476145980 https://gitlab.com/veloren/veloren/-/merge_requests/1666#note_476145981	2020-12-31 12:32:22 +01:00
Vincent Foulon	7a4c3fa9a6	renamed _root.ron files to _manifest.ron	2020-12-31 12:32:21 +01:00
Vincent Foulon	b3758d12e4	rename a translation file to prevent it from being ignored by git	2020-12-31 12:32:20 +01:00
Vincent Foulon	7150e1f820	rename a translation file and clear some commented code	2020-12-31 12:32:19 +01:00
Vincent Foulon	bb7cc3d53b	(temp?) fixed list_localization function + add sub_directories to other languages	2020-12-31 12:32:17 +01:00
Vincent Foulon	00140384f7	convert the other languages into folders	2020-12-31 12:32:16 +01:00
Vincent Foulon	3295ff2c58	created LocalizationFragment + load localization sub directories	2020-12-31 12:32:16 +01:00
Vincent Foulon	924c24fa78	(PoC)(WIP) Convert single translation file to a folder	2020-12-31 12:32:15 +01:00
Nícolas Wildner	dc46618b4c	Update pt_BR.ron	2020-12-27 00:09:12 +00:00
Marcel	e54b4d5797	Merge branch 'DaforLynx/campfire-loading-tip' into 'master' ... Loading screen tip for campfire healing See merge request veloren/veloren!1601	2020-12-12 00:29:57 +00:00
DaforLynx	70814ee922	Loading screen tip for campfire healing	2020-12-12 00:29:57 +00:00
Marcel	9b1bc41f6e	Merge branch 'jacki/german' into 'master' ... Updated de_DE translation See merge request veloren/veloren!1572	2020-12-11 23:51:00 +00:00
Tobias Frisch	23e3964059	Updated de_DE translation ... Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>	2020-12-11 23:51:00 +00:00
Vincent Foulon	2503d79567	Update French Translation	2020-12-11 23:29:44 +00:00
Pfauenauge90	6d1bae67d0	adjust mindflayer strength, fix en translation, update es_la translation, fix undead eyes	2020-12-10 18:06:31 +01:00
James Melkonian	71303fecfd	Aura System and Campfire Health Regen	2020-12-04 22:24:56 +00:00
Snowram	b316e9aa7c	Updates ru_RU translation	2020-11-26 22:59:39 +01:00
Andrii Zymohliad	733a471090	Added Ukrainian translation	2020-11-25 17:21:32 +00:00
Yusuf Bera Ertan	3c887315ae	update Turkish translations	2020-11-25 15:46:56 +03:00
Christof Petig	a3db20c9d6	Show caves in map	2020-11-23 19:05:17 +01:00
Monty Marz	099dfc959f	translations, fixes	2020-11-23 10:57:56 +00:00
Monty Marz	5b907ede9e	fix hints	2020-11-23 10:57:55 +00:00
Joshua Barretto	bcc220804a	Added exposure to settings	2020-11-23 10:57:55 +00:00
Joshua Barretto	49df604de0	Better scattering and scatter (of both varieties)	2020-11-23 10:45:02 +00:00
Knarkzel	7a917f87e1	added norwegian	2020-11-20 16:49:32 +01:00