3252 Commits

Author	SHA1	Message	Date
Samuel Keiffer	0497a437a4	Merge branch 'sam/invulnerability-buff' into 'master' ... Invulnerability Buff Closes #965 See merge request veloren/veloren!1834	2021-03-01 05:46:46 +00:00
Samuel Keiffer	537efdd47e	Merge branch 'aweinstock/trade-requestitem' into 'master' ... During a trade, allow requesting items from the counterparty's inventory... See merge request veloren/veloren!1829	2021-03-01 02:39:36 +00:00
Sam	6ab4e2264e	Buff icon	2021-02-28 17:31:35 -05:00
Sam	531c38c3ad	Factored formatting of buff text out to a single function.	2021-02-28 16:04:33 -05:00
Sam	a88ad7b971	Added invulnerability debuff. Currently tied to campfire spawned with '/campfire' command.	2021-02-28 15:02:03 -05:00
Imbris	b7bd0306e6	Merge branch 'Lerg/Issue_#976' into 'master' ... Issue #976 Some inputs are missing the ability to be rebound See merge request veloren/veloren!1832	2021-02-28 18:23:30 +00:00
Justin Shipsey	13df691f69	Merge branch 'heydabop/966-controller-y-invert' into 'master' ... #966 - Setting to invert controller Y axis See merge request veloren/veloren!1817	2021-02-28 18:02:04 +00:00
Lerg	94bd1f2605	Issue #976 Some inputs are missing the ability to be rebound because they are missing from the input iterator	2021-02-28 19:02:32 +03:00
Avi Weinstock	7e458ecd40	During a trade, allow requesting items from the counterparty's inventory (prequisite for NPC trading).	2021-02-28 10:13:49 -05:00
Samuel Keiffer	cb267ac3ee	Merge branch 'sam/combo-comp' into 'master' ... Combo now persists as a compnent, rather than a field on a state See merge request veloren/veloren!1828	2021-02-28 02:42:40 +00:00
Sam	b25a376995	Re-allowed for what stage you were on to persist through a roll	2021-02-27 19:24:18 -05:00
Sam	404c7f0905	Combo melee now checks combo	2021-02-27 18:24:28 -05:00
Snowram	7f2276324e	Reduces the instances of f64 in anims	2021-02-27 23:21:03 +01:00
jshipsey	b4627dfe19	look-based anims	2021-02-27 16:19:33 -05:00
Monty Marz	e5273e3a8e	reroute the F1 key to open the controls settings, removed loading screen tips about levels and the stats button	2021-02-27 19:02:26 +00:00
Justin Shipsey	d2fffa1a92	Merge branch 'slipped/gremlins' into 'master' ... dungeon enemy overhaul part 1 See merge request veloren/veloren!1697	2021-02-27 17:00:52 +00:00
Samuel Keiffer	fa809fc292	Merge branch 'Lerg/Accumulate_Damage_Floaters' into 'master' ... Issue #836 - Declutter the scrolling combat text See merge request veloren/veloren!1823	2021-02-27 16:18:18 +00:00
jshipsey	16720a6826	weapon/manifest tweaks	2021-02-27 10:44:55 -05:00
Lerg	3fe5f4484e	Issue #836 - Declutter the scrolling combat text	2021-02-27 15:10:47 +03:00
Sam	238fcaf5f1	Particle rebase fixes	2021-02-27 01:42:47 -05:00
jshipsey	0a353576dc	address comments	2021-02-27 01:42:47 -05:00
Snowram	17112926e7	Adds harvester npc	2021-02-27 01:42:47 -05:00
jshipsey	51bc74b2a5	visual weapon variation, adjust minotaur dash, keyframed golem quake	2021-02-27 01:42:47 -05:00
jshipsey	16a44cd532	minotaur moves, added claygolem	2021-02-27 01:42:47 -05:00
jshipsey	417f4638ed	balance pass 2	2021-02-27 01:42:47 -05:00
jshipsey	79ec9115f5	rebase, yeti in dungeon	2021-02-27 01:42:47 -05:00
jshipsey	e06ebf3507	initial balance	2021-02-27 01:42:47 -05:00
Snowram	858fbe1a6c	Adds yeti npc	2021-02-27 01:42:46 -05:00
jshipsey	30af3a4493	dash, spin, jump changes	2021-02-27 01:42:46 -05:00
Snowram	1b9815dc34	Adds 3 new npcs, tusk ram new design	2021-02-27 01:42:46 -05:00
Sam	53b0ba286a	Ice particles for Wendigo	2021-02-27 01:42:46 -05:00
jshipsey	ce3b2141e1	theropod retrofit, some more moves	2021-02-27 01:42:46 -05:00
jshipsey	5792faa992	some new moves, combine biped weapons into one file	2021-02-27 01:42:46 -05:00
jshipsey	57d5e90ddd	full bipedsmall armor swaps	2021-02-27 01:42:46 -05:00
Sam	df70976ff5	Fixed particles.	2021-02-27 01:42:46 -05:00
jshipsey	cb59c8017e	anim tweaks, more loadout setup	2021-02-27 01:42:46 -05:00
jshipsey	130d51786a	golem retrofit	2021-02-27 01:42:46 -05:00
Timo Kösters	a4513fe09d	Improve particles	2021-02-27 01:42:46 -05:00
jshipsey	952a77f94d	speedier weapons initial testing	2021-02-27 01:42:45 -05:00
jshipsey	aa4237b019	BL improvements, various fixes	2021-02-27 01:42:45 -05:00
jshipsey	e4e25e20c9	rebase	2021-02-27 01:42:45 -05:00
jshipsey	0dc8b2e482	rendering	2021-02-27 01:42:45 -05:00
jshipsey	ca3248cc93	new dungeon setups, new npcs, weapon specific loadouts, anims	2021-02-27 01:42:45 -05:00
jshipsey	ac16a8900d	bow	2021-02-27 01:42:45 -05:00
jshipsey	66664f3f89	the stabs	2021-02-27 01:42:45 -05:00
jshipsey	6a57dd25d0	wielding	2021-02-27 01:42:45 -05:00
jshipsey	31208e29ee	run anim tweaks	2021-02-27 01:42:45 -05:00
unknown	559ece5ede	More npcs work	2021-02-27 01:42:45 -05:00
unknown	6f18d16aa2	Add new quadmeds npcs with rough offsets	2021-02-27 01:42:44 -05:00
Snowram	ebfb59f041	Trims skeletal attributes	2021-02-27 01:42:44 -05:00
Snowram	f48fea57f4	Sahagin, Adlet npcs	2021-02-27 01:42:43 -05:00
jshipsey	7cf723bb9d	gnome	2021-02-27 01:42:43 -05:00
jshipsey	266986626d	biped_small setup	2021-02-27 01:42:43 -05:00
Samuel Keiffer	8e07174c1d	Merge branch 'aweinstock/coin-item' into 'master' ... Add a coin item and make amounts visible on dropped items. See merge request veloren/veloren!1821	2021-02-26 04:17:12 +00:00
Samuel Keiffer	6af9e58965	Merge branch 'add-gemu-models' into 'master' ... Add sword and bow models from backlog See merge request veloren/veloren!1818	2021-02-26 02:59:51 +00:00
Avi Weinstock	7d2e8f72eb	Add a coin item and make amounts visible on dropped items.	2021-02-25 21:31:30 -05:00
Avi Weinstock	e1484c28c0	Finish plumbing MaterialStatsManifest. Fix issue with speed clamping when recursing through components. Improve statblocks in item tooltips.	2021-02-25 15:26:49 -05:00
Sam	b0b4a07b9e	Bows	2021-02-24 20:37:43 -05:00
Sam	ee5c9d78ca	Swords	2021-02-24 18:54:06 -05:00
heydabop	d4e3a3f29f	#966 - Add setting to invert controller camera Y axis	2021-02-24 10:39:44 -06:00
Avi Weinstock	78014d7d3b	Put material stats in their own manifest, and multiply a form's stats by the weighted average of the material multipliers.	2021-02-23 15:49:34 -05:00
Avi Weinstock	4e57678f34	Support modular weapon components made from a tagged material using the material as a multiplier.	2021-02-23 15:31:51 -05:00
Snowram	14c252d8b2	Merge branch 'snowram/turret' into 'master' ... Object animation, beam fixes, turret implementation See merge request veloren/veloren!1805	2021-02-23 20:16:56 +00:00
Samuel Keiffer	e1be8dbcd9	Merge branch 'aweinstock/quickfix-sword-spin-speed' into 'master' ... Fix description for the sword spin speed skill tree upgrade (previously it was... See merge request veloren/veloren!1814	2021-02-23 03:14:44 +00:00
Imbris	f33d3873b4	Merge branch 'aweinstock/modular-weapon-rigging' into 'master' ... Support modular weapon voxel meshes being made by assembling their components. See merge request veloren/veloren!1806	2021-02-23 00:45:26 +00:00
Avi Weinstock	c3ac8a1b51	Support modular weapon voxel meshes being made by assembling their components.	2021-02-23 00:45:26 +00:00
Avi Weinstock	ada4ca39f7	Fix description for the sword spin speed skill tree upgrade (previously it was a copy of damage's description).	2021-02-22 19:37:20 -05:00
Marcel	72bd0f42fc	Merge branch 'xMAC94x/prot_improvements' into 'master' ... xMAC94x/prot_improvements See merge request veloren/veloren!1796	2021-02-22 22:47:43 +00:00
Marcel Märtens	e3ef4422b6	cleanup ClientConnArgs	2021-02-22 21:07:20 +01:00
Snowram	684961b15c	Adds look_dir to anims, humanoid heads pivot fixes	2021-02-22 20:00:06 +01:00
Marcel Märtens	3f5c64bec0	Client::new can now resolve DNS requests, better networking error messages	2021-02-22 17:35:19 +01:00
Marcel Märtens	1a7c179bbb	share tokio Runtime between Client and Server, name rayon Threadpool	2021-02-22 17:35:06 +01:00
Marcel Märtens	514d5db038	Update Network Protocol ... - now last digit version is compatible 0.6.0 will connect to 0.6.1 - the TCP DATA Frames no longer contain START field, as it's not needed - the TCP OPENSTREAM Frames will now contain the BANDWIDTH field - MID is not Protocol internal Update network - update API with Bandwidth Update veloren - introduce better runtime and `async` things that are IO bound. - Remove `uvth` and instead use `tokio::runtime::Runtime::spawn_blocking` - remove futures_execute from client and server use tokio::runtime::Runtime instead - give threads a Name	2021-02-22 17:34:55 +01: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
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
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
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
Sam	411b4083b1	Added 1h hammers. ... Fixed audio tests.	2021-02-19 17:30:24 -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	582c3f8459	Check for prerequisite skill in using an ability is no longer hardcoded.	2021-02-19 17:30:21 -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
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
Marcel Märtens	ea8ab1ce7a	Great improvements to the codebase: ... - better logging in network - we now notify the send of what happened in recv in participant. - works with veloren master servers - works in singleplayer, using a actual mid. - add `mpsc` in whole stack incl tests - speed up internal read/write with `Bytes` crate - use `prometheus-hyper` for metrics - use a metrics cache	2021-02-17 16:15:00 +01:00
Marcel Märtens	9884019963	COMPLETE REDESIGN of network crate ... - Implementing a async non-io protocol crate a) no tokio / no channels b) I/O is based on abstraction Sink/Drain c) different Protocols can have a different Drain Type This allow MPSC to send its content without splitting up messages at all! It allows UDP to have internal extra frames to care for security It allows better abstraction for tests Allows benchmarks on the mpsc variant Custom Handshakes to allow sth like Quic protocol easily - reduce the participant managers to 4: channel creations, send, recv and shutdown. keeping the `mut data` in one manager removes the need for all RwLocks. reducing complexity and parallel access problems - more strategic participant shutdown. first send. then wait for remote side to notice recv stop, then remote side will stop send, then local side can stop recv. - metrics are internally abstracted to fit protocol and network layer - in this commit network/protocol tests work and network tests work someway, veloren compiles but does not work - handshake compatible to async_std	2021-02-17 12:39:47 +01:00
Marcel Märtens	5aa1940ef8	get rid of async_std::channel ... switch to `tokio` and `async_channel` crate. I wanted to do tokio first, but it doesnt feature Sender::close(), thus i included async_channel Got rid of `futures` and only need `futures_core` and `futures_util`. Tokio does not support `Stream` and `StreamExt` so for now i need to use `tokio-stream`, i think this will go in `std` in the future Created `b2b_close_stream_opened_sender_r` as the shutdown procedure does not need a copy of a Sender, it just need to stop it. Various adjustments, e.g. for `select!` which now requieres a `&mut` for oneshots. Future things to do: - Use some better signalling than oneshot<()> in some cases. - Use a Watch for the Prio propergation (impl. it ofc) - Use Bounded Channels in order to improve performance - adjust tests coding bring tests to work	2021-02-17 12:38:53 +01:00
Marcel Märtens	1b77b6dc41	Initial switch to tokio for network, minimum working example.	2021-02-17 12:37:59 +01:00
Caelan	dda4931f46	Clean and update dependencies ... * Remove tweak feature * Remove const-tweaker * Update tiny_http * Update bitvec to 0.21.0 * Downgrade euc to avoid conflict with vek 0.12.0 * Require exactly vek 0.12.0 * Update all other dependencies automatically based on these changes * Update gilrs to latest at the request of Ada Lovegirls * Update meshing benchmarks to new criterion API	2021-02-17 01:27:06 -08:00
Imbris	1a3e015da7	Merge branch 'huettner94/minimap_settings_persistence' into 'master' ... Persist minimap settings See merge request veloren/veloren!1785	2021-02-17 00:57:07 +00:00
Joshua Barretto	4d19308612	Merge branch 'lboklin/quat-ori' into 'master' ... Redefine Ori as a quaternion See merge request veloren/veloren!1755	2021-02-16 22:39:11 +00:00
Felix Huettner	589ffd2a97	Persist minimap settings ... This change persists the open/close state as well as the facing-north state of the minimap to the settings file.	2021-02-16 23:16:16 +01:00
Imbris	c2af25e1f6	Merge branch 'huettner94/minimap_rotation' into 'master' ... Allow minimap to always face north See merge request veloren/veloren!1784	2021-02-16 22:04:48 +00:00
Imbris	1352d7ad9c	Merge branch 'quellus/max-name-length' into 'master' ... Limit character name length Closes #528 See merge request veloren/veloren!1774	2021-02-16 21:29:45 +00:00
Quellus	8b4230db61	Limit character name length	2021-02-16 21:29:45 +00:00
Felix Huettner	b8d5b812e1	Allow minimap to always face north ... Some players prefer their minimap to always face north for better orientation.	2021-02-16 19:57:19 +01:00
Ada Lovegirls	06575f601e	Merge branch 'master' into 'ada/improve-controller-bindings' ... # Conflicts: # CHANGELOG.md	2021-02-16 15:30:46 +00:00
Avi Weinstock	03d28f7d93	Implement tags for items, allowing a crafting recipe to take any item with that tag as input. ... - Added a recipe that turns any of the cloth equipment dropped by villagers into 1x cloth scraps. - Animate placeholder items for tagged crafting.	2021-02-16 01:05:54 +00:00
Ludvig Böklin	0f1227ca7d	Use nlerp for interpolating rotations in animation	2021-02-15 11:01:59 +01:00
AdaLovegirls	390812f54e	Improve controller keybindings	2021-02-14 21:31:31 -06:00
Avi Weinstock	c984035976	MR 1775 review fixes. ... - Separate `invite` machinery from `group_manip` into it's own thing (includes renaming `group_invite` to `invite` where applicable). - Move some invite/trade machinery to `ControlEvent`. - Make `TradePhase` a proper enum instead of a bunch of bools. - Make `TradeId` a proper newtype. - Remove trades from `Trades` on accept (previously was only on decline). - Typo fixes/misc cleanup. - Add bullet point for trading to the changelog.	2021-02-14 11:13:56 -05:00
Avi Weinstock	232ddb0860	Polish trading implementation and address review comments. ... - Fix item swapping edge case - Document more assumptions/edge cases - fmt and clippy - s/ServerGeneral::GroupInvite/ServerGeneral::Invite/ - Use `Client::current` in `Client::is_dead`	2021-02-14 11:11:35 -05:00
Ludvig Böklin	84990553e0	Use Ori for base rotation matrix	2021-02-13 11:02:50 +01:00
Avi Weinstock	f6db8bb7c4	Implement actual inventory-manipulation part of trading server side.	2021-02-12 18:43:10 -05:00
Avi Weinstock	abb5684883	Trade implementation progress. ... - Accept/decline buttons that submit the proper messages - A phase2 screen that renders the (item, quantity) pairs as text - More checks in the trade state machine server-side.	2021-02-12 18:43:10 -05:00
Avi Weinstock	e2b55e0706	Implement enough of a trade UI that dragging & dropping items into it round-trips between clients.	2021-02-12 18:43:09 -05:00
Avi Weinstock	aeb2398fc6	Trade implementation progress. ... - Server messages now bring up the trade window. - When a trade is declined, it closes the window on both clients.	2021-02-12 18:43:09 -05:00
Avi Weinstock	ae528124fc	Trade implementation progress. ... - State machine for modifying trades. - ServerGeneral/ClientGeneral messages.	2021-02-12 18:43:09 -05:00
Avi Weinstock	e9b811b62b	Plumb trade requests through the group invite UI, such that they can be accepted/declined without impacting the counterparty's movement.	2021-02-12 18:43:09 -05:00
Avi Weinstock	250391656f	Initial draft of trade UI (creates a placeholder window that acts like crafting in terms of bringing up the bag, defaulting to the "r" key).	2021-02-12 18:43:09 -05:00
DaforLynx	ebbb06a400	Added crickets blocktype, added 3 new cricket sounds, made crickets chirp consistently, made frogs more sporadic	2021-02-12 00:54:42 +00:00
Justin Shipsey	44a9d8dc71	Merge branch 'nward/chat-input-color-icon-rebased' into 'master' ... Rebase !1447 Chat input color and icon reflect channel message is sent to. See merge request veloren/veloren!1769	2021-02-10 19:42:59 +00:00
Quellus	63952875d9	Rebase !1447 Chat input color and icon reflect channel message is sent to.	2021-02-10 19:42:59 +00:00
Imbris	3e98e18c46	Merge branch 'aweinstock/sort-crafting' into 'master' ... Crafting UI: sort items lexicographically by craftability and then alphabetically. See merge request veloren/veloren!1767	2021-02-10 04:04:42 +00:00
Avi Weinstock	5d0c18efeb	Crafting UI: sort items lexicographically by craftability and then alphabetically.	2021-02-09 19:30:54 -05:00
Snowram	477bdfdfe7	Adresses some comments, various visual tweaks	2021-02-10 00:30:23 +01:00
Ludvig Böklin	065e260e78	Code quality	2021-02-09 14:06:27 +01:00
Ludvig Böklin	fa78674840	Encourage migration towards using quaternion in animations	2021-02-09 13:52:44 +01:00
Ludvig Böklin	582ddfc3cd	Ori: add tests, rename to_vec() => look_vec(); Dir: add methods, normalize on rot	2021-02-09 13:52:03 +01:00
Imbris	357cb26e05	Update native_dialog to 0.5.2	2021-02-07 00:48:57 -05:00
Ludvig Böklin	a1ff9ab83f	Redefine Ori as a quaternion	2021-02-05 09:33:14 +01:00
Pascal Fuhrmann	9f7637ab21	Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts	2021-02-05 01:39:12 +00:00
James Melkonian	23b1df3cdd	Add basic NPC interaction and fix NPC chat spamming	2021-01-31 20:29:50 +00:00
Joshua Barretto	60c16e57b1	Added snow particles	2021-01-31 15:15:17 +00:00
DaforLynx	b906473f4e	Aughihopethisworks	2021-01-30 22:27:12 -08:00
Marcel	b88f04215e	Merge branch 'DaforLynx/small-sound-fixes' into 'master' ... Small audio fixes; addresses #939 and #940 Closes #940 and #939 See merge request veloren/veloren!1739	2021-01-29 11:37:10 +00:00
DaforLynx	c6e262c4ce	Small audio fixes; addresses #939 and #940	2021-01-29 11:37:10 +00:00
jiminycrick	a02444825d	Address some comments ... Eliminated extra stagger state Responding to more comments Move poise character state changes to character behavior system Move poise out of JoinTuple/Data Finish up comments (various fixes)	2021-01-28 17:31:05 -08:00
jiminycrick	152156d065	Fix rebase and scrub poise from UI	2021-01-28 17:22:39 -08:00
jshipsey	d456271921	animal stuns ... Fix rebase	2021-01-28 17:22:39 -08:00
jiminycrick	661764f4aa	Some preliminary balancing ... Fix rebase	2021-01-28 17:22:39 -08:00
jshipsey	29732bb763	starting stun anim ... stagger anim, mirroring, bettern walk anim wielding with stuns/stagger Knockback fix Added Poise documentation/comments	2021-01-28 17:22:37 -08:00
jiminycrick	8b97199245	Update rand dependency	2021-01-26 20:35:08 -08:00
Entropy9s	1f6cf7e155	StaminaPlus buff, modifying stamina via buffs ... trying to fix this, coming back to this later please remember to change potion back future self! this ALMOST works. maybe MR ready, kinda jank tho so close, and yet so far... IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO did the same with health, ill fix this garbage l8r think we're basically done here whoops forgot to change the food back fixing and cleaning up part 1 fixed everything part 2 now with buff images ran clippy + fmt, fixed items that i modified bracket bulldozing, boldly hopefully this should be good? need to rebase real quick please let me be done StaminaPlus buff, modifying stamina via buffs trying to fix this, coming back to this later please remember to change potion back future self! this ALMOST works. maybe MR ready, kinda jank tho so close, and yet so far... IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO did the same with health, ill fix this garbage l8r think we're basically done here whoops forgot to change the food back fixing and cleaning up part 1 fixed everything part 2 now with buff images ran clippy + fmt, fixed items that i modified hopefully this should be good? cargo clippy fmt stuff deleted an extraneous file?? how did that even...?	2021-01-26 22:47:55 +00:00
Scott Williams	0cde434e3b	All gems make a sound.	2021-01-25 22:53:23 +00:00
Scott Williams	157e56d8ca	Removed Shiny Gem, Added migration to change shiny gems to diamonds. Changed shiny gem recipes to diamonds	2021-01-24 16:40:22 +00:00
Justin Shipsey	5117edcff9	Merge branch 'pfau/sceptres' into 'master' ... 6 new sceptres, add DPS display to tooltips See merge request veloren/veloren!1724	2021-01-24 03:14:32 +00:00
Marcel	82147653df	Merge branch 'torvus-quick-fix' into 'master' ... Fix torvus See merge request veloren/veloren!1720	2021-01-23 22:31:15 +00:00
Monty	7cbf946a65	6 new sceptres, add DPS display to tooltips	2021-01-23 23:10:36 +01:00
Samuel Keiffer	39d1c9e885	Merge branch 'sam/skill-balancing-1' into 'master' ... Skill balancing See merge request veloren/veloren!1716	2021-01-23 21:12:35 +00:00
Sam	77312ccdd4	Move outcome vec from being defined in frontend and server to common.	2021-01-23 15:17:36 -05:00
Imbris	47bd74469b	Merge branch 'imbris/update-winit' into 'master' ... Update winit and iced See merge request veloren/veloren!1717	2021-01-23 09:22:58 +00:00
Imbris	7cbbb70c42	Merge branch 'pizzaluc/unlimited_FPS' into 'master' ... Implemented #896 - Added option for Unlimited FPS Closes #896 See merge request veloren/veloren!1713	2021-01-23 08:34:38 +00:00
Lucas Vulpius	43b5559325	Implemented #896 - Added option for Unlimited FPS	2021-01-23 08:34:38 +00:00
Justin Shipsey	fb09d14725	Merge branch 'Rotsuoy/SavannaGrass' into 'master' ... Rotsuoy/savanna grass See merge request veloren/veloren!1711	2021-01-23 07:46:54 +00:00
Rotsuoy	994677a4d0	Rotsuoy/savanna grass	2021-01-23 07:46:54 +00:00
Imbris	adaea096d2	Update winit and iced	2021-01-23 01:09:33 -05:00
Sam	5e4b6809ca	Sceptre nerfs.	2021-01-22 22:46:18 -05:00
Sam	4014b28d19	Removed body from stats component as there is already a body component.	2021-01-22 16:50:22 -05:00
Justin Shipsey	6de8ca32ce	Merge branch 'sam/lactose-tolerant-golems' into 'master' ... Gives golems a spin attack See merge request veloren/veloren!1709	2021-01-22 07:30:53 +00:00
Snowram	6ee87221e6	Use improved pullback on golem anim	2021-01-22 06:13:43 +01:00
Sam	b5a3b3442c	Addressed comments.	2021-01-21 17:45:03 -05:00
Snowram	8b06d844f7	Golem spinmelee anim	2021-01-21 01:23:10 +01:00
Acrimon	b464a1876e	update itertools for voxygen	2021-01-20 16:00:08 +01:00
Acrimon	9f16a946ee	update a few deps	2021-01-20 15:53:58 +01:00
Monty Marz	1eb7f78189	Revert "Added TR translations for deaths by debuffs." ... This reverts commit 0817e45e13.	2021-01-20 11:20:06 +00:00
jiminycrick	7dda25a66d	More footstep sfx based on distance	2021-01-19 19:51:19 -08:00
Monty Marz	ac60bf5794	Better visuals for skill button labels, don't show "0 EXP" in the SCT ... Made functions that were called every frame significantly cheaper. Final UI fixes.	2021-01-19 08:08:29 -05:00
Sam	eaa41c7dea	Skills are now factored into combat rating. New formula for exp scaling per SP. ... Adjust lvl up msg fade Add female humanoid names WIP Changed text formatting when skill is max level. Added message to show you have 0 skill points available. Addressed a lot of comments. various changes to UI - fix skillbar offset - remove CR indicators for group members - add CR indicators to group member frames - use unified CR indicator icon Exp reward tweaks. Fixed flamethrower range skill description.	2021-01-19 08:08:26 -05:00
jshipsey	0b156542e4	roll keyframes ... Changed roll to have non-fixed acceleration.	2021-01-19 08:08:21 -05:00
jshipsey	5d1993009f	keyframed axe spin ... Fixed error in converting FK to entity_id from character_id. Giant match statements in persistence. Tweaked roll. Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.	2021-01-19 08:08:18 -05:00
Monty	5362000de4	adjusted potions, refined level up message animation ... fixed incorrect translation used on axe double strike regen skill Changed migration so that skills and skill groups foreign key to entity_id instead of character_id	2021-01-19 08:08:14 -05:00
Monty Marz	de5c5702b3	stats display ... Addressed comments. Addressed comments.	2021-01-19 08:08:11 -05:00
Sam	c809569f6b	Added level up sound to skill point gain. Fixed tests. ... Fixed duplicate roll description.	2021-01-19 08:08:08 -05:00
jiminycrick	3d44ac2c35	Humanoid skill config and AI skill check ... updated axe skill with correct icons	2021-01-19 08:08:05 -05:00
Noé	acbd965e65	implemented en translation for Hammer, Bow, Scepter and Staff skills ... skill tree translation Clamped earning SP to avoid u16 overflow. translation fixes Fixed exp scaling function Fixed exp scaling function remove debug combat rating display Update overhead.rs implemented en translation for Axe	2021-01-19 08:08:02 -05:00
Sam	a606313856	Added scaling exp costs per skill point. ... Fix tooltip being red. multiple fixes, started translation change exp giving items adjust loot tables adjust combat rating indicators fix group frame offsets	2021-01-19 08:07:57 -05:00
Sam	6ce422748c	Added SkillSetConfig to specify skill sets for npcs.	2021-01-19 08:07:55 -05:00
Sam	968b66260e	Levling health gives you health. Added combat scaling to UI.	2021-01-19 08:07:54 -05:00
Sam	4f552a736e	Added skill point costs to tooltips.	2021-01-19 08:07:53 -05:00
Sam	ae8c8b47f1	Added tooltips with numbers. Balancing on some skills. ... Added experience scaling for tougher enemies.	2021-01-19 08:07:51 -05:00
Sam	89766b2b34	Added command to give yourself skill points. ... adjusted social window Changelog	2021-01-19 08:07:49 -05:00
Sam	986c05621a	Wired up skill UI to check for prerequisites being met and sufficient skill points. ... available SP check in general HUD, more skill icons Trimmed 2000 lines from a file. UI tweaks	2021-01-19 08:07:45 -05:00
Sam	4b52574750	Skill point gains are displayed in hud. ... level up message visuals and functionality Handles simultaneous skill point gains in UI.	2021-01-19 08:07:41 -05:00
Sam	b6d2d48ead	Exp floaters. ... You load in with correct energy and health values now.	2021-01-19 08:07:36 -05:00
Monty Marz	30df603115	flashing buttons for available points, WIP lock/unlock indicator ... Condensed UI code. Removed some hardcoding. icons squash later, WIP colouring for unavailable skills	2021-01-19 08:07:33 -05:00
Sam	51c0bd765f	Database support for refunding skills. ... Nonfunctional xp floaters, squash when working. more icons, lock visuals	2021-01-19 08:07:29 -05:00
Monty Marz	48bd921d0a	EXP bar and available points UI ... fix overhead UI Add WIP overhead difficulty indicator readd commented out exp counter for later use Wired skill information into UI.	2021-01-19 08:07:25 -05:00
Sam	c0c45a1996	Purged stats, including level and experience	2021-01-19 08:07:23 -05:00
Sam	82885af9c4	UI now shows how many levels you've invested into a skill.	2021-01-19 08:07:22 -05:00
Sam	48c98b11cf	General combat skill tree. ... UI for general skill tree	2021-01-19 08:07:20 -05:00
Monty Marz	58d9534496	cleaned up skillbar, adjusted buffs placing ... cleaned up skillbar, adjusted buffs placing cleaned up skillbar, adjusted buffs placing render diary example items in voxygen instead of using pre-rendered image files	2021-01-19 08:07:16 -05:00
Sam	bde2bc1f77	UI for sword skill tree ... Axe skill tree UI Hammer skill tree UI Bow skill tree UI moar renders Staff skill tree UI Sceptre skill tree UI	2021-01-19 08:07:12 -05:00
Monty Marz	3f436079e8	Skill-Tree UI ... switchable tabs rework icons, fix cursor toggle auto slot placing Bow leap skill changed to bow glide skill.	2021-01-19 08:07:06 -05:00
Sam	cc60ca58be	Added sword skill tree	2021-01-19 08:06:59 -05:00
Jesus Bracho	ec79890335	Provide buff information on killed entities	2021-01-18 05:46:53 +00:00
Ben Wallis	c785e75e60	Follow-up fixes from review of inventory MR	2021-01-10 11:27:09 +00:00
Monty Marz	06e7ac25c1	fix loot tables, enemy bar color change	2021-01-09 15:26:24 +01:00
Scott Williams	c09098ee5f	Changed default option to false for smooth_pan_enable.	2021-01-08 21:08:57 +00:00
Ben Wallis	aef2637288	Refactored loadout to have public functions for each slot instead of requiring callers to use the _INDEX consts	2021-01-08 19:12:09 +00:00
Joshua Barretto	1604616768	Merge branch 'ccgauche/new-wasmer-backend' into 'master' ... ccgauche/new wasmer backend See merge request veloren/veloren!1644	2021-01-08 08:48:31 +00:00
ccgauche	06ffe61219	Added feature flag ... changed field name to size	2021-01-08 08:48:30 +00:00
Imbris	58ec4760a5	Move to WindowEvent from DeviceEvent for zooming	2021-01-08 01:38:33 -05:00
Joshua Barretto	a4b9230f03	fixed Cargo.lock conflict ... Fixed `crossbeam-queue` being referenced twice in the lockfile	2021-01-07 20:25:12 +00:00
Benoît du Garreau	67642b0467	Use concat to build i18n specifiers"	2021-01-04 00:06:14 +01:00
Benoît du Garreau	055df2a8df	Avoid a reallocation	2021-01-04 00:06:14 +01:00
Benoît du Garreau	09e38e085c	Fix i18n::list_localization scanning the filesystem on each call	2021-01-04 00:06:14 +01:00
Marcel Märtens	c37384979c	switch toolchain to nightly-2021-01-01	2021-01-03 21:31:21 +01:00
Benoît du Garreau	8ced0a3810	Fix i18n::list_localizations	2021-01-03 17:48:23 +01:00
Imbris	17be17834e	Merge branch 'cache-video-modes' into 'master' ... Caching video modes fixes #729 Closes #729 See merge request veloren/veloren!1670	2021-01-02 06:43:34 +00:00
Vincent Foulon	d54f5ac5f8	cargo fmt	2021-01-01 23:37:21 +01:00
nobbele	c1859b46f2	caching video modes fixes #729	2021-01-01 17:51:37 +01:00
Vincent Foulon	f8cb45f2f0	verify every localization file instead of just the manifest	2020-12-31 12:32:23 +01:00
Vincent Foulon	b1f2a4eff5	fix wrongly named variables + rename i18n_files function + capitalize comments	2020-12-31 12:32:22 +01:00
Vincent Foulon	017bd86185	cargo fmt	2020-12-31 12:32:22 +01:00
Vincent Foulon	7a4c3fa9a6	renamed _root.ron files to _manifest.ron	2020-12-31 12:32:21 +01:00
Vincent Foulon	5b62398e80	update tests to match the new folder layout	2020-12-31 12:32:20 +01:00
Vincent Foulon	7150e1f820	rename a translation file and clear some commented code	2020-12-31 12:32:19 +01:00
Vincent Foulon	4d7b985be1	clean even more code	2020-12-31 12:32:19 +01:00
Vincent Foulon	a0a51110a5	clear i18n code + revert back some other part of the code to its original state	2020-12-31 12:32:18 +01:00
Vincent Foulon	59651eb032	Convert Localization from Asset to Compound	2020-12-31 12:32:18 +01:00
Vincent Foulon	2b6b2fd12e	use RonLoader as LocalizationFragment's loader directly	2020-12-31 12:32:17 +01:00
Vincent Foulon	bb7cc3d53b	(temp?) fixed list_localization function + add sub_directories to other languages	2020-12-31 12:32:17 +01:00
Vincent Foulon	00140384f7	convert the other languages into folders	2020-12-31 12:32:16 +01:00
Vincent Foulon	3295ff2c58	created LocalizationFragment + load localization sub directories	2020-12-31 12:32:16 +01:00
Vincent Foulon	70c336c6cb	fix init_localization return value being in comment	2020-12-31 12:32:15 +01:00
Vincent Foulon	924c24fa78	(PoC)(WIP) Convert single translation file to a folder	2020-12-31 12:32:15 +01:00
Ben Wallis	5636083e27	* Fixed character load errors not being handled in Voxygen. ... * Improved server error message for character load errors. * Added server logging for item asset load errors during character load. * Fixed character select error message dialog not supporting long messages.	2020-12-30 19:29:22 +00:00
Acrimon	ce27cfb30f	update some error handling code	2020-12-29 01:21:09 +01:00
Sarra Kitty	e8eb2b3a6c	new gliders ... added sandraptor glider added sandraptor glider stuff working on other raptor gliders adding file and placeholder model (copy of morpho) for monarch butterfly gliders adding models for snow and wood raptor gliders added a proper model for the monarch glider adding crafting recipies for raptor gliders, and raptor feather item for the recipe. Made monarch and morpho rare drops in cave loot table made raptors drop their feathers fmt	2020-12-24 02:54:18 +00:00
Frinksy	53d5a9373e	fixing #881 ... - Multiple buffs make the UI icons flicker	2020-12-22 15:40:57 +00:00
Adam Blanchet	5f9984df12	working towards #861 - ... Use scancodes for (at minimum) key remapping added ScanCode fallback for when winit doesn't provide a VirtualKeyCode renamed SKey to ScanKey	2020-12-18 10:01:30 +01:00
Benoît du Garreau	8aac030ecd	Fix bad specifier breaking on Windows	2020-12-17 17:22:02 +00:00
Marcel	d2da8d671f	Merge branch 'a1phyr/use_assets_manager' into 'master' ... Use `assets_manager` to load assets See merge request veloren/veloren!1624	2020-12-17 12:25:29 +00:00
Marcel	78e9f3de28	Merge branch 'test_util' into 'master' ... Add simple tests to utils description functions See merge request veloren/veloren!1526	2020-12-17 11:20:19 +00:00
Benoît du Garreau	989683d2d3	Improve world::Index	2020-12-17 12:08:04 +01:00
Benoît du Garreau	ce9d706ed4	Fix clippy lints	2020-12-17 12:06:28 +01:00
Benoît du Garreau	7b4aa6d4cc	cargo fmt	2020-12-17 12:06:22 +01:00
Benoît du Garreau	d090eefb00	Move the asset module to a single file	2020-12-17 12:06:13 +01:00
Benoît du Garreau	0cf164f33a	Use assets_manager to load assets	2020-12-17 12:06:07 +01:00
jiminycrick	60d5d62eef	Switched to hashbrown everywhere	2020-12-17 10:31:35 +01:00
Marcel Märtens	ea84cb138f	fix wrong alignment	2020-12-16 15:17:17 +01:00
Marcel Märtens	e8003a44dd	update specs	2020-12-16 14:31:16 +01:00
Marcel Märtens	a1b50a86c4	update guillotiere	2020-12-16 10:56:00 +01:00
Marcel Märtens	e3307344ab	get rid of some insecure dependencies	2020-12-16 10:42:36 +01:00
Marcel	24a840bc6b	Merge branch 'xMAC94x/dependencies' into 'master' ... update chrossbeam, tracy, prometheus (and reduce server deps to crossbeam-channel) See merge request veloren/veloren!1641	2020-12-16 09:33:34 +00:00
Justin Shipsey	e7249210f6	accel based run	2020-12-16 08:07:38 +00:00
Marcel Märtens	107fd432f5	update further crates	2020-12-16 08:56:21 +01:00
Marcel Märtens	26918d10c9	update chrossbeam, tracy, prometheus (and reduce server deps to crossbeam-channel)	2020-12-16 00:51:07 +01:00
Marcel	5600d93844	Merge branch 'james/healbomb-sfx-fix' into 'master' ... Healing bomb sfx fix See merge request veloren/veloren!1637	2020-12-15 13:15:32 +00:00
Joshua Barretto	494436be01	Hid plugins behind a feature flag to resolve Windows CI issue	2020-12-15 11:14:26 +00:00
jiminycrick	ce03fcfda3	Healing bomb sfx fix	2020-12-14 21:36:51 -08:00
Monty	8b9db7b179	cleanup, changelog, small bugfixes ... fmt fix rebase fmt	2020-12-14 21:52:24 +01:00
Monty Marz	b5a2104ca5	group member indicator visuals ... functional group member indicators adjust visuals z-comparison	2020-12-14 21:16:13 +01:00
Snowram	834670a641	Merge branch 'snowram/objects-offsets-ron' into 'master' ... Put objects offsets into a .ron file See merge request veloren/veloren!1627	2020-12-14 18:00:07 +00:00
Snowram	96ed008348	Puts objects offsets into a .ron file	2020-12-14 02:43:49 +01:00
Joshua Barretto	9f2e01617e	Merge branch 'plugins' into 'master' ... Plugins and codebase refactor See merge request veloren/veloren!1625	2020-12-14 00:53:09 +00:00
Samuel Keiffer	c3732a8a8c	Merge branch 'nahua/replace_sceptre_m2_sound' into 'master' ... Issue 872: Replace explosion sound with heal bomb sound for sceptre M2 See merge request veloren/veloren!1618	2020-12-13 23:18:30 +00:00
nahuakang	f3ed13ca09	Replace explosion sound with heal bomb sound for sceptre M2	2020-12-13 22:09:28 +01:00
Joshua Barretto	023888f560	Updated changelog, fmt and clippy fixes	2020-12-13 17:40:15 +00:00
Joshua Barretto	f8c8e342e6	Moved common networking code to common/net, clippy fixes	2020-12-13 17:23:45 +00:00
Marcel Märtens	534f083b08	get rid of insecure dependency completly	2020-12-11 16:13:57 +01:00
Monty Marz	f9d4d744a0	Better group frame placement	2020-12-10 21:31:19 +01:00
Monty Marz	f2ba7cc297	add baobabs, fix map difficulty, make mushrooms lootable	2020-12-10 18:06:29 +01:00
Marcel Märtens	ccb01e1898	adjust fmt and clippy after toolchain upgrade	2020-12-10 14:53:01 +01:00
Snowram	6713ac935f	Addressed comments	2020-12-08 23:04:21 +01:00
Snowram	2e8ac0688c	Adds accumulated velocity for animation	2020-12-08 23:03:41 +01:00
Snowram	f94a4ec90d	Improves fish_small, new npc	2020-12-08 23:03:39 +01:00
Snowram	72d73ecd38	Initial fish work	2020-12-08 23:03:38 +01:00
Marcel	ed9413e96a	Merge branch 'HiggsTardigradeTau/deltatime-lowest-delta-usage' into 'master' ... Resolve #867 - Make deltatime use the lowest delta of several frames to avoid 'teleport' effect after single-frame lag spike Closes #867 See merge request veloren/veloren!1592	2020-12-08 21:07:15 +00:00
HiggsTardigradeTau	57d3a595ce	Resolve #867 - Make deltatime use the lowest delta of several frames to avoid 'teleport' effect after single-frame lag spike	2020-12-08 21:07:14 +00:00
Sam	490915d384	Modified how most abilites that could scale were scaled.	2020-12-07 22:00:24 -06:00
Ben Wallis	81a8ee0c19	Changed logging to use termcolor crate to fix ansi control codes showing when run under Windows Command Prompt	2020-12-06 14:49:13 +00:00
Joshua Barretto	77a39d74d4	Removed public fields from Client, turned a character error into a frontend event	2020-12-05 11:20:25 +00:00
Joshua Barretto	e5ebbd31fa	Began using Grid<T> for LoD data	2020-12-05 11:20:25 +00:00
James Melkonian	71303fecfd	Aura System and Campfire Health Regen	2020-12-04 22:24:56 +00:00
Imbris	d1431d734a	Merge branch 'imbris/update-winit' into 'master' ... Don't drop the wayland clipboard Closes #855 See merge request veloren/veloren!1576	2020-12-02 01:33:29 +00:00
Imbris	d7f506cf71	Don't drop wayland clipboard	2020-12-01 19:35:32 -05:00
Imbris	b6b03c4a5f	Merge branch 'weldar/remove-ssaa' into 'master' ... Removed SSAA option Closes #871 See merge request veloren/veloren!1587	2020-12-02 00:21:30 +00:00
Marcel	bf136a62c5	Merge branch 'xMAC94x/veloren_anim_move' into 'master' ... move anim code from voxygen/src/anim to voxygen/anim See merge request veloren/veloren!1585	2020-12-01 20:01:26 +00:00
Marcel Märtens	e5e255cbd3	move anim code from voxygen/src/anim to voxygen/anim	2020-12-01 20:20:01 +01:00
Forest Anderson	57c2f21e4d	Cleaning	2020-12-01 10:28:39 -05:00
weldar	a2d98d31a7	Removed SSAA option to resolve issue #871.	2020-12-01 09:43:06 -05:00
Marcel Märtens	e398cca53c	move common_state into common_sys	2020-12-01 13:46:28 +01:00
Marcel Märtens	add7922653	Move Systems out of common into common_sys ... This requires to move `State` into a own crate called `common_state` which depends on `common` and `common_sys`	2020-12-01 13:44:07 +01:00
Marcel	9e5c31a27e	Merge branch 'xvar/tooltip-fade-fix' into 'master' ... Changed tooltip fade time from 100 to 0ms to fix tooltip glitching See merge request veloren/veloren!1567	2020-11-30 21:13:05 +00:00
Marcel	a189163910	Merge branch 'azymohliad/sun-movement-direction' into 'master' ... Fix Sun and Moon movement direction See merge request veloren/veloren!1568	2020-11-30 21:13:03 +00:00
Nicholas Kinney	885e1aac61	Offspec/larger scalemode range	2020-11-30 20:36:58 +00:00
Marcel Märtens	ca1601a980	Change the version number to 0.8	2020-11-28 11:25:58 +01:00
Andrii Zymohliad	8a6f08df91	Fix sun & moon movement direction ... They were rising on the west and setting on the east	2020-11-27 23:17:59 +02:00
Ben Wallis	7ce0c7fc05	Changed tooltip fade time from 100 to 0ms to fix tooltip glitching	2020-11-27 19:51:45 +00:00
Forest Anderson	9065d0ca02	Merge branch 'imbris/audio-fixes' into 'master' ... Stop unbounded wind volume when zooming out, make campfires quieter Closes #844 See merge request veloren/veloren!1566	2020-11-27 18:59:23 +00:00
Forest Anderson	c8735ba946	Merge branch 'timsueberkrueb/log-path-override' into 'master' ... Make VOXYGEN_LOGS override logs_path setting See merge request veloren/veloren!1565	2020-11-27 18:25:39 +00:00
Imbris	a96e9982c7	Stop unbounded wind volume when zooming out, make campfires quieter	2020-11-27 12:43:47 -05:00
Marcel	a431fe3fad	Merge branch 'sam/dehardcode-energy' into 'master' ... Graying out skills with insufficient energy no longer dependent on hard-coded values Closes #824 See merge request veloren/veloren!1560	2020-11-27 16:27:09 +00:00
Samuel Keiffer	352917d9cb	Graying out skills with insufficient energy no longer dependent on hard-coded values	2020-11-27 16:27:09 +00:00
Treeco	ca2e4080c0	Various tiny fixes: ... Text over lootbags no longer scales with distance due to performance Fixed meshing panic Fixed ambiant lighting default	2020-11-26 21:46:41 +00:00
Tim Süberkrüb	49e892b948	Make VOXYGEN_LOGS override settings ... This is needed to support package managers that enforce strict application confinement (e.g. snap).	2020-11-25 20:36:41 +01:00
Monty Marz	e7d27a2c21	fmt ... cleanup	2020-11-25 16:53:48 +00:00
Imbris	a545d099a2	Restore fix for dragging on windows platforms	2020-11-25 00:29:28 -05:00
Marcel	d1a9264a99	Merge branch 'angryanimals' into 'master' ... animal attacks See merge request veloren/veloren!1542	2020-11-25 01:33:20 +00:00
Sam	33e4448542	Replaced every unnecssary powf in the entire codebase with either powi or sqrt.	2020-11-24 18:28:24 -06:00
Sam	5461f002fe	Correct beam offsets used. Fix scaling damage on hammer M1. Add can_strafe function to body.	2020-11-24 17:56:39 -06:00
jiminycrick	aad9734055	Agent tactic refactoring ... Lower theropods spawns clippy, changelog review response	2020-11-24 17:49:00 -06:00
jiminycrick	1cf0aff5ef	More ai work ... balance Lavadrake AI tweaks feedback tweaks	2020-11-24 17:48:54 -06:00
jshipsey	d10dd83e5f	theropods in world, small tweaks	2020-11-24 17:48:51 -06:00
jshipsey	f411ff7e04	bunch of animations and more attacks	2020-11-24 17:48:51 -06:00
jshipsey	6f72e68ad6	hoof attack, tweaks	2020-11-24 17:48:50 -06:00
jshipsey	a27b086401	placeholder for charge animal, animated leapmelee, small fixes	2020-11-24 17:48:49 -06:00
jshipsey	1f59ef92d8	species specific speeds, more animation	2020-11-24 17:48:48 -06:00
jshipsey	c07d8df58b	assigning weapons, building animations ... ability mapping	2020-11-24 17:48:43 -06:00
jshipsey	e3e513cc11	initial quadlow ranged work	2020-11-24 17:48:27 -06:00
jshipsey	ae06016e9a	Wolf attacks and ai. ... initial wolf dash testing tool.rs Wolf attack AI	2020-11-24 17:48:20 -06:00
Joshua Barretto	46dc49bc0a	Fixed bit-twiddling colour bug	2020-11-24 18:44:41 +00:00
Christof Petig	a3db20c9d6	Show caves in map	2020-11-23 19:05:17 +01:00
Joshua Barretto	26fd40c0e3	Fmt, make clippy happy	2020-11-23 15:39:03 +00:00
Treeco	8922fd949f	Make zooming in then back out return to the previous zoom level	2020-11-23 10:58:22 +00:00
Joshua Barretto	0513a41981	Iteration order fix x2	2020-11-23 10:58:22 +00:00
Imbris	7c6fe69922	Show indicator over site icons	2020-11-23 10:58:22 +00:00
Joshua Barretto	765a1ca17b	Switched light map iteration order, fire bowls in dungeons	2020-11-23 10:58:21 +00:00
Treeco	a1236d4da0	Fixed map screens for rectangular worlds	2020-11-23 10:58:21 +00:00
Monty Marz	d069eb9a57	street lamp particles, ground fire bowl, misc fixes	2020-11-23 10:58:21 +00:00
Imbris	898bba8884	Demystify map site icon placement calculations	2020-11-23 10:58:21 +00:00
Joshua Barretto	b539ecf438	More lights, minimised light and glow map data	2020-11-23 10:58:21 +00:00
Joshua Barretto	4bb0da24b6	Addressed review comments	2020-11-23 10:57:57 +00:00
Joshua Barretto	df1b19ed64	Light/glow temporal interpolation hack	2020-11-23 10:57:57 +00:00
Joshua Barretto	bb9e593a44	Fixed glow AO	2020-11-23 10:57:57 +00:00
Joshua Barretto	d7bbceca2d	Added light/glow map sample interpolation for entities	2020-11-23 10:57:56 +00:00
Joshua Barretto	27e7fd0727	Preserved light/glow maps to prevent sprites/entities being lit when they shouldn't be	2020-11-23 10:57:56 +00:00
Joshua Barretto	51d1a2ecff	Added glow	2020-11-23 10:57:56 +00:00
Monty Marz	099dfc959f	translations, fixes	2020-11-23 10:57:56 +00:00
Joshua Barretto	93a86a951e	Tweaked default graphics settings	2020-11-23 10:57:56 +00:00
Monty Marz	82da969707	fix overly long names clipping on the minimap	2020-11-23 10:57:56 +00:00
Joshua Barretto	7850b0bcaf	Added site names, dungeon difficulty, better explosions	2020-11-23 10:57:55 +00:00
Monty Marz	5b907ede9e	fix hints	2020-11-23 10:57:55 +00:00
Monty Marz	884a5d9c51	fix scrolling on non-windows OS	2020-11-23 10:57:55 +00:00
Joshua Barretto	058908f603	Made flamethrower and healing staff emit light on use	2020-11-23 10:57:55 +00:00
Monty Marz	97934d1070	map fixes	2020-11-23 10:57:55 +00:00
Joshua Barretto	5930ca4a59	Temporarily make particles opaque to avoid depth-related rendering problems	2020-11-23 10:57:55 +00:00
Joshua Barretto	7eb437501d	Fixed various particle issues	2020-11-23 10:57:55 +00:00
Joshua Barretto	bcc220804a	Added exposure to settings	2020-11-23 10:57:55 +00:00
Monty Marz	8b6c73744e	more map stuff	2020-11-23 10:57:16 +00:00
Joshua Barretto	aa59d66a76	Fixed many map problems, re-added surface mist	2020-11-23 10:57:15 +00:00
Monty Marz	99b3a4465a	WIP map zooming and dragging	2020-11-23 10:57:15 +00:00
Monty Marz	c825e33f1a	map icon options WIP	2020-11-23 10:45:02 +00:00
Joshua Barretto	1d031538f9	Added HDR	2020-11-23 10:45:02 +00:00
Joshua Barretto	49df604de0	Better scattering and scatter (of both varieties)	2020-11-23 10:45:02 +00:00
Joshua Barretto	ee65b4fb17	Improved cloud quality by improving sun access heuristic	2020-11-23 10:45:02 +00:00
Monty Marz	1864f4626c	map icons	2020-11-23 10:45:01 +00:00
Joshua Barretto	b352ef5d55	Terrain pop-in, fixed agent pathfinding in water	2020-11-23 10:45:01 +00:00
Joshua Barretto	6adfa547db	Added site icons to main map	2020-11-23 10:45:01 +00:00
Joshua Barretto	d4d4f17d3c	Added world map size icons	2020-11-23 10:45:01 +00:00
Joshua Barretto	fc26305ac8	Increases maximum sprite dimensions (if you suspect an issue, check this commit)	2020-11-23 10:37:59 +00:00
Imbris	7ba2efcde2	Attempt to fix ui bug with changing screens causing inventory slots and such to disappear, presumably due to dpi differences	2020-11-22 14:22:39 -05:00
Imbris	1355c1e8f5	Move tracy frame markers to proper locations, add a few spans	2020-11-22 14:22:39 -05:00
Imbris	82b95974f1	Log errors occuring when client keeps retrying connection to the server	2020-11-22 03:54:19 -05:00
Imbris	e72c69ca41	Merge branch 'imbris/fix-apple-bug' into 'master' ... Fix issues with not being able to grab highlighted apples by unifying distance checking Closes #820 See merge request veloren/veloren!1532	2020-11-21 02:55:09 +00:00
Imbris	ea275e320f	Rename pos fields of Cube and Cylinder for enhanced clarity and added a few tests to the find_dist module	2020-11-20 20:51:44 -05:00
Samuel Keiffer	435d354dad	Merge branch 'sam/interrupting-rolls' into 'master' ... Rolling can now interrupt any attack. See merge request veloren/veloren!1537	2020-11-20 18:37:44 +00:00
Sam	987df30dc4	Fixed audio test, added changelog line.	2020-11-20 11:50:01 -06:00
Monty Marz	dd338eb142	Update simple.rs	2020-11-20 17:56:26 +01:00
Joshua Barretto	8981dce4c9	Merge branch 'Awkor/rotate-camera-character-selection' into 'master' ... Implement #334 - Enable camera rotation in character selection screen Closes #334 See merge request veloren/veloren!1377	2020-11-20 16:32:39 +00:00
jiminycrick	3ef00c4e76	Fix audio disabling	2020-11-19 10:46:31 -08:00
Snowram	d98bfa72ad	Improves bipedlarge and theropod anims, balance tweaks	2020-11-19 00:56:50 +01:00
Snowram	b48de84f8c	Adds 3 new npcs	2020-11-19 00:53:17 +01:00
Snowram	44fe398ba3	Adds 2 new npcs, some models tweaks	2020-11-19 00:53:13 +01:00
Snowram	42d2108c39	Adds mindflayer npc	2020-11-19 00:53:09 +01:00
Snowram	9bfccd42d3	Adds new animals	2020-11-19 00:53:02 +01:00
jiminycrick	1ce3827e22	Address comment	2020-11-18 13:31:13 -08:00
jiminycrick	2d2f267907	Addressed comments and fixed pipeline	2020-11-18 13:31:13 -08:00
jiminycrick	3b47add55a	Fully move sfx away from ECS event bus	2020-11-18 13:31:13 -08:00
jiminycrick	b3aa454f8e	Initial work to move combat sfx to outcomes	2020-11-18 13:31:12 -08:00
jiminycrick	77d624f640	Made level up sounds use outcomes instead of emitting an event	2020-11-18 13:31:12 -08:00
jiminycrick	9c87345135	Moved functions to client out of audio and generalized non-positional ambient sfx	2020-11-18 13:31:12 -08:00
jiminycrick	a9711eea01	Beginning to address comments	2020-11-18 13:31:12 -08:00
jiminycrick	c44a9092d3	Biome definition tweaks and more sfx	2020-11-18 13:31:12 -08:00
jiminycrick	f0d14ebe20	fix rebase	2020-11-18 13:31:12 -08:00
jiminycrick	a684bc90fd	Quadraped footsteps and songs in biomes	2020-11-18 13:31:12 -08:00
jiminycrick	27dc43fe18	Audio test fixes	2020-11-18 13:31:12 -08:00
jiminycrick	ddd970b986	Even more clippy fixes	2020-11-18 13:31:12 -08:00
jiminycrick	e1fcb3744e	Comment out audio device picker	2020-11-18 13:31:12 -08:00
jiminycrick	ea1bc2941b	Clippy fixes	2020-11-18 13:31:12 -08:00
jiminycrick	d47e0bbb73	Getting merge ready minus device picker	2020-11-18 13:31:12 -08:00
jiminycrick	2d088faea4	Wind transition smoothing	2020-11-18 13:31:12 -08:00
jiminycrick	f182002e38	Underwater and cave reverb	2020-11-18 13:31:12 -08:00
jiminycrick	695cc7f5cb	Broken wind implementation	2020-11-18 13:31:12 -08:00
jiminycrick	9b759efe41	Snow footsteps	2020-11-18 13:31:12 -08:00
jiminycrick	09a1974974	River water sfx	2020-11-18 13:31:12 -08:00
jiminycrick	8f5a22671d	Re-added device selector to settings with new rodio	2020-11-18 13:31:12 -08:00
jiminycrick	decb0e3e24	Hackily upgraded rodio and cpal to 0.13	2020-11-18 13:31:12 -08:00
jiminycrick	d0bd5118bf	Made biome probabilities neater	2020-11-18 13:31:12 -08:00
jiminycrick	e880654f2e	Probability for biome play	2020-11-18 13:31:12 -08:00
jiminycrick	c8d79b0b0e	Dungeon and cave specific music	2020-11-18 13:31:12 -08:00
jiminycrick	0a9f1ee11c	Remove ambient channel system in favor of sfx system	2020-11-18 13:31:12 -08:00
jiminycrick	39d4ee8a96	Owls, campfires, and better bird sfx handling	2020-11-18 13:31:12 -08:00
jiminycrick	3169562a80	Night time sfx and swimming	2020-11-18 13:31:12 -08:00
jiminycrick	aa6b7cbb65	Bird calls from trees	2020-11-18 13:31:12 -08:00
jiminycrick	9e790f6cac	Really broken block sfx pushed so others can see	2020-11-18 13:31:12 -08:00
jiminycrick	3473347742	Sfx from blocks	2020-11-18 13:31:12 -08:00
jiminycrick	0689630d98	Fading music/ambient sounds decently upon biome transition	2020-11-18 13:31:11 -08:00
jiminycrick	b5aea464f3	Switch music at biome transitions	2020-11-18 13:31:11 -08:00
jiminycrick	46d3f6f6d2	Initial biome specific music and ambient sound channel	2020-11-18 13:31:11 -08:00
Imbris	7427367d96	Fix issues with not being able to grab highlighted apples by unifying distance checking	2020-11-17 23:06:02 -05:00
Snowram	950eb1976d	Addressed more comments	2020-11-17 23:54:01 +01:00
Snowram	83b2640e02	Makes basic beam Y offset depend on body scale	2020-11-17 23:27:13 +01:00
Snowram	7af561263d	Addressed comments	2020-11-17 23:27:13 +01:00
Snowram	93642428f2	Move eye sight and scale in body.rs, mounts tweaks	2020-11-17 23:27:13 +01:00
David Fisher	b93d4bf85c	Add simple tests to utils description functions ... I initially ended up in this file looking to take on issue #707 which I realized had been already done. Having touched the file though I thought it good to add some basic tests to get used to the workflow on the project and how things are setup here. This commit adds some basic requests and cleans up some comments which appear to have been left as placeholders for work which appears to have been completed already. I attempted to test the tool_desc and armor_desc functions, but realized I wasn't sure how to best create an instance of Armor or Tool without modifying other files to make more things public. This is my first commit on the project, and was intentionally kept simple accordingly.	2020-11-15 18:53:20 -05:00
Odd-Harald Lillestø Myhren	774ef72344	Merge branch 'master' into 'knarkzel/persist-combo-roll' ... # Conflicts: # CHANGELOG.md	2020-11-15 22:37:30 +00:00
Knarkzel	64da99a4d7	add new was_combo field to test	2020-11-15 23:49:01 +01:00
Joshua Barretto	171ef1d7b9	Upscaling support	2020-11-15 22:18:35 +00:00
Imbris	4872d285c3	Merge branch 'imbris/fix-font-selection' into 'master' ... Properly use localization specified fonts, fix swedish translation by adding... Closes #834 See merge request veloren/veloren!1521	2020-11-15 03:18:29 +00:00
Imbris	03c96a7c7b	Properly use localization specified fonts, fix swedish translation by adding other fonts to the font mapping list	2020-11-14 21:31:31 -05:00
Imbris	4f2512f126	Save the selected character, deselect character when deleting, auto select newly created character	2020-11-14 19:17:42 -05:00
Imbris	5dbb1aeae7	Merge branch 'imbris/fix-7' into 'master' ... Fix panic on minimizing window before the game starts up See merge request veloren/veloren!1514	2020-11-14 03:30:13 +00:00
Imbris	ff5b152525	Merge branch 'imbris/fix-6' into 'master' ... Fix issue where ui scale in the login menu was not updated when changed in-game Closes #578 See merge request veloren/veloren!1513	2020-11-14 02:49:41 +00:00
Imbris	a044981fd7	Fix panic on minimizing window before the game starts up	2020-11-13 21:09:19 -05:00
Imbris	1373b752ff	Merge branch 'imbris/fix-5' into 'master' ... Remove randomization of species and body_type with the randomize button in char creation See merge request veloren/veloren!1512	2020-11-14 01:56:28 +00:00
Imbris	51dd5110d0	Merge branch 'imbris/fix-3' into 'master' ... Tweak clock related things and fix voxygen tracy feature See merge request veloren/veloren!1506	2020-11-14 01:39:33 +00:00
Imbris	cff5439796	Fix issue where ui scale in the login menu was not updated when changed in-game	2020-11-13 20:17:59 -05:00
Imbris	1952785af2	Remove randomization of species and body_type with the randomize button in char creation	2020-11-13 19:43:32 -05:00
Samuel Keiffer	1ed90bd0bf	Merge branch 'sam/ron-abilities' into 'master' ... Move abilities to .ron files Closes #821 See merge request veloren/veloren!1508	2020-11-13 17:55:57 +00:00
Sam	b5f59f9cf3	Fixed tests. Addressed comments.	2020-11-13 10:41:34 -06:00
Monty Marz	7da8c71d89	radio buttons for buff position in settings	2020-11-13 14:32:15 +01:00
Monty Marz	691d1f5243	bigger buff icons above skillbar	2020-11-13 14:20:33 +01:00
Imbris	5fa2ac6e38	Handle window resizing properly to fix some bugs on startup	2020-11-12 23:56:36 -05:00
Imbris	f1ca3ccc69	Fix language and ui resolution in menus not updating when they are changed ingame	2020-11-12 23:03:44 -05:00
Imbris	37e4ea4669	Remove ability map from top level functions	2020-11-12 21:24:35 -06:00
Sam	9b4fa4e961	Started moving loading of ability manifest to an ecs variable.	2020-11-12 21:24:34 -06:00
Imbris	27d4310498	Add more catagories to common deps, store average busy dt as a duration, store frame delta times as seconds instead of milliseconds	2020-11-12 19:18:54 -05:00
Imbris	fffd5d0ef0	Fix offset issue in ui on startup	2020-11-11 23:47:07 -05:00
Imbris	c0e8298ac3	Display averaged busy dt	2020-11-11 23:26:13 -05:00
Imbris	d5dd126724	Add tracy feature that randomly disappeared back into voxygen	2020-11-11 22:33:02 -05:00
Imbris	a97b188bea	Make fps display and specification more precise	2020-11-11 21:47:22 -05:00
Snowram	af346806de	Addressed comments	2020-11-11 22:03:54 +01:00
Snowram	fe977f0a6c	Adds a speed stat to weapons	2020-11-11 22:03:53 +01:00
Joshua Barretto	7bce8b9615	More resiliant settings, better key defaults	2020-11-11 17:37:26 +00:00
Imbris	865482d768	ui: Improve login info banner gradient, smallify things, put login menu quit button at the bottom	2020-11-11 03:02:51 -05:00
Imbris	61c0780872	Remove uneeded commented code, add notes to remaining commented code, use source rect calculations from conrod backend code	2020-11-11 03:02:51 -05:00
Imbris	64d885a192	Clippy fixes	2020-11-11 03:02:51 -05:00
Imbris	584824d405	Tweak scrollbar in char select screen to look nicer, fix warnings, remove old ui code, add character loading/deleting/creating/error info popups	2020-11-11 03:02:23 -05:00
Imbris	9df8368c88	Add some tracing spans	2020-11-11 03:02:23 -05:00
Imbris	d2166fed3d	Make iced ui use scale from the settings	2020-11-11 03:02:22 -05:00
Imbris	eda7b380dd	Change glyph cache position tolerance to match changes in master	2020-11-11 03:02:22 -05:00
Imbris	469b048de9	Update iced	2020-11-11 03:02:22 -05:00
Imbris	90bfafc469	Fix tooltip positioning for tooltipped elements inside Scrollable widgets	2020-11-11 03:02:22 -05:00
Imbris	cd1a134c26	Fix bug in body.validate(), add sliders to iced char creation screen, make char selection screen more closely resemble the master version in style	2020-11-11 03:02:22 -05:00
Imbris	7aa8412556	Add tooltips in iced char creation to species, tools, randomize button, and create button	2020-11-11 03:02:22 -05:00
Imbris	fe7d65843b	Highlight button of selected character, enter the world if character is selected when enter key is pressed	2020-11-11 03:02:22 -05:00
Imbris	3b664d2efb	Fix tooltip border images, fade tooltips properly, improve tooltip positioning	2020-11-11 03:02:22 -05:00