7837 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
juliancoffee	3ab61fa231	Update CHANGELOG	2021-04-25 15:51:39 +03:00
juliancoffee	94bfbe37ea	Fix Bug with missing Burning icon	2021-04-25 10:44:22 +03:00
Samuel Keiffer	e4324a3481	Merge branch 'ygor/skillbar-account-for-skillset' into 'master' ... Make skillbar buttons account for energy cost reduction See merge request veloren/veloren!2185	2021-04-24 19:32:19 +00:00
Marcel	aa6145c9b5	Merge branch 'ada/english-fallback' into 'master' ... Add option to load English string as fallback if string missing See merge request veloren/veloren!1791	2021-04-24 14:39:35 +00: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
Justin Shipsey	ff445d3306	Merge branch 'holychowders/fix_grammatical_error' into 'master' ... Fix grammatical error in NPC message See merge request veloren/veloren!2191	2021-04-24 06:12:42 +00:00
holychowders	516f2fec4a	Fix grammatical error in NPC message	2021-04-23 22:43:37 -07:00
Ygor Souza	4f71c621f4	Make skillbar buttons account for energy cost reduction ... Previously, the buttons would compare the current energy to the base cost of the ability, so they would sometimes be grayed out while the ability was usable. Now they ajust the ability with the character skillset before getting the energy cost for the purposes of setting the skillbar icon color.	2021-04-24 03:45:58 +02:00
Samuel Keiffer	fef68ad2a1	Merge branch 'ygor/fix-staff-shockwave-infinite-range' into 'master' ... Fix fire shockwave infinite vertical range Closes #1038 See merge request veloren/veloren!2189	2021-04-24 01:38:14 +00:00
Ygor Souza	71b8426592	Add basic distance check to shockwave hit test ... Before checking if the entity hitbox intersects the shockwave shell, we do a basic check that the entity is close enough to be hit, considering its radius. This fixes the unlimited vertical range problem, since the distance is measured in 3D.	2021-04-24 03:09:45 +02:00
Marcel	4d0aa9c3ad	Merge branch 'juliancoffee/update-uk_UA' into 'master' ... update uk_UA localization See merge request veloren/veloren!2186	2021-04-23 21:30:46 +00:00
Illia Denysenko	4e7aba5b3f	update uk_UA localization	2021-04-23 21:30:46 +00:00
Songtronix	0f5d289ecb	Merge branch 'xMAC94x/quickfix_for_airshipper' into 'master' ... xMac94x/quickfix for airshipper See merge request veloren/veloren!2188	2021-04-23 18:52:21 +00:00
Marcel Märtens	a610db5cfc	have a seperate stage for scheduled builds	2021-04-23 17:48:02 +02:00
Marcel	1489fccbe3	Merge branch 'juliancoffee/fix_localization_tests' into 'master' ... Fix off-by-one error in localization tests See merge request veloren/veloren!2187	2021-04-23 11:42:00 +00:00
juliancoffee	dc8d306890	Fix off-by-one error in localization tests ... BlameHunk lines start counting from 1, not 0. Comparing with `line + 1` fix this.	2021-04-23 14:11:44 +03:00
Justin Shipsey	8828691935	Merge branch 'update_pt_BR_20210422' into 'master' ... update pt_br 20210422 See merge request veloren/veloren!2182	2021-04-23 01:00:41 +00:00
Nícolas Wildner	6188bb9e96	update pt_br 20210422	2021-04-23 01:00:41 +00:00
Imbris	c2a8153325	Merge branch 'ygor/fix-arrow-outcome-loop' into 'master' ... Skip physics pass for arrows stuck on surfaces Closes #1094 See merge request veloren/veloren!2183	2021-04-22 22:30:36 +00:00
Ygor Souza	e59f1e8d28	Skip physics pass for arrows stuck on surfaces ... This keeps the arrow velocity from changing, which is what was causing the ProjectileHit outcome to be pushed multiple times for the same arrow, since the outcome checks if the arrow velocity is above a given threshold.	2021-04-22 23:03:04 +02:00
Marcel	6613374053	Merge branch 'revert-3506f754' into 'master' ... Decouple Test-Ci with Release-Ci See merge request veloren/veloren!2041	2021-04-22 20:23:59 +00:00
Marcel	ea16fa10ab	use different docker tags for master and nightly runs, ... This allow us to decouple our test-ci from the release-ci and is necessary for multiple release channels in the future. E.g. we can run a master build without it directly beeing pushed to watchtower and airshipper (config setting requiered on airshipper) Adjust Tags for server-cli	2021-04-22 21:38:29 +02:00
Marcel	e14f8b9745	Merge branch 'aweinstock/deflate-terrain' into 'master' ... Compress terrain chunks with deflate. Includes a benchmark showing that this... See merge request veloren/veloren!2166	2021-04-22 17:12:53 +00:00
Marcel	41dc58a147	Merge branch 'pfau/lantern_handles' into 'master' ... Add handles to lanterns, fix cooking pot scale See merge request veloren/veloren!2181	2021-04-22 17:12:07 +00:00
Monty Marz	b69eb61e7b	Add handles to lanterns, fix cooking pot scale	2021-04-22 17:12:07 +00:00
Joshua Barretto	8d664ded1a	Merge branch 'zesterer/small-fixes' into 'master' ... Fixed broken crafting sprite requirement See merge request veloren/veloren!2180	2021-04-22 11:57:13 +00:00
Joshua Barretto	f987f4d628	Fixed broken crafting sprite requirement	2021-04-22 12:30:48 +01:00
Ben Wallis	89e043bbca	Merge branch 'lboklin/wildlife-group-spawn-dist' into 'master' ... Space wildlife group spawns apart to prevent spawnplosions See merge request veloren/veloren!2178	2021-04-22 08:50:20 +00:00
Ludvig Böklin	1708b8b4cc	Space wildlife group spawns apart to prevent spawnplosions	2021-04-22 08:50:20 +00:00
Snowram	87b14dac7a	Merge branch 'slipped/zeropointeight' into 'master' ... small tweaks See merge request veloren/veloren!2168	2021-04-22 07:05:18 +00:00
jshipsey	19ce4ad531	comments	2021-04-22 00:04:39 -04:00
jshipsey	2f523f5aa0	formatting	2021-04-22 00:04:39 -04:00
jshipsey	0962fe72f2	fix for 1h on back	2021-04-22 00:04:39 -04:00
jshipsey	9d82b20891	remove 0.8, add snow's mixed_vel idea for other bodies	2021-04-22 00:04:39 -04:00
Joshua Barretto	f1a991fa09	Merge branch 'zesterer/pit-of-tartarus' into 'master' ... Made the pit of tartarus less bad See merge request veloren/veloren!2179	2021-04-21 22:08:06 +00:00
Joshua Barretto	19184a49a7	Made the pit of tartarus less bad	2021-04-21 22:18:44 +01:00
Dominik Broński	1d25016459	Merge branch 'lboklin/arrow-turret-drag-fix' into 'master' ... Fix ArrowTurret drag coefficient See merge request veloren/veloren!2175	2021-04-21 20:17:44 +00:00
Imbris	0cc2a77d1d	Merge branch 'imbris/quickfix' into 'master' ... Quick physics perf fix See merge request veloren/veloren!2177	2021-04-21 18:32:53 +00:00
Imbris	51c0f8733c	Quick physics perf fix	2021-04-21 14:03:23 -04:00
Imbris	46b452d6a5	Merge branch 'revert-68539a75' into 'master' ... Revert "Merge branch 'revert-b10718c5' into 'master'" See merge request veloren/veloren!2176	2021-04-21 17:47:18 +00:00
Imbris	1af4a04231	Revert "Merge branch 'revert-b10718c5' into 'master'" ... This reverts merge request !2172	2021-04-21 17:10:13 +00:00
Joshua Barretto	880236f223	Merge branch 'zesterer/lanterns' into 'master' ... Made characters carry lanterns higher when possible See merge request veloren/veloren!2169	2021-04-21 16:40:20 +00:00
Ludvig Böklin	37713cb4ad	Fix ArrowTurret drag coefficient	2021-04-21 18:26:23 +02:00
Joshua Barretto	81ba200e48	Improve dynamic light reflection for hill climbing	2021-04-21 17:10:53 +01:00
Joshua Barretto	2c95165c82	Improvements to lantern holding when sitting	2021-04-21 16:54:03 +01:00
Imbris	68539a751b	Merge branch 'revert-b10718c5' into 'master' ... Revert "Merge branch 'imbris/agent-opt' into 'master'" See merge request veloren/veloren!2172	2021-04-21 15:06:35 +00:00
Imbris	699a5493ec	Merge branch 'lboklin/simplify-buoyancy' into 'master' ... Simplify buoyancy for performance reasons See merge request veloren/veloren!2171	2021-04-21 15:06:31 +00:00
Imbris	ae9d9d60ee	Merge branch 'lboklin/prevent-full-stop-from-drag' into 'master' ... Prevent drag forces from causing something to come to a complete stop See merge request veloren/veloren!2170	2021-04-21 15:06:27 +00:00