3173 Commits

Author	SHA1	Message	Date
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
James Melkonian	7f21cbf4bc	Fix airship command by splitting out ships	2022-02-18 08:34:14 +00:00
Joshua Barretto	b786570470	Added location system, switched to release map	2022-02-17 14:51:59 +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
jshipsey	bf84cc75c2	fix	2022-02-16 06:13:01 -05:00
Samuel Keiffer	6c7c0eefae	Merge branch 'gnarlings' into 'master' ... Gnarlings See merge request veloren/veloren!3194	2022-02-15 00:22:37 +00:00
Sam	6dafacaa24	Addressed review comments	2022-02-13 21:49:46 -05:00
unvariant	9d98cd9e58	Render item drops instead of placeholder textures	2022-02-14 02:09:45 +00:00
UncomfySilence	a0d43cb21d	further balance changes	2022-02-13 10:35:19 +01:00
Sam	c77270b799	Addressed feedback	2022-02-12 20:52:01 -05:00
jshipsey	2eee43865f	chieftain anims	2022-02-11 02:18:48 -05:00
Sam	4991f7ecea	Gnarlign site tweaks and chieftain buff	2022-02-11 01:23:09 -05:00
Sam	377906dfa0	Ground shockwave particle tweaks.	2022-02-10 22:40:26 -05:00
Sam	bf7e84c6ae	Initial particle work	2022-02-10 14:58:37 -05:00
Sam	0031aa6f5f	Chieftain AI and attacks	2022-02-10 14:58:35 -05:00
Sam	fcb0f8d8f0	Wood golem attacks and ai	2022-02-10 14:58:32 -05:00
Sam	e044bf5091	Mandragora attacks and ai	2022-02-10 14:58:32 -05:00
Sam	f1801560fa	Deadwood ai	2022-02-10 14:58:31 -05:00
Sam	82c976919e	Darts are now darts.	2022-02-10 14:58:29 -05:00
Joshua Barretto	6263942041	Merge branch 'slipped/site2' into 'master' ... new entities, frostpines See merge request veloren/veloren!3193	2022-02-10 01:59:20 +00:00
jshipsey	786ae39fb4	new entities	2022-02-09 20:10:59 -05:00
jshipsey	7ae85aef50	tweaks	2022-02-09 19:34:24 -05:00
jshipsey	6d34a6b544	wallrunning	2022-02-09 19:34:23 -05:00
phoenix13032005	7a1f0d9fa1	Balance update ... + Make icons for Mino and Mindy dungeons with their faces + Adjust loot tables + Adjust names with respect to the lore of @Gemu	2022-02-09 12:13:42 +02:00
Tormod G. Hellen	82273f0f36	Make friendly creatures defend each other.	2022-02-08 22:32:25 +01:00
Jonathan Berglin	3bdc7b1bb9	Add documentation to Agent functions	2022-02-07 23:56:03 +00:00
James Melkonian	f21e0f31fb	Restrict RtSim ships to airships	2022-02-03 21:41:20 -08:00
Dominik Broński	19c764dde6	Merge branch 'christof/econfix' into 'master' ... Small economy cleanup See merge request veloren/veloren!3164	2022-02-03 21:48:01 +00:00
Youssef Fahmy	fdfd2c99ff	Removal of /home	2022-02-02 08:50:23 +00:00
Christof Petig	42faef9ab0	clippy is right, ... but I don't want to rearrange print_sorted (test). so reduce overall strictness	2022-01-31 22:25:38 +01:00
Christof Petig	080444fc8b	juliancoffee prefers this style	2022-01-31 22:19:21 +01:00
Christof Petig	f4f1b5c77b	more stable sorting	2022-01-31 22:00:23 +01:00
Christof Petig	dc92d0ab12	fix multiple calls of init	2022-01-31 21:31:08 +01:00
Christof Petig	d8edd70837	create a nice csv table for comparison	2022-01-31 21:19:23 +01:00
Christof Petig	47aba3e4cd	clean up double rescaling	2022-01-31 20:52:25 +01:00
Christof Petig	6b9180bba6	separate amount from probability	2022-01-31 19:45:39 +01:00
Christof Petig	12fedef98f	fix some test cases	2022-01-31 19:45:39 +01:00
juliancoffee	45ba21796c	Add test cases	2022-01-31 19:45:39 +01:00
Christof Petig	8230323a76	fix code quality	2022-01-31 19:45:39 +01:00
Christof Petig	66c431ba86	cargo fmt	2022-01-31 19:45:39 +01:00
Christof Petig	a98b9ad049	normalize loot tables before combining them, take current values for a start	2022-01-31 19:45:38 +01:00
Christof Petig	8228437b22	load loot table only once, add utility function and test cases	2022-01-31 19:45:38 +01:00
Justin Shipsey	612f084831	Merge branch 'slipped/bipeds' into 'master' ... Slipped/bipeds See merge request veloren/veloren!3163	2022-01-31 17:08:01 +00:00
Marcel Märtens	201a5ac2c7	stricten some rules and fix some clippy warnings	2022-01-30 20:16:21 +01:00
Avi Weinstock	5f8957d8ef	Globally allow the clippy lints {new_without_default, many_single_char_names, identity_op, type_complexity, too_many_arguments}.	2022-01-30 20:16:20 +01:00
jshipsey	7cac4b4001	myrmidon fix	2022-01-30 02:02:23 -05:00
Scott Williams	21fd296407	Changed entity drops csv export to export names instead of asset paths	2022-01-29 17:37:45 +00:00
Joshua Barretto	d8c4284a32	Merge branch 'zesterer/worldgen' into 'master' ... Improvements to site2 See merge request veloren/veloren!3159	2022-01-28 17:14:07 +00:00