8177 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Marcel	9ccaec1aca	Merge branch 'xMAC94x/netfix' into 'master' ... fixed #1067 Closes #1067 See merge request veloren/veloren!2119	2021-04-13 18:56:51 +00:00
Marcel Märtens	8ee83df600	fixed #1067	2021-04-13 20:39:56 +02:00
Marcel	4c23be44dd	Merge branch 'socherbyc/assets' into 'master' ... Updates the Brazilian Portuguese (pt-BR) translation See merge request veloren/veloren!2118	2021-04-13 17:24:45 +00:00
Yuri Socher Bichibichi	c6dea3acca	Updates the Brazilian Portuguese (pt-BR) translation	2021-04-13 11:56:58 -03:00
Imbris	763f9ff3af	Merge branch 'Frinksy/scancodes' into 'master' ... #861: Displaying keys based off of scancodes See merge request veloren/veloren!1730	2021-04-13 13:48:30 +00:00
Adam Blanchet	0d7d069d41	Display keys based off of scancodes ... Queries the OS to translate physical keyboard scancodes into Strings that can be shown in the UI. Addresses issues #861 and #354	2021-04-13 11:16:47 +02:00
Samuel Keiffer	522e89d57f	Merge branch 'mdx97/fix-diary-toggle' into 'master' ... Fix diary toggling when escape menu is open. See merge request veloren/veloren!2109	2021-04-13 06:07:01 +00:00
Samuel Keiffer	879b3e0133	Merge branch 'UMR1352/fix#1065' into 'master' ... fix issue #1065: admin bag and other admin items inside a container doesn't disappear when dropped Closes #1065 See merge request veloren/veloren!2114	2021-04-13 05:55:36 +00:00
Marcel	5b8842fac3	Merge branch 'deny-trade-on-exit' into 'master' ... Denies any active trades on exit to char select. See merge request veloren/veloren!2111	2021-04-12 23:00:38 +00:00
Rickey Chamblee	883977a42f	Denies any active trades on exit to char select.	2021-04-12 23:00:38 +00:00
Marcel	ef171478f6	Merge branch 'xMAC94x/protocol_errors' into 'master' ... Have a clear error for when the I/O closes and when some protocol is violated.... See merge request veloren/veloren!2082	2021-04-12 22:44:49 +00:00
Marcel Märtens	9638581d09	ITFrame::read_frame now throws an error when the frame_no is invalid. ... This will be catched by the respective protocols, e.g. tcp and cause a violation	2021-04-13 00:13:08 +02:00
Marcel Märtens	4fed9dab83	Have a clear error for when the I/O closes and when some protocol is violated. this should help find the rootcause of a bug. ... If its Closed it looks like the TCP connection got dropped/cut off (e.g. OS, Wifi). If its Violated we for sure know the cause is the messages send/recv in a wrong way	2021-04-13 00:12:20 +02:00
Ben Wallis	831cd9c5db	Merge branch 'juliancoffee/fix_localization_tests' into 'master' ... Fix localization test bug which produced bunch of Unknown states See merge request veloren/veloren!2105	2021-04-12 21:29:45 +00:00
Illia Denysenko	d42c03d57e	Fix localization test bug which produced bunch of Unknown states	2021-04-12 21:29:45 +00:00
Samuel Keiffer	c4f3522138	Merge branch 'vfoulon80/cmd-item-kits' into 'master' ... New Command: "kit" + Removed Command: "debug" See merge request veloren/veloren!2115	2021-04-12 19:36:08 +00:00
Vincent Foulon	a4bd47f340	Support quantity + use Enum for autocompletion + Address comments	2021-04-12 20:07:34 +02:00
Vincent Foulon	0692562533	New Command: "kit" + Removed Command: "debug" ... Update CHANGELOG.md Update CHANGELOG.md	2021-04-12 18:53:36 +02:00
Marcel	9289feee23	Merge branch 'imbris/update-cache-image' into 'master' ... Update the ci cache image See merge request veloren/veloren!2106	2021-04-12 15:35:06 +00:00
Enrico Marconi	bfd23a9828	fix issue #1065: admin bag and other admin items inside a container doesn't disappear when dropped	2021-04-12 16:21:10 +02:00
Marcel	e3d1d3ddd1	Merge branch 'sharp/inverted-check' into 'master' ... Inverted admin check. See merge request veloren/veloren!2112	2021-04-12 10:45:23 +00:00
Joshua Yanovski	dd1e06115e	Inverted admin check.	2021-04-12 12:44:19 +02: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
Monty Marz	f7c8389f77	Merge branch 'hqurve/settings-ui' into 'master' ... Cleanup of settings window: split each tab into its own file See merge request veloren/veloren!2108	2021-04-12 04:11:06 +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	d401d00d94	Address MR2077 review comments: add comment about group::ENEMY and remove trace statements, and fuse filtering loops.	2021-04-11 22:08:41 -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	0e16c23707	Only count enemy group members for combat music, and count bosses as high-intensity via an HP heuristic.	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
mdx97	03abe234ee	Fix diary toggling when escape menu is open.	2021-04-11 18:53:45 -05:00
Marcel	fd317417fb	Merge branch 'aweinstock/npcpotions' into 'master' ... Give NPCs the ability to use potions. See merge request veloren/veloren!2092	2021-04-11 23:47:30 +00:00
Avi Weinstock	ddf6a26577	Give NPCs the ability to use potions.	2021-04-11 23:47:29 +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
Joshua Yanovski	508dba61a1	Merge branch 'xMAC94x/deps' into 'master' ... update deps See merge request veloren/veloren!2095	2021-04-11 22:55:56 +00:00
Joshua Yanovski	2ee8fc378f	Merge branch 'vfoulon80/reorganize-assets' into 'master' ... Reorganize and optimize assets See merge request veloren/veloren!2099	2021-04-11 22:55:54 +00:00
hqurve	fd80a97f3d	Got rid of content setup macro	2021-04-11 17:36:02 -04:00
hqurve	690419ad90	Placed tabs in a loop and combined tab content chooser using macro	2021-04-11 17:36:02 -04:00
hqurve	469cb391d3	cleaned widget_ids	2021-04-11 17:36:02 -04:00
hqurve	04eea482ce	Moved settings window sections into separate files	2021-04-11 17:36:02 -04:00
hqurve	f2340105c1	Moved settings_window.rs to to settings_window/mod.rs	2021-04-11 17:36:02 -04:00
Imbris	f7f584fc49	Update the ci cache image with image from https://gitlab.com/veloren/veloren-docker-ci/-/merge_requests/38	2021-04-11 19:16:00 +00:00