9223 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ben Wallis	94fa7da4fa	Merge branch 'aweinstock/scaleprice' into 'master' ... Add prices for dragonscale, hard carapace, and plate, so that more craftable armors have prices. See merge request veloren/veloren!2521	2021-06-28 21:03:44 +00:00
Marcel	cd1c3f3a28	Merge branch 'tygyh/Loadout-builder-refactor' into 'master' ... Extract 'swap_equipment' and 'swap_armor' functions See merge request veloren/veloren!2525	2021-06-28 20:19:49 +00:00
Avi Weinstock	3f3f8a40c5	Use SQL transactions in world_block_statistics to try to speed it up.	2021-06-28 15:50:58 -04:00
Avi Weinstock	024b6c52ef	Add block statistics generator to world/examples.	2021-06-28 15:02:57 -04: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
Dr. Dystopia	11d2017bb3	Extract 'swap_equipment' and 'swap_armor' functions	2021-06-28 16:17:18 +02:00
Avi Weinstock	0ab451ec36	Add prices for dragonscale, hard carapace, and plate, so that more craftable armors have prices.	2021-06-28 09:24:22 -04:00
Marcel	7c135fb6ff	Merge branch 'juliancoffee/fix_clippy' into 'master' ... update Cargo.lock See merge request veloren/veloren!2523	2021-06-28 13:24:11 +00:00
juliancoffee	a434be594c	update Cargo.lock	2021-06-28 16:02:31 +03:00
Marcel	f4f6138d3d	Merge branch 'master' into 'master' ... Update `coreaudio-sys` to v0.2.8 to fix build failure on M1 Macs See merge request veloren/veloren!2505	2021-06-28 07:47:50 +00:00
Marcel	010f9c250c	Merge branch 'aweinstock/nodelay' into 'master' ... Enable TCP_NODELAY. See merge request veloren/veloren!2520	2021-06-27 23:49:01 +00:00
Marcel	11d16f34bb	Merge branch 'xMAC94x/logging_fix' into 'master' ... fix logging cnt didnt reset See merge request veloren/veloren!2518	2021-06-27 21:54:35 +00:00
Marcel	2e57d2a14f	Merge branch 'aweinstock/dungeonvoxel' into 'master' ... Use new dungeons in dungeon_voxel_export, remove old dungeon sampling... See merge request veloren/veloren!2516	2021-06-27 21:54:32 +00:00
Avi Weinstock	8c5d52b70a	Enable TCP_NODELAY.	2021-06-27 17:45:33 -04:00
Marcel	61e5c70dd9	Merge branch 'yusdacra/chore/nix' into 'master' ... build(nix): fix audio resource patching See merge request veloren/veloren!2517	2021-06-27 20:54:24 +00:00
Marcel Märtens	dd5c9d04b0	fix logging cnt didnt reset	2021-06-27 22:51:23 +02:00
Yusuf Bera Ertan	b8249cc64c	build(nix): fix audio resource patching	2021-06-27 23:23:01 +03:00
Avi Weinstock	957ba5d218	Use new dungeons in dungeon_voxel_export, remove old dungeon sampling function, and add more of world/examples to CI.	2021-06-27 15:35:43 -04:00
Marcel	f6782e21b8	Merge branch 'drunkonhotcoco/issue_1204_chat_scroll_fix' into 'master' ... Added fix for Issue #1204 - Incorrect scrolling when switching between filtered tabs See merge request veloren/veloren!2514	2021-06-27 18:18:02 +00:00
DrunkOnHotCoco	ea41f9ab39	Added fix for Issue #1204 - Incorrect scrolling when switching between filtered tabs	2021-06-27 18:18:01 +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
Justin Shipsey	78961e8956	Merge branch 'update_pt_BR_20210627' into 'master' ... Update pt br 20210627 See merge request veloren/veloren!2511	2021-06-27 03:26:44 +00:00
Nícolas Wildner	81010e8465	Update pt br 20210627	2021-06-27 03:26:44 +00:00
Snowram	b477eac816	Merge branch 'juliancoffee/fix_dismantle' into 'master' ... Improve Dismantle UX See merge request veloren/veloren!2498	2021-06-27 00:11:01 +00:00
juliancoffee	681fd37429	style	2021-06-27 02:44:19 +03:00
Ben Wallis	9865b354f9	Merge branch 'xvar/fix-plugin-build-warnings' into 'master' ... Fixed build warnings for server-cli related to non-default plugin feature See merge request veloren/veloren!2506	2021-06-26 21:35:54 +00:00
Ben Wallis	a50ed6b50a	Fixed build warnings for server-cli related to non-default plugin feature	2021-06-26 21:56:03 +01:00
Ben Wallis	1186b07fed	Merge branch 'aweinstock/fix-warlord-warlock-migration' into 'master' ... Rename `remove_warlock_warlord` migration so it actually triggers. See merge request veloren/veloren!2507	2021-06-26 20:49:28 +00:00
Avi Weinstock	af22f56f9e	Rename remove_warlock_warlord migration so it actually triggers.	2021-06-26 16:28:49 -04:00
Alex Ryapolov	be75a31c39	Update coreaudio-sys to v0.2.8	2021-06-26 18:39:53 +00:00
juliancoffee	12b5d655cf	Split Material and Dismantle crafting tabs	2021-06-26 21:37:13 +03:00
juliancoffee	12243bd0c0	Add is_recycling field to recipe book	2021-06-26 21:37:13 +03:00
juliancoffee	123b2814cf	Sort tabs in logical sequence	2021-06-26 21:37:13 +03:00
juliancoffee	c93748224b	Clean Material tags ... - Make ferocious set (currently not lootable) made from Moonweave - Remove material tag from twig sets	2021-06-26 21:37:13 +03:00
juliancoffee	3d4eb7d6a4	Dismantle Leather items to Thick Leather ... - Previously both Leather and Rawhide items were dismantled to simple leather	2021-06-26 21:37:13 +03:00
juliancoffee	3b6d6b9393	Improve Dismantle UX ... - Change `Any {}` to `Any {} item` so for example when you want to dismantle something into linen, you will see `Any linen item` which points you that you need to get some item which is made from linen, and not some generic linen.	2021-06-26 21:37:13 +03:00
Ben Wallis	d479b6d202	Merge branch 'xvar/default-publish-feature' into 'master' ... Added default-publish feature and updated build scripts. See merge request veloren/veloren!2504	2021-06-26 18:04:53 +00:00
Imbris	c214f2f940	Merge branch 'danacus/enumstring' into 'master' ... Fixing #1169 - use strum macros for BlockKind conversion Closes #1169 See merge request veloren/veloren!2503	2021-06-26 16:52:26 +00:00
Ben Wallis	da319e71ec	Added default-publish feature and updated build scripts.	2021-06-26 17:48:48 +01:00
Daan Vanoverloop	0076b8379c	Fixing #1169 - use strum macros for BlockKind conversion	2021-06-26 17:52:32 +02: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
Joshua Barretto	768e1c0d31	Merge branch 'aweinstock/site2dungeon' into 'master' ... Convert dungeons to site2. See merge request veloren/veloren!2499	2021-06-25 23:06:24 +00:00
Avi Weinstock	0ac6305dfc	Rename difficulty to dungeon_difficulty.	2021-06-25 18:18:27 -04: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
Avi Weinstock	524dd02f45	Tweaks to dungeon pillars.	2021-06-25 15:54:42 -04:00
Snowram	379e755006	Increases base damage of husk attack, rename some cultist weapons	2021-06-25 21:18:28 +02:00
Avi Weinstock	7328b71243	Add comments to dungeon code. Fix the radius calculation (which lead to dungeons getting truncated), and fix sprites spawning above staircases.	2021-06-25 14:08:23 -04: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