6993 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Marcel	cee08c7012	Merge branch 'Dumbeldor/opti_phys_entities' into 'master' ... Physics improvements See merge request veloren/veloren!1809	2021-02-22 14:17:23 +00:00
Vincent Glize	4f37c626ea	Optimize Entity <> Entity collision check by calculating a entity via sphere.	2021-02-22 12:36:42 +01:00
Imbris	dfe4a3be40	Merge branch 'slipped/savetheuniverse' into 'master' ... fix glider crash See merge request veloren/veloren!1808	2021-02-22 06:31:12 +00:00
Justin Shipsey	1f88b87ca4	fix glider crash	2021-02-22 06:31:12 +00:00
Joshua Barretto	e2290783fc	Merge branch 'humanoid_ai_glide_when_falling' into 'master' ... FIX #956: Humanoid ai glide when falling See merge request veloren/veloren!1772	2021-02-22 00:57:25 +00:00
Overblob	370259fe54	CI - Fix clippy errors ... Fix trailing whitspace	2021-02-22 00:57:25 +00:00
steanne	838a0d8928	Update _manifest.ron for minor typos in villager statements	2021-02-22 00:04:02 +00:00
Snowram	4078eeb877	Various fixes to object animation, cleanup	2021-02-21 19:56:46 +01:00
Snowram	f25b2b1500	Various fixes to beam, body based interp	2021-02-21 19:17:56 +01:00
Sam	11050a05ce	Beam particles now determined from beam segment rather than character state.	2021-02-21 19:17:56 +01:00
Snowram	e7bbf3981d	Object animation	2021-02-21 19:17:44 +01:00
Snowram	775224983b	Initial turret implementation	2021-02-21 18:23:54 +01:00
Samuel Keiffer	3cb6a5592d	Merge branch 'aweinstock/speed-floor-quickfix' into 'master' ... Change the speed floor to `0.1` (avoiding a division by zero in modular... See merge request veloren/veloren!1804	2021-02-21 02:49:57 +00:00
Samuel Keiffer	836d34066a	Merge branch 'sam/food-queue' into 'master' ... Food buff queues See merge request veloren/veloren!1803	2021-02-21 01:06:50 +00:00
Avi Weinstock	3606490308	Change the speed floor to 0.1 (avoiding a division by zero in modular weapons accidentally buffed the Twitching Root).	2021-02-20 19:19:26 -05:00
Sam	f24490dc80	Added functionality for buffs queueing. Saturation now queues.	2021-02-20 17:13:17 -05:00
Sam	f5a74b4f33	Removed duplicate possess stick	2021-02-20 17:12:27 -05:00
Ben Wallis	6001934e8f	Merge branch 'aweinstock/modular-weapons' into 'master' ... Aweinstock/modular weapons See merge request veloren/veloren!1795	2021-02-20 22:06:11 +00:00
Avi Weinstock	c489d095df	Implement persistence for modular weapons. ... This stores the components as children of the item that contains them via the DB's `parent_container_item_id` feature, and ensures that things are loaded in a good order with breadth-first search. Squahed fixes: - Fix some constraint violations that occurred when swapping inventory items. - Comment out recipes for modular weapons. - Make update_item_at_slot_using_persistence_key and is_modular more idiomatic. - Add changelog entry. - Document `defer_foreign_keys` usage.	2021-02-20 14:31:46 -05:00
Avi Weinstock	8bdbf4f7c9	Implement modular weapons. ... - Add ItemKind::ModularComponent, Item::components. - Add tool::StatKind::{Direct,Modular} for the modular weapons themselves. - Move ItemConfig from ItemDesc to Item, so components' stats can be taken into account. - Crafting stores into the components field. - Components/recipes/placeholders are created dynamically. - Show which components a modular weapon contains in the tooltip in voxygen. Squashed fixes: - `Item::duplicate` components in `Item::new_from_item_def`. - Speed of 1.0 for now.	2021-02-20 14:30:39 -05:00
Snowram	63c72f77f1	Merge branch 'snowram/buffs-immunity' into 'master' ... Allows some species to be immune to specific buffs See merge request veloren/veloren!1800	2021-02-20 14:03:16 +00:00
Snowram	f78170704a	Allows some species to be immune to specific buffs	2021-02-20 14:03:15 +00:00
Marcel	a330d4b05c	Merge branch 'clangdo/fix_macos_build' into 'master' ... Backdate coreaudio-sys for OSX cross toolchain compatibility See merge request veloren/veloren!1799	2021-02-20 09:58:59 +00:00
Samuel Keiffer	479cf9fc4e	Merge branch 'sam/dual-wielding' into 'master' ... Dual wielding backend See merge request veloren/veloren!1787	2021-02-20 05:12:17 +00:00
Sam	eaf3e02e39	Addressed comments ... Fixed audio test	2021-02-19 19:55:23 -05:00
Sam	cfadd6da04	Added 1h swords.	2021-02-19 19:33:26 -05:00
Caelan	82c33d9ccb	Backdate coreaudio-sys for OSX cross toolchain compatibility ... See https://github.com/RustAudio/coreaudio-sys/issues/48	2021-02-19 15:46:36 -08:00
Sam	d5ccc33abc	Factored out duplicate code into closures, consolidated ability handling logic to a single function.	2021-02-19 18:45:48 -05:00
Joshua Barretto	c9c8bf4fd5	Merge branch 'aweinstock/trade-client-improvements' into 'master' ... Client-side trade improvements. See merge request veloren/veloren!1798	2021-02-19 23:38:30 +00:00
Sam	bbfcde5e59	Re-deleted duplicate weapons that somehow reappeared.	2021-02-19 17:30:24 -05:00
Sam	411b4083b1	Added 1h hammers. ... Fixed audio tests.	2021-02-19 17:30:24 -05:00
Sam	18309fe4c6	Added AbilityInfo struct to attack states	2021-02-19 17:30:24 -05:00
Sam	50cbe42b07	Added one-handed axes.	2021-02-19 17:30:23 -05:00
Sam	12545dd372	Added handedness to weapon tooltips.	2021-02-19 17:30:23 -05:00
Sam	8f0cca074d	Dual wielding now uses skillbar abilities from multiple weapons.	2021-02-19 17:30:22 -05:00
Sam	6f6a37faf2	Wielding a 1 handed weapon now correctly uses abilities when the second weapon is not also a 1 handed weapon.	2021-02-19 17:30:22 -05:00
Sam	f50fa25467	ItemConfig now stores AbilitySet directly instead of each individual ability.	2021-02-19 17:30:21 -05:00
Sam	fc01e9ea68	Handedness of weapons affects power and speed.	2021-02-19 17:30:21 -05:00
Sam	582c3f8459	Check for prerequisite skill in using an ability is no longer hardcoded.	2021-02-19 17:30:21 -05:00
Sam	341affdae2	Added hands field to all ron files of weapons. ... Removed weapons that were duplicated in weapons and npc_weapons from npc_weapons. Added migration to convert npc_weapons that ended up in anyone's inventory to weapon version. Consolidated debug boost and possess sticks into one debug_stick, and renamed the admin sword (with name cultist_purp_2h_boss-0) to admin_sword	2021-02-19 17:30:20 -05:00
Sam	d4f509b3d0	Added hands field onto weapons.	2021-02-19 17:30:20 -05:00
Avi Weinstock	559ad7b7f5	Client-side trade improvements. ... - Add item tooltips in trade. - More localization support. - Fix bindings (R for trade, B for bag).	2021-02-19 15:20:27 -05:00
Forest Anderson	b4adc5369a	Merge branch 'angel/fix-mirror-actions' into 'master' ... Remove git filter repo See merge request veloren/veloren!1797	2021-02-19 18:01:42 +00:00
Forest Anderson	5773e7c8a0	Remove git filter repo	2021-02-19 08:55:10 -05:00
Marcel	3f571b3b4e	Merge branch 'xMAC94x/quick_net_fix' into 'master' ... fix main thread blocking which was a bad combination of See merge request veloren/veloren!1793	2021-02-18 19:26:43 +00:00
Marcel Märtens	5a48bffcb0	fix main thread blocking which was a bad combination of ... - a channel was stale and wasn't shut down propertly AS WELL AS - the msg ingoing pipe was bounded, so it could fill up To mitigate this we a) unbounded the pipe b) stoped spam the log in no channel case c) instead of ever reaching "no channel" state we actually shutdown participant d) when send_mgr is closed it will no longer be able to SEND on streams	2021-02-18 20:00:07 +01:00
Forest Anderson	5c783e834e	Added badge to show contributor count from Github	2021-02-18 09:46:03 -05:00
Marcel	c6d69d1196	Merge branch 'xMAC94x/network_tokio' into 'master' ... xMAC94x/network_tokio switch from `async_std` to `tokio` See merge request veloren/veloren!1789	2021-02-17 22:47:11 +00:00
Samuel Keiffer	95fdd0fcc3	Merge branch 'cherry-pick-2ef5fb90' into 'master' ... Fix missing controller actions See merge request veloren/veloren!1786	2021-02-17 21:10:14 +00:00
Ada Lovegirls	96b8a582fe	Fixed missing controller actions ... (cherry picked from commit 2ef5fb90e89bf3f8f0acc84e269f6948c696c196)	2021-02-17 21:10:14 +00:00