11180 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ubruntu	6d795b6ecd	Campfire heals pets when owner sits	2022-02-22 09:23:07 +00:00
Imbris	423ee8d14b	Merge branch 'test-server_fix' into 'master' ... Fix test-server See merge request veloren/veloren!3227	2022-02-21 02:29:20 +00:00
Inojelis	b0122a6b46	remove blank line	2022-02-21 04:04:56 +02:00
Inojelis	9bdb7198f5	Fix imports	2022-02-21 03:46:02 +02:00
Inojelis	13308d009d	Fix run config	2022-02-21 03:33:58 +02:00
Inojelis	cdd01655c1	Fix run config	2022-02-21 02:50:16 +02:00
Inojelis	3e5a220980	Fix generate_chunk to also accept Calendar	2022-02-21 02:48:12 +02:00
Marcel	473a807e46	Merge branch 'isse/workshop-fixes' into 'master' ... Workshop fixes See merge request veloren/veloren!3226	2022-02-20 22:21:00 +00:00
IsseW	e9e4be6e7e	break when there are no stations	2022-02-20 22:11:09 +01:00
IsseW	258b3c7535	Workshop fixes	2022-02-20 22:08:13 +01:00
Joshua Barretto	4ef1c92858	Merge branch 'enable_custom_names_for_lakes' into 'master' ... enable custom naming bricks for lake biomes See merge request veloren/veloren!3210	2022-02-20 19:47:23 +00:00
Imbris	19afa40ad3	Merge branch 'isse/move-marker-changelog' into 'master' ... Move changelog See merge request veloren/veloren!3225	2022-02-20 17:28:41 +00:00
IsseW	e05499c044	Move changelog	2022-02-20 18:25:16 +01:00
Marcel	2a9f75340a	Merge branch 'spanish_translation' into 'master' ... apply changes from MR!2904 See merge request veloren/veloren!3224	2022-02-20 16:26:24 +00:00
Marcel	6506a97dcd	Merge branch 'zesterer/enable-site2-towns' into 'master' ... Enabled site2 towns by default See merge request veloren/veloren!3206	2022-02-20 14:02:53 +00:00
Marcel	df7cd2da1a	Merge branch 'isse/shared-waypoints' into 'master' ... Shared and persistent waypoints See merge request veloren/veloren!3162	2022-02-20 10:10:18 +00:00
Isidor Nielsen	a685a353cb	Shared and persistent waypoints	2022-02-20 10:10:18 +00:00
Marcel	6a9924d6ca	Merge branch 'imbris/small-fixes' into 'master' ... Small bits of code cleanup See merge request veloren/veloren!3222	2022-02-20 09:41:21 +00:00
Marcel	eaf6422fbf	Merge branch 'imbris/screenshot-mapping' into 'master' ... Fix race in screenshot logic See merge request veloren/veloren!3221	2022-02-20 09:38:24 +00:00
Marcel Märtens	e2648f6733	apply changes from MR!2904	2022-02-20 10:18:24 +01:00
Imbris	565785c0aa	Remove TODO, UidAllocator needed on client to map uid -> entities	2022-02-19 20:01:40 -05:00
Imbris	d8996a9b94	Remove unwrap in handling of the DeleteServer message in the main menu ui	2022-02-19 19:37:53 -05:00
Imbris	d7d8d8d2da	Small cleanup in server-cli/src/main.rs	2022-02-19 19:22:13 -05:00
Imbris	adec5905bd	Properly wait to request buffer mapping until after the command to copy the screenshot texture to the buffer has been submitted.	2022-02-19 19:05:04 -05:00
Marcel	b5bac97c2e	Merge branch 'xMAC94x/release-numbers' into 'master' ... Change the version number to 0.12 See merge request veloren/veloren!3219	2022-02-18 23:41:06 +00:00
Marcel Märtens	802b9e7914	Change the version number to 0.12	2022-02-18 22:36:53 +01:00
Marcel	caf46a3f8d	Merge branch 'treeco/remove-settings-button' into 'master' ... Removed dead settings button from main menu See merge request veloren/veloren!3218	2022-02-18 16:36:42 +00:00
Treeco	fdd7237dfc	Removed dead settings button from main menu	2022-02-18 16:11:30 +00:00
Marcel	4fd794579d	Merge branch 'xvar/fix-macos-builds' into 'master' ... Fixed artifact paths for mac builds See merge request veloren/veloren!3217	2022-02-18 14:30:22 +00:00
Ben Wallis	bbe8f9db8b	Fixed artifact paths for mac builds	2022-02-18 14:10:11 +00:00
Marcel	917f3e5016	Merge branch 'james/fix-boat-drag' into 'master' ... Fix airship command by splitting out ships See merge request veloren/veloren!3216	2022-02-18 08:34:14 +00:00
James Melkonian	7f21cbf4bc	Fix airship command by splitting out ships	2022-02-18 08:34:14 +00:00
Marcel	d463b67ef4	Merge branch 'zesterer/release-map' into 'master' ... Added location system, switched to release map See merge request veloren/veloren!3213	2022-02-17 16:31:01 +00:00
Marcel	b8cb7c783d	Merge branch 'pfau/new_bg' into 'master' ... New login-screen bg image See merge request veloren/veloren!3214	2022-02-17 16:08:37 +00:00
Monty Marz	9ca1693ef8	New login-screen bg image	2022-02-17 16:08:37 +00:00
Joshua Barretto	34871c9355	List locations on empty command	2022-02-17 16:01:18 +00:00
Joshua Barretto	b786570470	Added location system, switched to release map	2022-02-17 14:51:59 +00:00
Marcel	0b16205e70	Merge branch 'slipped/spearbug' into 'master' ... fix spear bug See merge request veloren/veloren!3212	2022-02-17 08:11:05 +00:00
jshipsey	e569ee24c3	fix	2022-02-17 00:58:25 -05:00
Imbris	bdb10c4e14	Merge branch 'isse/minor-ux-improvements' into 'master' ... Minor inventory ux improvements Closes #1436 See merge request veloren/veloren!3157	2022-02-16 21:48:03 +00:00
Isidor Nielsen	67f2d05d3c	Minor inventory ux improvements	2022-02-16 21:48:03 +00:00
Marcel	5c18bd2b77	Merge branch 'xMAC94x/update_cache_image' into 'master' ... update cache image for ci See merge request veloren/veloren!3203	2022-02-16 21:41:29 +00:00
Marcel	b09698b8ac	Merge branch 'shouvik/prevent_empty_trades' into 'master' ... Fixes #1452 - Prevents empty trades Closes #1452 See merge request veloren/veloren!3202	2022-02-16 21:41:26 +00:00
ShouvikGhosh2048	d72f43190b	Fixes #1452 - Prevents empty trades	2022-02-16 21:41:26 +00:00
Marcel	96023b2221	Merge branch 'slipped/waterbug' into 'master' ... fix wallrun water issue See merge request veloren/veloren!3209	2022-02-16 21:21:06 +00:00
floppy	0d3a0cd1b8	enable custom naming bricks for lake biomes	2022-02-16 20:30:52 +01:00
jshipsey	bf84cc75c2	fix	2022-02-16 06:13:01 -05:00
Treeco	90fbadbd03	Fix ember z fighting, remove ember sway	2022-02-15 23:05:20 +00:00
Joshua Barretto	00b003a23c	Enabled site2 towns by default	2022-02-15 19:01:43 +00:00
Marcel	e762a0b390	Merge branch 'fix_airshipper' into 'master' ... undo stage renaming See merge request veloren/veloren!3205	2022-02-15 08:42:51 +00:00