4656 Commits

Author	SHA1	Message	Date
RunRobDog	17cd291613	make Spawn Entities tab in admin commands	2023-04-16 01:29:14 +02:00
Sam	9d503d1e1f	Debug items no longer have durability	2023-04-14 18:25:24 -04:00
Sam	553aa690b4	Added repair equipment command	2023-04-14 18:09:23 -04:00
Isse	3548b464da	orient airships correctly on load	2023-04-14 11:25:59 +02:00
Isse	2208a3037e	improve flying goto	2023-04-14 11:23:17 +02:00
Isse	d1f6e6bef6	somewhat fix airships	2023-04-14 11:22:10 +02:00
Joshua Barretto	504ea158d2	Merge branch 'zesterer/towns' into 'master' ... Improvements to towns and NPCs See merge request veloren/veloren!3867	2023-04-13 21:03:02 +00:00
Joshua Barretto	a835ce7e26	Better starting site choices	2023-04-13 18:32:21 +01:00
Joshua Barretto	daacadaedb	Made NPCs give directions to nearby towns, fixed player death propagation	2023-04-13 14:34:31 +01:00
Samuel Keiffer	7aa43e9e8a	Merge branch 'taoist/better-dullahan' into 'master' ... taoist&floppy/cyclops&dullahan See merge request veloren/veloren!3859	2023-04-12 22:53:38 +00:00
Tao In Way	e32460f9ee	taoist&floppy/cyclops&dullahan	2023-04-12 22:53:38 +00:00
Joshua Barretto	9e17042bf6	Merge branch 'rtsim2' into 'master' ... Initial implementation of rtsim2 Closes #1476 See merge request veloren/veloren!3517	2023-04-12 16:17:52 +00:00
Joshua Barretto	16e3227f78	Correct localisation of numeric values, use coordinate conversions in rtsim	2023-04-12 10:36:11 +01:00
Isse	0bb6fa7946	add flag to clamp to ground for RepositionOnChunkLoad	2023-04-12 10:17:49 +02:00
Joshua Barretto	3582d86c70	Simplified localisation logic	2023-04-11 23:51:07 +01:00
Joshua Barretto	3484e156d1	Allowed localisation content to be recursive	2023-04-11 23:18:34 +01:00
Joshua Barretto	cf701fb604	Localised rtsim NPC speech	2023-04-11 17:00:08 +01:00
Joshua Barretto	edcc2f1870	Overhauled chat message representation to allow for more exhaustive localisation	2023-04-11 15:46:36 +01:00
Joshua Barretto	08afe26112	Directly compare rtism resources to avoid unnecessary hooks	2023-04-11 11:49:10 +01:00
Imbris	4ea635cc8d	Merge branch 'imbris/random-tweaks-35902u8' into 'master' ... Some misc tweaks See merge request veloren/veloren!3861	2023-04-11 02:07:35 +00:00
Isse	efe2eb046c	add comment about a pure-proportional controller	2023-04-10 22:22:50 +02:00
Joshua Barretto	92ead1cf38	Removed vehicle riders, for now	2023-04-10 20:58:08 +01:00
Joshua Barretto	00559187d6	Fixed tests	2023-04-10 18:40:31 +01:00
Joshua Barretto	b50645c1ee	Addressed review comments	2023-04-10 17:59:43 +01:00
Joshua Barretto	efbab102a5	Make LoD towns glow	2023-04-09 19:25:58 +01:00
Joshua Barretto	326aa3f8ff	Made /rtsim_npc order NPCs by distance	2023-04-09 19:25:58 +01:00
Joshua Barretto	70538dae66	Choose random plaza tile	2023-04-09 19:25:58 +01:00
Joshua Barretto	2fbddafd0a	Added report system, information sharing, made NPCs act on sentiments	2023-04-09 19:25:58 +01:00
Joshua Barretto	08338436ea	Added sentiments	2023-04-09 19:25:58 +01:00
Joshua Barretto	a7a08763f2	Gave NPCs names	2023-04-09 19:25:58 +01:00
Joshua Barretto	74610833d0	Cleaned up rtsim tick handling	2023-04-09 19:25:58 +01:00
Joshua Barretto	5614eaa7a5	Cleaned up rtsim rules	2023-04-09 19:25:57 +01:00
Joshua Barretto	3e0f5295c0	Added CharacterActivity, made NPCs look at the player when speaking to them	2023-04-09 19:25:57 +01:00
Joshua Barretto	85c572f6e2	Better town layout	2023-04-09 19:25:57 +01:00
Joshua Barretto	082bcdb755	Don't hunt friendly animals	2023-04-09 19:25:57 +01:00
Joshua Barretto	9f025de27d	Addressed feedback	2023-04-09 19:25:57 +01:00
Joshua Barretto	1fcb46ae0c	Made merchants advertise wares	2023-04-09 19:25:56 +01:00
Joshua Barretto	b72d8f3192	Added the ability for rtsim to tell NPCs to speak	2023-04-09 19:25:56 +01:00
Joshua Barretto	7dfbc2bdab	Made socialising NPCs dance	2023-04-09 19:25:56 +01:00
Joshua Barretto	7175f7f02f	Hunters explore forests to hunt game	2023-04-09 19:25:56 +01:00
Joshua Barretto	b402e450cf	Added rtsim_npc, made herbalists gather ingredients	2023-04-09 19:25:56 +01:00
Joshua Barretto	364255c7fe	Allowed rtsim NPCs to greet nearby actors	2023-04-09 19:25:55 +01:00
Joshua Barretto	8d91ebb23e	Don't aim character when drinking	2023-04-09 19:25:55 +01:00
Isse	d53b344c23	make merchants use tell, and general cleanup	2023-04-09 19:25:55 +01:00
Joshua Barretto	8ba68e30f3	Merchants no longer buy/sell things they don't know the price of	2023-04-09 19:25:55 +01:00
Joshua Barretto	ea007ff702	Cleaning up	2023-04-09 19:25:55 +01:00
Joshua Barretto	64324262c7	Added /rtsim_purge command	2023-04-09 19:25:55 +01:00
Isse	1c0fdf9228	rtsim personalities	2023-04-09 19:25:55 +01:00
Isse	7ac6c6b453	fix warnings in rtsim	2023-04-09 19:25:55 +01:00
Isse	dda1be58d4	big birds!	2023-04-09 19:25:54 +01:00
Isse	259bb6fce4	fix phys test	2023-04-09 19:25:54 +01:00
Isse	1a117f1331	rtsim vehicles	2023-04-09 19:25:54 +01:00
Isse	a7588e274d	clean up mounting	2023-04-09 19:25:54 +01:00
Isse	28ebdbbe74	fix mount controller	2023-04-09 19:25:54 +01:00
Joshua Barretto	bb96e92362	Track almost all collectable sprites, added resource replenishment	2023-04-09 19:25:54 +01:00
Joshua Barretto	077da13a5f	Improved herbalist, hunter, farmer, added cultist factions	2023-04-09 19:25:54 +01:00
Joshua Barretto	2b3f0737d0	Added npc_info, action backtraces	2023-04-09 19:25:54 +01:00
Joshua Barretto	0b4d3c9e20	Fixed scaling of airships	2023-04-09 19:25:53 +01:00
Joshua Barretto	e8b489a71a	sync	2023-04-09 19:25:53 +01:00
IsseW	c026b4d20a	travelers say where they're going	2023-04-09 19:25:53 +01:00
IsseW	9be6c7b527	Pathing between sites.	2023-04-09 19:25:53 +01:00
Joshua Barretto	feaaaa9a25	Added initial impl of factions	2023-04-09 19:25:53 +01:00
IsseW	ca02b5e97c	cleaner entity creation	2023-04-09 19:25:52 +01:00
Joshua Barretto	6397e283b2	Added world settings	2023-04-09 19:25:52 +01:00
Joshua Barretto	e08f7d4fa9	Added blacksmith	2023-04-09 19:25:52 +01:00
Joshua Barretto	f40cfb4ac3	Made farmers sell food	2023-04-09 19:25:52 +01:00
IsseW	ac0e62df8e	tp_npc command	2023-04-09 19:25:52 +01:00
Joshua Barretto	587996abb7	Correctly scale glider physics	2023-04-09 19:25:52 +01:00
Joshua Barretto	558dd99fd3	Added basic rtsim NPC simulation, rtsim controller support	2023-04-09 19:25:51 +01:00
Joshua Barretto	8ff438bb5b	Smol animals	2023-04-09 19:25:51 +01:00
Joshua Barretto	f140a94dc6	Fixed scaled terrain collisions	2023-04-09 19:25:51 +01:00
Joshua Barretto	c856f2625c	Added rtsim sites	2023-04-09 19:25:51 +01:00
Joshua Barretto	1dc7518200	Added rtsim entity unload hook	2023-04-09 19:25:51 +01:00
Joshua Barretto	87a6143375	Began adding rtsim2 NPCs, scale command	2023-04-09 19:25:51 +01:00
Joshua Barretto	c168ff2f9b	Added rtsim saving, chunk resources, chunk resource depletion	2023-04-09 19:25:51 +01:00
Imbris	3ef4af0195	Various tweaks: ... * Store result of large condition expression in a variable before using in if statement (improves readability of code). * Buff doc comment improvements. Adding periods is neccessary since these will be merged into one line in the generated docs. * Add note on AbilityContext that AbilityContext::None is intended to be used rather than AbilityContext::Stance(Stance::None) perhaps in the future we can add some serde shenanigans to make this work better, but it is probably best to wait to see how this type evolves first.	2023-04-07 23:56:55 -04:00
Imbris	2cc2aa86f4	Synchronize DiveMelee checks	2023-04-07 01:59:41 -04:00
Imbris	e20cf5f14f	Reduce rand::thread_rng calls, document MeleeConstructor scaled field more, remove extra stances.get() in hud/mod.rs	2023-04-07 01:59:41 -04:00
Sam	d523d31056	Fixed possible crash in crafting UI	2023-04-06 10:57:18 -04:00
Sam	132f26dbc0	Addressed review	2023-04-06 10:57:16 -04:00
Sam	92165a8fd8	Repair recipes no longer show ingredients as required when they are not damaged enough to need any	2023-04-06 10:57:14 -04:00
Sam	ff9f755c0c	Changed repair recipe to round down on material costs.	2023-04-06 10:57:13 -04:00
Sam	00710a4eb0	Fixed csv tools	2023-04-06 10:57:13 -04:00
Sam	e4ebd17363	Addressed feedback	2023-04-06 10:57:12 -04:00
Sam	ca879173be	Added a repair equipped and a repair all button. Cleaned up some hacks that used to exist.	2023-04-06 10:56:55 -04:00
Sam	536d88a2c7	Repair costs scale based on how damaged the item is.	2023-04-06 10:54:50 -04:00
Sam	52a62420db	Changed durability persistence to a NonZeroU32	2023-04-06 10:54:49 -04:00
Sam	011b6c3feb	Changed how durability was persisted so that a more general system can be used for future item properties.	2023-04-06 10:54:49 -04:00
Sam	0966753699	Added repair recipes	2023-04-06 10:54:48 -04:00
Sam	c3f5bc13f1	Equipment can now be repaired at sprites in town.	2023-04-06 10:54:48 -04:00
Sam	a555e08d0b	Added durability to item tooltips	2023-04-06 10:54:47 -04:00
Sam	c586db8feb	Item durability is now persisted	2023-04-06 10:54:47 -04:00
Sam	a07e042fa2	Items now lose durability on death	2023-04-06 10:54:46 -04:00
Sam	df13741be9	Durability system in place	2023-04-06 10:54:46 -04:00
Christof Petig	e60aace448	realize zesterers proposal	2023-04-05 00:11:26 +02:00
Christof Petig	9205da2298	cargo fmt	2023-04-04 23:46:20 +02:00
Christof Petig	9b3bf4c3c8	initial support for multiple models in one vox file	2023-04-04 23:46:20 +02:00
Samuel Keiffer	494019ecc2	Merge branch 'sam/polymorph-buff-fix' into 'master' ... Fix multiple polymorph buffs See merge request veloren/veloren!3850	2023-04-02 22:45:54 +00:00
Joshua Barretto	17cdd3e38d	Merge branch 'zesterer/choose-starting-site' into 'master' ... Allow new players to choose their starting site See merge request veloren/veloren!3848	2023-04-02 00:45:25 +00:00
Sam	6849f9fc21	Fix function name typo	2023-04-01 18:11:16 -04:00
Sam	352d34557e	Fix modular crafting window showing an item output when it is not possible to craft two components together.	2023-04-01 17:22:01 -04:00
Sam	f40ef0d5dd	Polymorph effect now more correctly handles when multiple polymorph buffs are applied.	2023-04-01 13:11:59 -04:00
Joshua Barretto	42c534b7b4	Removed /home, replaced with /respawn	2023-04-01 17:37:01 +01:00
Joshua Barretto	acec45b756	Initial implementation of starting site choice	2023-03-31 14:24:14 +01:00
Sam	09f600bc1e	Buffs can have variable tick times	2023-03-30 21:23:41 -04:00
Isse	c34e5ad4ed	Small fixes	2023-03-29 23:11:59 +00:00
Sam	c9af470cc7	Final tweaks	2023-03-28 20:55:21 -04:00
Sam	cdaf9e5c0e	Ability changes	2023-03-26 21:41:22 -04:00
Sam	ef7b400cca	Number tweaking	2023-03-26 19:50:42 -04:00
Isse	1298fc792b	Merge branch 'ProfessionalHobbyist/configurable_day_night_length' into 'master' ... Add setting to control length of day/night cycle for servers. ("Fix" for https://gitlab.com/veloren/veloren/-/issues/1798) See merge request veloren/veloren!3836	2023-03-23 16:33:39 +00:00
Sophia Waggoner	b600f08c09	Re-add accidentally deleted ticking of Time.	2023-03-22 06:45:23 -07:00
Sophia Waggoner	264e4a53f8	cargo clippy + fmt	2023-03-22 05:49:54 -07:00
Sophia Waggoner	4a3d1bbb86	Ultimately use setting in day cycle updates. ... (First functional commit.)	2023-03-21 21:32:05 -07:00
Sophia Waggoner	7e4ea483e0	Add a ServerConstants to Client and Server structs and sync on register.	2023-03-21 20:28:08 -07:00
Sophia Waggoner	b649774316	Add ServerConstants and its module to common	2023-03-21 17:29:51 -07:00
Sam	e5c9f92269	Fix clippy from rebase	2023-03-21 20:23:46 -04:00
Sam	1337525987	Review comment	2023-03-21 20:18:35 -04:00
Sam	5c675fdbe2	Addressed review	2023-03-21 20:18:34 -04:00
Sam	bd7f33eae5	Fixed unit test	2023-03-21 20:16:59 -04:00
Sam	610d47f787	Effect power now affects more than just poise	2023-03-21 20:16:55 -04:00
Sam	c295506ef9	Removed buffered inputs	2023-03-21 20:13:45 -04:00
Sam	868a42ba39	Addressed UX feedback	2023-03-21 20:10:40 -04:00
Sam	acde417ca7	Abilities that require a particular stance will be greyed out when not in that stance.	2023-03-21 20:08:21 -04:00
Sam	9c43c016a3	Fixed roll not returning to wield if initiated from a wielded character state.	2023-03-21 20:08:21 -04:00
Sam	07c3e30a95	Fixed blade fever reducing damage instead of increasing it	2023-03-21 20:08:18 -04:00
Sam	7386257854	Appease CI	2023-03-21 20:07:37 -04:00
Sam	c9db227e43	Various things can cause one to naturally leave a stance. Also mildly buffed cultists.	2023-03-21 20:07:34 -04:00
Sam	3caa9dc529	Stances can now be left by interacting with the buff bar.	2023-03-21 20:03:22 -04:00
Sam	34168d9c76	Advanced AI for every stance.	2023-03-21 20:03:21 -04:00
Sam	43d7e9357a	Basic sword AI	2023-03-21 20:03:19 -04:00
Sam	387ea16598	Non-attack potion of sword AI	2023-03-21 20:03:18 -04:00
Sam	99f6312e59	Sword AI structure	2023-03-21 20:03:17 -04:00
Sam	7365fcb530	Rolls cancel recover at the cost of additional energy, sitting ends active stances.	2023-03-21 20:03:15 -04:00
Sam	39b30b3458	Decontextualized some sword abilities, added UI for sword skill tree.	2023-03-21 19:59:05 -04:00
Sam	27463758e5	Finisher abilities	2023-03-21 19:59:03 -04:00
Sam	86dfa34ec9	Cleaving stance required abilities	2023-03-21 19:59:00 -04:00
Sam	fed96b2e15	Crippling stance required abilities	2023-03-21 19:58:13 -04:00
Sam	c3026d388a	Defensive stance required abilities	2023-03-21 19:58:11 -04:00
Sam	a3d655970e	Heavy stance required abilities	2023-03-21 19:56:32 -04:00
Sam	e0a7449a99	Crescent slash	2023-03-21 19:39:40 -04:00
Sam	fce9211d49	Secondaries for all stances	2023-03-21 19:39:39 -04:00
Sam	596fe715b8	Cleaving stance skill abilities.	2023-03-21 19:39:39 -04:00
Sam	c23139d501	Agile stance skill abilities.	2023-03-21 19:39:37 -04:00
Sam	ed0de15a5a	Heavy stance skill abilities.	2023-03-21 19:39:35 -04:00
Sam	57806d7be9	Sword M1 abilities	2023-03-21 19:39:22 -04:00
Sam	61f0b424b9	Old sword mostly torn out, new sword framework in place	2023-03-21 19:39:22 -04:00
Sam	5f126bb5c6	Queued inputs are now culled after a period of time if they are not actively held	2023-03-21 19:39:19 -04:00
Sam	7ec9a7677f	Stances change secondary abilities now. Contextual abilities try to fallback to no context if skill not owned for contextual ability.	2023-03-21 19:38:18 -04:00
Sam	b376228d45	Primary and secondary abilities can now be contextual. BasicStance character state added.	2023-03-21 19:38:15 -04:00
Sam	9875008efa	Added stance component that persists even after sheathing weapon (does not yet work with M1 replacement).	2023-03-21 19:29:34 -04:00
Sam	d0a46ed82b	Inputs now remain queued even when the input is released, until the input is used.	2023-03-21 19:26:06 -04:00
Imbris	61cb0ad39b	Merge branch 'imbris/small-tweaks' into 'master' ... Various small tweaks / fixes Closes #1475 See merge request veloren/veloren!3817	2023-03-18 00:52:20 +00:00
Imbris	9e212935e5	Merge branch 'imbris/time-local-event-handling' into 'master' ... Add metrics for timing subsections of State::tick See merge request veloren/veloren!3825	2023-03-14 14:52:57 +00:00
Imbris	87bf44241b	Add metrics for timing subsections of State::tick	2023-03-14 01:03:05 -04:00
Ben Wallis	45c8934b79	Merge branch 'xvar/queue-char-deletes' into 'master' ... Changed character deletion to go via batch update See merge request veloren/veloren!3562	2023-03-12 23:21:54 +00:00
Ben Wallis	6eedc02286	Changed character deletion to go via batch update	2023-03-12 23:21:53 +00:00
Samuel Keiffer	8febcf6b3d	Merge branch 'sam/buffs' into 'master' ... Auras and buffs no longer need to tick every tick See merge request veloren/veloren!3814	2023-03-12 22:06:48 +00:00
Sam	42388976d7	Fixed issue with max health change over time buff being reset if re-applied. Addressed review comments.	2023-03-12 16:37:02 -04:00
flo	704af5ef7b	bird_medium_scale	2023-03-12 18:08:21 +00:00
Imbris	6b8e22d6cc	Improvements and fixes for interacting/collecting ... * Inert entities like arrows no longer block interactions like picking up items! Logic looking for the closest entity will skip them. * When pickaxe is not equipped and wielded we now show "Needs Pickaxe" as the hint text for mineable blocks. * Mineable blocks that aren't pointed at now show the mining text hint instead of the text hint used for regular collectible blocks. * Fixed recent bug where all interactables were showing the open text hint. * Split `BlockInteraction` out of the `Interaction` enum in voxygen since we were using this enum for two different things.	2023-03-11 21:17:27 -05:00
Sam	4c79936c07	Added wrapper type to durations related to buffs and auras.	2023-03-11 16:47:11 -05:00
Sam	663db06844	Made auras no longer need to be mutably accessed every tick.	2023-03-11 16:45:12 -05:00
Sam	8a6a60d5bb	Buffs from auras no longer need to be mutably accessed every tick in aura system to prevent applying a buff every tick and ensure duration only starts after leaving aura	2023-03-11 16:45:12 -05:00
Sam	9efac9957d	Changed buff effects so they did not need to mutably change buffs every tick. Buff system now no longer mutably accesses buffs component.	2023-03-11 16:45:11 -05:00
Sam	b1b41e95f6	Queueable buffs now work with buffs without using a timer, tests too	2023-03-11 16:45:11 -05:00
Sam	e60080c293	Syncing Time from server to client now works	2023-03-11 16:45:10 -05:00
Sam	89aa934c3c	Initial work	2023-03-11 16:45:10 -05:00
Imbris	19b5ed3487	Appease clippy	2023-03-11 11:06:08 -05:00
Imbris	619f62cb63	Use try_set for door destruction to avoid accidentally overwriting any ... other changes that already occured that tick. Also get terrain/block change resources from the ecs once to avoid the overhead of fetching them from the ecs (and aquiring/releasing runtime borrow).	2023-03-11 10:24:45 -05:00
Imbris	2d66145620	Add some documentation to pos_key/key_pos/pos_chunk methods which are easy to mix up	2023-03-11 10:24:45 -05:00
Imbris	0d8aa16d89	Avoid duplicate searches in the inventory for required items when ... interacting with sprites and rustfmt decides to format a bunch of stuff... * Add PartialEq impls between ItemDefinitionId<'_> and ItemDefinitionIdOwned. * Remove unused Serialize and Deserialize derives from ItemDefinitionId<'_> * Add Inventory::get_slot_of_item_by_def_id which acts like Inventory::get_slot_of_item but accepts a ItemDefinitionIdOwned reference instead of an Item reference. * Add some TODOs for some potential optimizations * Rustfmt decided now was the time to format some random stuff I didn't touch. Maybe I fixed something it was getting stuck on???? But some files I didn't make any changes (although might have inadvertantly saved them when viewing in editor (with fmt on save)). * InvSlotId passed to SpriteInteract character state instead of refinding the item in the inventory (if it moved we simply give up on the state as if the requirements weren't met). (overall in this change 3 searches for the item in the inventory are reduced to a single one)	2023-03-11 10:24:30 -05:00
Imbris	93eab4791d	Remove ComponentKey TODO in Inventory::get_slot_of_item since item_definition_id contains component IDs!	2023-03-11 10:23:16 -05:00
Imbris	349d1726a6	Only emit SpriteUnlocked outcome if the sprite interaction kind is Unlock. Also rustfmt decided to make a bunch of changes.	2023-03-11 10:23:14 -05:00
Imbris	fe38b9b92b	Add documentation to bool field	2023-03-11 10:21:39 -05:00
Imbris	b644ff7668	fmt	2023-03-11 08:06:46 -05:00
Imbris	e8a5de4e65	Switch from custom macro for grouping cfgs to cfg_if since rustfmt can't see through macros but is hardcoded to parse cfg_if and follow the module names inside it.	2023-03-11 08:06:46 -05:00
Monty Marz	277a402781	Initial quest window work, spot fixes	2023-03-10 22:16:26 +00:00
Marcel	9396fa9741	Merge branch 'Thegaming_Life/replacing_all_map2_with_RECT_SIZE_with_cpos_to_wpos_and_wpos_to_cpos' into 'master' ... replaced CHUNK_SIZE by RECT_SIZE everywhere, and change the use (and remove... See merge request veloren/veloren!3807	2023-03-06 21:03:35 +00:00
Thegaming Life	5ddc55be52	replaced CHUNK_SIZE by RECT_SIZE everywhere, and change the use (and remove...	2023-03-06 21:03:35 +00:00
Monty Marz	9a025cfcc8	More spot features	2023-03-03 23:21:37 +00:00
Thegaming Life	acbb7ccba9	Changed the chunk size to constant	2023-02-28 10:00:53 +00:00
flo	98e93d1a1c	spawn and loot tweaks, tursus and werewolf anims	2023-02-22 01:32:05 +00:00
flo	bf81ffc029	frost_gigas	2023-02-15 00:10:37 +00:00
Christof Petig	968e4b721c	Merge branch 'floppy-bird_medium_2' into 'master' ... bird_medium_2 See merge request veloren/veloren!3706	2023-02-14 23:17:20 +00:00
flo	0531b40fae	bird_medium_2	2023-02-14 23:17:20 +00:00
Cat Stevens	e19a497989	Don't require 10 energy for climbing ... The infinite climb bug should be fixed by !3792 (Refactor energy and poise regen), so we can safely remove the need for the character to have at least 10 energy to climb. The minimum energy needed to start climbing is now 1 energy. This was suggested by James M#8698.	2023-02-13 21:23:25 -05:00
Marcel	ea15cdcfe3	Merge branch 'james/sitting-stamina-regen' into 'master' ... Refactor energy and poise regen See merge request veloren/veloren!3792	2023-02-07 18:02:27 +00:00
James Melkonian	21a2a4ac46	Refactor energy and poise regen	2023-02-07 18:02:26 +00:00
James Melkonian	87f5a3345d	Fix sword sfx	2023-02-07 16:57:22 +00:00
flo666	d219cdd97c	spawns & hitboxes	2023-01-31 20:34:41 +01:00
flo666	9c09000256	- change bristlemane to bristleback ... - axebeak tweaks	2023-01-31 20:34:41 +01:00
flo666	e109f5c377	axebeak, tursus	2023-01-31 20:34:40 +01:00
flo666	75bfbff2c3	bristlemane	2023-01-31 20:34:40 +01:00
flo666	271b80b832	seal	2023-01-31 20:34:40 +01:00
Marcel	c165d28e7d	Merge branch 'wyvern_wings' into 'master' ... wyverns See merge request veloren/veloren!3720	2023-01-28 21:25:17 +00:00
flo	5e1fd02095	wyverns	2023-01-28 21:25:17 +00:00
Ellen Sun	d774319cf0	cleanup and fixes + added change to CHANGELOG.md	2023-01-27 20:32:41 -05:00
Ellen Sun	74cb514094	move client commands to voxygen + add Admin to be shared with client for permissions + unit test for alphabetical server command	2023-01-27 20:31:56 -05:00
Ellen Sun	361e5204e3	added levenshtein for most similar string and words starting with what user entered + check permissions + added clientside commands to /help	2023-01-27 20:31:56 -05:00
poggly	75ccd65ec6	initial commit, todo comment and realphabetized ServerChatCommand enum	2023-01-27 20:31:56 -05:00
Corvella	dcd3fb2077	Correctly apply LoD distance setting and improve documentation on projectile fixes	2023-01-26 14:27:59 +00:00
Joshua Barretto	88ac238121	Merge branch 'joedonofry/dropped_lantern_glow' into 'master' ... Add glow to dropped lanterns See merge request veloren/veloren!3772	2023-01-23 16:13:43 +00:00
Joseph Donofry	74ee861dde	Add glow to dropped lanterns	2023-01-23 16:13:43 +00:00
Isse	4fdcbeeb71	Update dot_vox dependency	2023-01-22 18:00:39 +01:00
Avi Weinstock	aba6f6654e	Add a new particle mode for potion sickness.	2023-01-19 15:06:14 -05:00
Avi Weinstock	dc6e61983c	Make potion sickness's healing multiplier only affect potions.	2023-01-19 15:06:13 -05:00
Avi Weinstock	adaf8ef6f4	Add a background to make the buff multiplicities more visible, and show the shortest timer for stackable buffs.	2023-01-19 15:06:13 -05:00
Avi Weinstock	1b00b18a7b	Show buff multiplicities as a number instead of duplicate icons. Add particle effects for the beginning of potion sickness.	2023-01-19 15:06:13 -05:00
Avi Weinstock	a871d3880b	Address MR 3756 review comments.	2023-01-19 15:06:13 -05:00
Avi Weinstock	78845a0d73	Implement potion sickness, which causes diminishing returns on healing from potions.	2023-01-19 15:06:12 -05:00
Joshua Barretto	da9cd79973	Merge branch 'zesterer/canary' into 'master' ... Added canary asset See merge request veloren/veloren!3770	2023-01-18 23:02:07 +00:00
Joshua Barretto	63d0c937f0	Removed existing LFS check	2023-01-18 22:31:33 +00:00
Joshua Barretto	44f4dcc6f7	Added canary asset	2023-01-18 22:01:00 +00:00
Nils Ascheuer	21f417dbef	Added Changelog	2023-01-18 14:40:21 +01:00
Nils Ascheuer	f9e1aca045	#1694 Faster Energy Regeneration-acceleration while sitting	2023-01-18 10:44:09 +01:00
Marcel	a537d52f48	Merge branch 'james/fix-bats' into 'master' ... Make bats easier to combat and fix hitbox scaling bug See merge request veloren/veloren!3759	2023-01-16 11:34:09 +00:00
Corvella	ef5737360b	Improve Projectile/Entity Hit Detection	2023-01-16 05:58:28 +00:00
James Melkonian	9d31baf500	Make bats easier to combat and fix hitbox scaling bug	2023-01-15 16:25:43 -08:00
Joshua Barretto	295e3c4109	Merge branch 'floppy-autodelete_of_summoned_sprites' into 'master' ... autodelete of summoned sprites See merge request veloren/veloren!3735	2023-01-15 18:28:38 +00:00
flo	650ef9a5e2	autodelete of summoned sprites	2023-01-15 18:28:38 +00:00
flo	98c1e68209	Fix wall cheese	2023-01-14 15:41:07 +00:00
Marcel	2ff24259be	Merge branch 'zesterer/lod-models' into 'master' ... New LoD model, wind sway pays attention to wind velocity See merge request veloren/veloren!3739	2023-01-02 14:51:00 +00:00
Matas Minelga	3850d3e86e	Inventory sorting MR fixes and slight improvements	2023-01-01 02:36:03 +02:00
Joshua Barretto	f48e1ca951	Make wind sway change according to weather wind velocity	2022-12-31 17:40:40 +00:00
Joshua Barretto	873d3fb7a4	Added dead trees to LoD	2022-12-31 15:32:56 +00:00
Matas Minelga	040c9fe6ee	Inventory: Implemented dynamic and better ordering by Category	2022-12-31 02:32:41 +02:00
Benoît du Garreau	4fbb0b9a0b	Update to `assets_manager 0.9	2022-12-14 00:54:34 +01:00
Isse	ef2c1633ed	Merge branch 'isse/bridges' into 'master' ... Bridges See merge request veloren/veloren!3680	2022-11-30 15:07:03 +00:00
Marcel Märtens	4a1404cd71	fix leftovers from toolchain update	2022-11-30 15:14:47 +01:00
IsseW	7296843923	simple bridges	2022-11-30 15:13:52 +01:00
Marcel Märtens	225cbf472f	update tag and fix empty maps, other bugs introduced by auto fix	2022-11-29 09:19:10 +01:00
Marcel Märtens	2812729b78	cargo clippy lifetimes	2022-11-28 15:19:57 +01:00
Marcel Märtens	dad73ba2a3	fix clamp clippy errors	2022-11-28 14:26:27 +01:00
Marcel Märtens	0ab7a2543e	fix clippy errors	2022-11-28 14:08:11 +01:00
Marcel Märtens	ba3747a3f0	update toolchain	2022-11-28 14:08:11 +01:00
Marcel	2f990fb06e	Merge branch 'holychowders/store_last_known_pos' into 'master' ... Store Target's Last Known Position See merge request veloren/veloren!3698	2022-11-20 22:38:14 +00:00
holychowders	61aa49fa66	Add last_known_pos to Target struct.	2022-11-16 18:26:07 -06:00
Samuel Keiffer	5709427e63	Merge branch 'sam/small-fixes' into 'master' ... Small fixes for sword See merge request veloren/veloren!3694	2022-11-16 23:33:12 +00:00
Marcel	997c5a4e61	Merge branch 'ythern/more_unique_abilities' into 'master' ... Ythern/roshwalr kit See merge request veloren/veloren!3692	2022-11-15 09:58:06 +00:00
Eternalisime	71e59e4b81	combat: tweaks and modified shockwave animation	2022-11-13 22:04:00 +01:00
Sam	4784b61656	Small fixes	2022-11-13 14:03:37 -05:00
Samuel Keiffer	1173c8257f	Merge branch 'holychowders/agent_awareness2' into 'master' ... Rework internal representation of agent awareness See merge request veloren/veloren!3661	2022-11-12 18:48:32 +00:00
holychowders	95fd092e26	Fix awareness changes.	2022-11-12 12:12:32 -06:00
flo	0351bf1d63	Moss Drake	2022-11-12 13:00:42 +00:00
Eternalisime	8f4863be28	combat: balance tweaks on roshwalr	2022-11-11 10:22:23 +01:00
Eternalisime	f1b77e27fe	combat: lowered flee_health on roshwalr	2022-11-10 16:57:29 +01:00
Eternalisime	918d5eb345	combat: added a unique kit to roshwalr	2022-11-10 13:53:12 +01:00
LunarEclipse	32abb59132	Updated some of my personal info	2022-11-08 23:06:32 +01:00
DaforLynx	b2b14e7ab4	Event music can use more than one event at a time. Added test for soundtracks.	2022-11-07 22:39:25 +00:00
holychowders	571b07d54a	Remove dt and multiplication by 30.	2022-11-06 13:10:17 -06:00
Avi Weinstock	372ffe45d7	Add command for debugging ways.	2022-10-29 14:32:48 -04:00
holychowders	641a5c4cda	Merge branch 'master' of gitlab.com:veloren/dev/veloren into holychowders/agent_awareness2	2022-10-29 13:21:27 -05:00
Avi Weinstock	08a50afd9f	Mostly working train tracks.	2022-10-28 21:36:42 -04:00
holychowders	3d4ad29d1d	Flee if attacked even if attacker is not close.	2022-10-28 21:31:49 +00:00
holychowders	3f3f8605af	Merge branch 'master' of gitlab.com:veloren/dev/veloren into holychowders/agent_awareness2	2022-10-28 15:16:44 -05:00
holychowders	4426972057	Refer to the fully aware state of an agent as "alert".	2022-10-28 15:03:11 -05:00
Sam	0fe073fcdc	Addressed feedback from testing	2022-10-27 20:07:10 -04:00
Sam	b5682c4682	Addressed review comments	2022-10-27 20:07:09 -04:00
Sam	a44c36432e	Fixed that equipping weapons by using them from hotbar would bypass equipping animation.	2022-10-27 20:07:09 -04:00
Sam	1782408676	Address UX issues of contextual abilities.	2022-10-27 20:07:08 -04:00
Sam	e1f76e0127	Fixed sword AI after contextualized sword abilities.	2022-10-27 20:07:08 -04:00
Sam	8cfe62e6dc	Activated abilities can now be contextualized	2022-10-27 20:07:07 -04:00
Sam	07d273aa09	Removed unneccessary term in skill point cost calculation	2022-10-27 20:07:07 -04:00
Sam	172c9e0689	Fixed inability to use abilities while in a stance	2022-10-27 20:07:07 -04:00
Sam	273949369f	Fix unit tests	2022-10-27 20:07:06 -04:00
Sam	5674923a54	Changed exp/sp progression for sword skill tree	2022-10-27 20:07:06 -04:00
Sam	38ce87d80b	Initial balance pass on sword ability stats	2022-10-27 20:07:05 -04:00
Sam	2e8ad96121	Stances now require a small amount of time to enter them	2022-10-27 20:07:05 -04:00
Sam	df9ef691fd	Cleaving stance AI	2022-10-27 20:07:03 -04:00
Sam	c97bfdfb94	Defensive stance AI	2022-10-27 20:07:01 -04:00
Sam	7dcb3582e6	Sword AI for offensive abilities	2022-10-27 20:07:01 -04:00
Sam	4ab3abfc07	Balanced stance AI	2022-10-27 20:07:01 -04:00
Sam	221b0aff5f	Sword AI can now choose their abilities	2022-10-27 20:07:00 -04:00
Sam	8d3567b6b2	Made combo melee more ergonomic to use when it is a stance	2022-10-27 20:06:59 -04:00
Sam	21aabb5663	Parries now correctly return to their stance.	2022-10-27 20:06:58 -04:00
Sam	21dedb54b9	Fixed bug where you couldn't properly exit an ability if you had a return ability but lacked the requirements to return	2022-10-27 20:06:58 -04:00
Sam	b3a15f61aa	Fixed issue where you could cancel combo melee 2 mid strike	2022-10-27 20:06:58 -04:00
Sam	5757b0bdf0	Abilities are now more expensive when in a mismatched stance if that stance is not the balanced stance.	2022-10-27 20:06:57 -04:00
Sam	5974646a3c	You can now leave a stance by using the corresponding ability input	2022-10-27 20:06:57 -04:00
Sam	a2242b28f4	If you were in a stance when you used an ability, return to that stance after the ability is complete.	2022-10-27 20:06:56 -04:00
Sam	a8212d6f41	Dive melee now scales its attack off of the entity's vertical speed. ... Parries now cause the attacker to effectively have a recover that is either twice as long or 0.5s longer, whichever is more. Counters now deal twice as much damage to the target if the target is in the buildup portion of an ability.	2022-10-27 20:06:55 -04:00
Sam	9091d46554	Animation for reaching charge. Changed dash melee code to probe with a test melee instead of performing the actual melee strike during charge.	2022-10-27 20:06:53 -04:00
Sam	7c22847009	Animation for parrying parry	2022-10-27 20:06:48 -04:00
Sam	e03e137793	Combo melee tweaks	2022-10-27 20:06:40 -04:00
Sam	da21e1cb02	Removed air slash stance and abilities	2022-10-27 20:06:40 -04:00
Sam	2116842d30	Bin program to generate dot files for skill trees	2022-10-27 20:06:37 -04:00
Sam	eacbdefb75	Skill point prerequisites and costs	2022-10-27 20:06:37 -04:00
Sam	2fcd876e3f	Air slash abilities	2022-10-27 20:06:35 -04:00
Sam	7a8653e8f8	Reaching abilities	2022-10-27 20:06:35 -04:00
Sam	5d643f430a	Mobility abilities	2022-10-27 20:06:35 -04:00
Sam	500e0ae3d0	Heavy abilities	2022-10-27 20:06:34 -04:00
Sam	8a578bf3f6	Parrying abilities	2022-10-27 20:06:34 -04:00
Sam	d99eddb483	Defensive abilities	2022-10-27 20:06:33 -04:00
Sam	ec03bd7032	Cleaving abilities	2022-10-27 20:06:33 -04:00
Sam	2051d45d2f	Offensive abilities	2022-10-27 20:06:32 -04:00
Sam	c37925d1e2	Changed logic for entering combo melee state depending on whether or not it was a stance	2022-10-27 20:06:31 -04:00
Sam	fd05795b4c	Titles and descriptions for each ability.	2022-10-27 20:06:31 -04:00
Sam	014a8cce61	Combo melee can now optionally not function as a stance	2022-10-27 20:06:31 -04:00
Sam	66f9cf22fc	Balanced abilities and insert ability id into animations.	2022-10-27 20:06:30 -04:00
Sam	aea4a43b65	Placeholder abilities	2022-10-27 20:06:30 -04:00
Sam	38094b6ba2	Finisher melee	2022-10-27 20:06:29 -04:00
Sam	057b1a4ad6	Added capability for attacks to be interrupted by dodging or blocking	2022-10-27 20:06:29 -04:00
Sam	c09e858cba	Single target melee attacks now hit the closest target instead of a random target.	2022-10-27 20:06:28 -04:00
Sam	1e0dfe003d	Rolling can now only interrupt abilities when in buildup	2022-10-27 20:06:28 -04:00
Sam	7b27b63122	Melee attacks now only hit a single target by default	2022-10-27 20:06:28 -04:00
Sam	af39287331	Added support for abilities being cheaper if activated from the correct stance	2022-10-27 20:06:27 -04:00
Sam	0ff06edcdc	Combo melee skips recover if continuously striking. Combo animations consolidated to one file.	2022-10-27 20:06:27 -04:00
Sam	17258975fc	Combo melee 2 state	2022-10-27 20:06:26 -04:00
Marcel	51d4c8dd51	Merge branch 'halloween' into 'master' ... Halloween event See merge request veloren/veloren!3668	2022-10-25 21:37:34 +00:00
Samuel Keiffer	f676e732f6	Merge branch 'flaffwaffle/action_state_concurrent_states' into 'master' ... ActionState extensions to allow for multiple concurrent state variables And More Complex AI See merge request veloren/veloren!3659	2022-10-25 03:21:46 +00:00
Timothy Finnegan	1922d69154	Ran Cargo fmt	2022-10-24 19:52:37 -07:00
flo666	9b1efe1bee	clippy, fmt, remove leftover file, fix sitenames in soundtrack	2022-10-25 00:33:23 +02:00
IsseW	9a6a3a05a1	bat config	2022-10-25 00:31:04 +02:00
kitswas	c83ec87d6a	Code cleanup	2022-10-24 22:05:11 +05:30
kitswas	e29a9f4e36	Colour reflects old poise state	2022-10-24 22:05:11 +05:30
kitswas	b21764c99f	Added tick mark for the upcoming threshold	2022-10-24 22:05:11 +05:30
kitswas	be586aa84f	Extracted hard-coded poise thresholds to a constant	2022-10-24 22:05:11 +05:30
Tim Finnegan	a21a674ed1	Merge branch 'master' into 'flaffwaffle/action_state_concurrent_states' ... # Conflicts: # CHANGELOG.md	2022-10-24 01:35:25 +00:00
James Melkonian	6bacb487f3	Bat AI	2022-10-23 20:05:39 +02:00
flo666	586d0f6dd8	add bat (created by Gemu)	2022-10-23 20:05:39 +02:00
flo666	79e6fd58fe	- make tricksters spawn in groups and play instruments ... - remove defunct draugr flee	2022-10-23 20:05:39 +02:00
flo666	e1bd385408	make draugrs Npcs flee at health below 100%, ... trickster gear, single spawns (trickster, dullahan),	2022-10-23 20:05:39 +02:00
IsseW	1d6b7d6a03	Add Halloween event	2022-10-23 20:05:39 +02:00
flo	698a00bae3	savannah_pit	2022-10-22 19:48:50 +00:00
holychowders	7502cd664a	Have agents update awareness of targets. ... This is preliminary and has no visible effect.	2022-10-21 20:25:54 -05:00
holychowders	f45c465c75	Add new Awareness struct.	2022-10-20 11:36:29 -05:00
holychowders	bc20744cd3	Remove old unused awareness stuff.	2022-10-20 11:36:16 -05:00
Timothy Finnegan	a9add7012e	Added support for multiple timers, conditions, and counters in a single action node.	2022-10-16 19:48:27 -07:00
Monty Marz	2d8627c29b	Add gnarling chieftain mask	2022-10-15 11:05:21 +00:00
Joshua Barretto	3c54e63592	Various minor optimisations	2022-10-12 13:57:14 +01:00
Isse	536bb9b71c	Merge branch 'zesterer/citadel' into 'master' ... Two new tree types and disabled citadel site. See merge request veloren/veloren!3652	2022-10-10 16:19:48 +00:00
James Melkonian	99d547c7c6	Add unit test to validate recipe keys	2022-10-09 20:50:09 -07:00
Joshua Barretto	0b5d043d8e	Began work on citadel	2022-10-09 23:23:39 +02:00
Avi Weinstock	e6576f0cf3	Make the trading AI for pets only accept food.	2022-09-30 15:11:03 -04:00
Avi Weinstock	60f5383f8b	Address comments for MR 3633.	2022-09-30 14:51:49 -04:00
Avi Weinstock	c62bc0dd0d	Allow pets to be traded with.	2022-09-30 14:51:49 -04:00
Marcel Märtens	0fe0192a2d	get rid of string replacements in template strings	2022-09-29 17:33:53 +02:00
Marcel Märtens	a0ef3be9ac	remove hardcoded localisation from client	2022-09-27 13:46:12 +02:00
Marcel	17c940e0f8	Merge branch 'xMAC94x/update_toolchain' into 'master' ... update toolchain to `2022-09-23` See merge request veloren/veloren!3615	2022-09-25 19:44:58 +00:00
Marcel Märtens	1e1ee5031f	remove enum_iterator with strum, fixes #1723	2022-09-25 16:09:46 +02:00
Marcel Märtens	cf6a764aa4	update toolchain to 2022-09-23	2022-09-25 15:58:32 +02:00
Marcel Märtens	c2b453f6f1	update toolchain to 2022-09-08 ... This reverts commit 6c9deee491. This reverts commit a32b269252.	2022-09-24 00:04:40 +02:00
Marcel Märtens	29d0f5b25d	update dependencies	2022-09-22 11:57:55 +02:00
Samuel Keiffer	59d8d287d9	Merge branch 'seachapel_npc_work' into 'master' ... seachapel npc work See merge request veloren/veloren!3599	2022-09-22 01:04:01 +00:00
flo	a37e1f8d99	seachapel npc work	2022-09-22 01:04:01 +00:00
Joshua Yanovski	57ea753bff	Merge branch 'sharp/parallel-ingame' into 'master' ... Parallelize ingame messages. See merge request veloren/veloren!3627	2022-09-21 19:44:40 +00:00
Joshua Yanovski	1c14ec7ee1	Parallelize ingame messages.	2022-09-21 10:25:57 -07:00
Joshua Yanovski	67231aff90	Remove persistence loading error from SkillSet. ... This is needed (for now) in order to parallelize ingame_chat, because one of the handled messages updates this value on the server. It turns out that the value is not actually used on the server, only the client, so this was mostly a matter of threading this back to the correct place. Additionally, we took the opportunity to modify the UI to not log you into the game until your character was confirmed to be loaded, which was a todo item that lets us simplify some error handling logic and remove stuff from global state.	2022-09-21 09:29:25 -07:00
Samuel Keiffer	188db01a7b	Merge branch 'sam/hot-agent' into 'master' ... Agent combat tactics hot reloading See merge request veloren/veloren!3629	2022-09-21 02:44:51 +00:00
Imbris	1b48a3008c	Merge branch 'Couls/TestBed' into 'master' ... Extend item pickup UI to group members Closes #1402 See merge request veloren/veloren!3521	2022-09-20 22:13:50 +00:00
Couls	4a4c061b55	Extend item pickup UI to group members	2022-09-20 22:13:50 +00:00
Sam	3d6c9a780d	Removed redundant package parameter from init function of hot reloading	2022-09-17 00:55:28 -04:00
Sam	cfeb197f85	Removed duplicate crates added so there could be dynamic crates, now compiled with crate type specified instead.	2022-09-17 00:50:59 -04:00
Sam	23c51af437	Consolidated voxygen and server dynlibs into a common dynlib	2022-09-16 23:43:26 -04:00
Christof Petig	5d8a708d6b	Merge branch 'juliancoffee/loot_export_fix' into 'master' ... Make loot export display all modulars See merge request veloren/veloren!3598	2022-09-16 21:55:59 +00:00
Joshua Yanovski	e9a463d459	Revert "Merge branch 'xMAC94x/update-deps' into 'master'" ... This reverts merge request !3608	2022-09-15 18:51:48 +00:00
Joshua Yanovski	cafdcad8ce	Merge branch 'sharp/improve-msg' into 'master' ... Improve some server system performance See merge request veloren/veloren!3614	2022-09-15 04:30:31 +00:00
Joshua Yanovski	2c15d0af56	Reduce overhead of messaging systems.	2022-09-14 21:04:53 -07:00
Marcel	725fd09ed7	Merge branch 'yusdacra/nix' into 'master' ... !2951 with fixed runtime panic See merge request veloren/veloren!3605	2022-09-14 10:12:07 +00:00
flo	dc688bccb9	fix_salamander_and_elbst	2022-09-13 17:32:53 +00:00
juliancoffee	be1638e2e7	Remove csv_import of loot table	2022-09-12 18:30:17 +03:00
juliancoffee	97900b109f	Make loot export display all modulars	2022-09-12 18:30:17 +03:00
Joshua Yanovski	aea4aca057	Merge branch 'xmac94x/steal-sharps-clippy-improvements' into 'master' ... Xmac94x/steal sharps clippy improvements See merge request veloren/veloren!3612	2022-09-11 19:56:35 +00:00
Marcel Märtens	a32b269252	steal sharps clippy improvements to the old nightly	2022-09-11 16:10:56 +02:00
flo	e43608ce80	add guitar & instrument sample edits	2022-09-10 17:23:38 +00:00
Joshua Yanovski	986d104faa	Update Rust toolchain.	2022-09-08 15:43:53 -07:00
Marcel Märtens	d9e6f10688	update dependencies	2022-09-08 23:29:08 +02:00
Yusuf Bera Ertan	812298cb63	fix: default to build detected git version / tag if we can't get runtime variables	2022-09-08 12:29:17 +03:00
Yusuf Bera Ertan	58e74a26cd	Revert "Merge branch 'revert-441acd3e' into 'master'" ... This reverts commit f170da4da6, reversing changes made to aa7569061b.	2022-09-08 12:28:56 +03:00
Joshua Yanovski	e55b541bcc	Revert "Merge branch 'yusdacra/chore/nix' into 'master'" ... This reverts merge request !2951	2022-09-08 08:33:35 +00:00
Samuel Keiffer	aa7569061b	Merge branch 'juliancoffee/more-buffs' into 'master' ... Add Golden Cheese debug potion See merge request veloren/veloren!3597	2022-09-08 01:01:18 +00:00
Joshua Yanovski	c95c08ee54	Merge branch 'sharp/fix-full-server' into 'master' ... Allow mods/admins to log in when server is full. See merge request veloren/veloren!3600	2022-09-07 05:21:08 +00:00
Joshua Yanovski	f5aee1d2a7	Allow mods/admins to log in when server is full. ... As a side effect, this moves the initial game server sync message into the login code, since that's the first place we can check for admin permissions and we want to avoid sending large messages to users who are not authenticated (especially if the player cap has been reached; previously, the player cap check limited the damage that could be done by unauthenticated players). Some fallout from this is that we don't synchronize the Player component anymore, which had some minor effects on voxygen. This update also breaks Torvus, since Client::new now expects the username and password to be provided from the getgo--an accompanying MR will be submitted to fix it.	2022-09-06 21:42:31 -07:00
Imbris	441acd3e48	Merge branch 'yusdacra/chore/nix' into 'master' ... build(nix): refactor and update nix flake See merge request veloren/veloren!2951	2022-09-07 03:42:28 +00:00
juliancoffee	34c5e95d8a	Add Energy regen buff ... * Fix broken i18n keys for health and energy increases * Better handle buff descriptions Calculate infobox lines for item stats to set correct infobox frame dimensions	2022-09-06 15:50:04 +03:00
juliancoffee	54c48c7112	Extract buff executor into own function	2022-09-06 15:50:04 +03:00
Isse	7ea720b2ef	Merge branch 'creature_model_updates' into 'master' ... Creature model updates See merge request veloren/veloren!3584	2022-09-06 10:35:11 +00:00
flo	e4a3671345	Creature model updates	2022-09-06 10:35:10 +00:00
juliancoffee	2b3cfe690d	Adress review ... * Make compatible_handndess check its own function and get back to `match`	2022-09-06 00:59:15 +03:00
juliancoffee	421aa44d5f	Make kit generate all possible modulars	2022-09-05 00:24:58 +03:00
juliancoffee	0c5a33b031	Add functions to generate collection of modulars	2022-09-05 00:24:58 +03:00
Yusuf Bera Ertan	e94acbec8b	fix: use as_str to get rid of doesn't implement display	2022-09-03 16:31:52 +03:00
Yusuf Bera Ertan	2af2b34d84	build: allow common to read git version information at runtime	2022-09-03 16:26:10 +03:00
Joshua Barretto	6a1e560906	Switched to median dt for stable dt	2022-09-02 18:21:24 +01:00
flo	6c89cd8fbf	put Organ under Toolkind Instrument	2022-08-30 16:55:02 +00:00
Samuel Keiffer	52ce12f383	Merge branch 'floppy-music-instruments' into 'master' ... Music Instruments See merge request veloren/veloren!3535	2022-08-28 18:48:18 +00:00
flo	9339971032	Music Instruments	2022-08-28 18:48:18 +00:00
Joshua Yanovski	6032dbd22a	Merge branch 'seachapel_fixes' into 'master' ... seachapel_fixes See merge request veloren/veloren!3572	2022-08-27 08:03:04 +00:00
flo666	1876d169c8	- Dagon, SeaCrocodile hitboxes	2022-08-27 08:06:33 +02:00
Imbris	4126194a5c	View distances small fixes and improvement: ... * Properly set view_distance field in Client when sending it to the server in request_character/request_spectator. * Removed invalid check I had included in Client::set_view_distance * ViewDistances::clamp now clamps min to 1 for both types of view distance.	2022-08-25 23:24:43 -04:00
Imbris	cc1de8334d	Clean up common/src/lib.rs to avoid repetitive wasm cfgs. Not many lines ... actually removed but it looks a lot better IMO.	2022-08-25 23:24:43 -04:00
Imbris	334937568e	Add an entity view distance setting that allows limiting the distance ... entities are synced from and displayed in. NOTE: Syncing entities work at the granularity regions which are multi-chunk squares but the display of entities in voxygen is limited in a circle with the radiues of the supplied distance. Additional details and changes: * Added `ViewDistances` struct in `common` that contains separate terrain and entity view distances (the entity view distance will be clamped by the terrain view distance in uses of this). * View distance requests from the client to the server now use this type. * When requesting the character or spectate state the client now passes its desired view distances. This is exposed as a new parameter on `Client::request_character`/`Client::request_spectate`. And the client no longer needs to send a view distance request after entering these states. This also allows us to avoid needing to initialize `Presence` with a default view distance value on the server. * Removed `DerefFlaggedStorage` from `Presence` and `RegionSubscription` since the change tracking isn't used for these components. * Add sliders in voxygen graphics and network tabs for this new setting. Show the clamped value as well as the selected value next to the slider. * Rename existing "Entities View Distance" slider (which AFAIK controls the distance at which different LOD levels apply to figures) to "Entities Detail Distance" so we can use the former name for this new slider.	2022-08-25 23:24:43 -04:00
flo	e882e62c08	seachapel	2022-08-24 21:50:53 +00:00
Joshua Barretto	51d90707b5	Relaxed automod somewhat	2022-08-23 10:03:06 +01:00
Imbris	275b17be57	Merge branch 'imbris/misc_fix' into 'master' ... Trade canceling related tweaks, make kill_npcs not leave clutter (and actually remove entities in the first place), and misc tweaks See merge request veloren/veloren!3555	2022-08-21 16:35:16 +00:00
DaforLynx	656727ecbd	Miscellaneous audio fixes	2022-08-21 05:32:02 +00:00
Imbris	ca66a9f79b	Fix bug in Health::kill that caused Destroy event to never be emitted by preemptively setting is_dead to true	2022-08-20 18:47:09 -04:00
Marcel	3b87bf1e4a	Merge branch 'xMAC94x/slowjob_freeze_reproduction' into 'master' ... Initial reproduction of the slowjob freezen with par_iter and slowjob, See merge request veloren/veloren!3546	2022-08-20 20:44:07 +00:00
juliancoffee	69cea513ee	Make comments to be doc-comments	2022-08-20 22:30:25 +03:00
juliancoffee	6319dcfc22	Add more components in /body ... * Add mass * Add density * Add collider. This one is strange as always, I don't know what's wrong, but debug hitbox changes only after death. Real one seems to work.	2022-08-20 17:02:08 +03:00
juliancoffee	a371aad05e	Add /body command that allows you to switch body	2022-08-20 15:20:27 +03:00
Marcel Märtens	3eac68000b	all tests shows there is currently no way to keep rayon from work-stealing over scopes and doing really really weird stuff between the ECS threadpool and the slowjob Threadpool. so even if i dont like to have multiple threads i think there is no other workaround than just creating a second threapool for background tasks	2022-08-19 09:50:00 +02:00
Marcel Märtens	8ca458188d	also those dispatcher tricks wont help the test, it still sporadically fails	2022-08-19 09:30:56 +02:00
Marcel Märtens	25d9e5b27e	workaround for https://github.com/rayon-rs/rayon/issues/969 ... Unfortuatly rayon has a bug that if you Threadpool.spawn from inside a parallel iterator from inside a Threadpool.install, that the parallel iterator will BLOCK till the Threadpool.spawn finished, which causes many many lag spikes. I assume this might be the case for the pictures in the gantt chart where a system took unusual long or had a long pause that was unexplained. I also raise the number of threads by 1, as this rayon thread will prob be useless in all cases and have no real work to do. EDIT: it turns out the tests are sporadicly failing and this soluction doesnt work	2022-08-19 09:30:00 +02:00
Marcel Märtens	c968e5c748	Initial reproduction of the slowjob freezen with par_iter and slowjob, ... See that we spawn 2 jobs in the first loop, the loop seems to NOT complete until those jobs are executed Next step is to do everything with plain rayon coding	2022-08-18 12:38:17 +02:00
Tormod Gjeitnes Hellen	e306b3bfe3	Have the ambushers say something. ... Very unsure about the way I did this...	2022-08-17 23:50:09 +02:00
Marcel	c6bcdd7a2c	Merge branch 'juliancoffee/i18n-tooling-fluent' into 'master' ... Implement i18n-tooling See merge request veloren/veloren!3536	2022-08-17 20:39:00 +00:00
juliancoffee	847ee1c1b1	Implement i18n-tooling ... * Working csv export * Working i18n-check	2022-08-17 22:46:48 +03:00
DaforLynx	daadf3abdb	Gnarling Fort music; more specific sites; fix music spacing; new sfx	2022-08-14 01:57:58 +00:00
Samuel Keiffer	a1b5f53d15	Merge branch 'craft-all' into 'master' ... Craft all See merge request veloren/veloren!3525	2022-08-12 00:47:48 +00:00
Julio Cezar Silva	9315482fc4	Craft all	2022-08-12 00:47:48 +00:00
Joshua Barretto	602de267b1	Perform validation on all kinds of chat message	2022-08-11 11:11:33 +01:00
Joshua Barretto	52bd7b2485	Added automod	2022-08-11 11:09:52 +01:00
IsseW	87821d5c1d	force update counter	2022-08-09 19:22:09 +02:00
Isse	0471e78f41	spectate mode :D	2022-08-09 18:43:13 +02:00
Imbris	d5b59c2bb7	Convert away from IdvStorage to mixture of VecStorage and DenseVecStorage	2022-08-08 00:38:20 -04:00
juliancoffee	f2df1adf27	Improve documentation	2022-08-07 16:21:58 +03:00
juliancoffee	8ba50e62d5	New i18n implementation based on Fluent	2022-08-06 21:45:23 +03:00
Samuel Keiffer	abf0a27323	Merge branch 'sam/remove-cr-ui' into 'master' ... Removed weapon CR from UI. See merge request veloren/veloren!3497	2022-07-30 16:22:29 +00:00
Sam	29dd9eac9b	Remvoed CR from UI. Changed all stats in tools and armor to be same size. Cleaned up item stats UI code.	2022-07-28 19:19:20 -04:00
Sam	28a4ce9be1	Various tweaks	2022-07-26 19:44:49 -04:00
Marcel Märtens	ffe7b2158d	put light_emitters in par_loop to improve the runtime of the campfire lit out loop	2022-07-18 20:56:28 +02:00
Forest Anderson	67534488b3	Merge branch 'tygyh/CleanUp' into 'master' ... Tygyh/clean up See merge request veloren/veloren!3480	2022-07-17 14:04:45 +00:00
Youssef Fahmy	91c85dea22	Humanoid Model Overhaul	2022-07-16 11:13:24 +00:00
tygyh	120ee6b6c0	Fix typos	2022-07-15 18:59:37 +02:00
tygyh	25e20b5fa0	Remove unecesssary lifetimes	2022-07-15 16:20:15 +02:00
tygyh	cbe4d9d807	Remove unused imports	2022-07-15 16:00:27 +02:00
tygyh	fefe745508	Reorder impl member order to match trait member order	2022-07-15 15:54:32 +02:00
tygyh	5e5698249b	Remove unnecessarily qualified paths	2022-07-15 14:49:46 +02:00
Christof Petig	2dce472d1f	Merge branch 'christof/modular-weapon-prices' into 'master' ... Implement material (de-)composition for modular weapons, add tusk+crest+pincer to price list See merge request veloren/veloren!3469	2022-07-14 18:24:21 +00:00
Isse	1e3b5383cf	Merge branch 'zesterer/better-rain' into 'master' ... Better rain See merge request veloren/veloren!3464	2022-07-13 23:25:33 +00:00
Christof Petig	bb952fe755	rustfmt the last cleanup	2022-07-13 23:38:11 +02:00
Christof Petig	edfe6d887e	final polish	2022-07-13 23:32:20 +02:00
Christof Petig	eab062450a	clippy helped to get rid of one level of indirection	2022-07-13 23:27:17 +02:00
Christof Petig	d2aa9028ec	clippy is right about this flat_map	2022-07-13 23:17:22 +02:00
Christof Petig	197f84a360	returning a vec creates much more readable code	2022-07-13 23:03:58 +02:00
Christof Petig	3bdeb77268	Full support for modular weapon in loot table read	2022-07-13 22:56:52 +02:00
Christof Petig	a0749ac9bc	test passes, not happy with implementation yet	2022-07-13 20:15:28 +02:00
Christof Petig	5bbb73bc17	changelog + remove dead code, but the test still fails	2022-07-13 20:15:28 +02:00
Christof Petig	5ee72f8a5e	fix test; add tusk, crest, pincer	2022-07-13 20:15:28 +02:00
Christof Petig	8c5901516e	clean up	2022-07-13 20:15:28 +02:00
Christof Petig	7a1218cf2f	make a recipe of all modular weapons	2022-07-13 20:15:28 +02:00
Christof Petig	3a7835c6d0	replace one Owned reference by the normal Reference type	2022-07-13 20:15:28 +02:00
Avi Weinstock	cea2550dde	Add Item::new_from_item_definition_id.	2022-07-13 20:15:28 +02:00
Christof Petig	7e5ebada2d	still incomplete but looks surprisingly usable	2022-07-13 20:15:28 +02:00
Christof Petig	33a01a0dab	fix compilation of example	2022-07-13 20:15:28 +02:00
Christof Petig	2b2ac20403	use ItemDefintionId across trade_pricing	2022-07-13 20:15:27 +02:00
Avi Weinstock	27d2cdeb79	WIP modular weapon pricing.	2022-07-13 20:15:27 +02:00
Socksonme	3f0f1c423c	Small fixes	2022-07-12 21:01:47 +00:00
Joshua Barretto	836fe2b1c6	Proper lightning	2022-07-09 01:59:18 +01:00
Joshua Barretto	4531a4e3f9	Added lightning	2022-07-08 23:26:33 +01:00
Joshua Barretto	28bc9db198	Better cloud cover	2022-07-08 18:09:13 +01:00
Joshua Barretto	853d622e19	Better fall rate	2022-07-08 16:41:31 +01:00
Joshua Barretto	23aea72466	Fixed fall rate	2022-07-08 16:09:36 +01:00
Isse	c0f06dcb8a	Merge branch 'socksonme/fix_crushing_damage_crit' into 'master' ... Group up extra damage from crushing attacks whenever they're crits See merge request veloren/veloren!3461	2022-07-06 21:38:41 +00:00
Socksonme	e3b1d02fce	Group up extra damage from crushing attacks whenever they're crits	2022-07-06 22:59:58 +03:00
Marcel Märtens	e4909650e1	update hashbrown, specs, and tracy	2022-07-06 15:41:59 +02:00
IsseW	6d8cbe6f0f	remove relative rain direction and increase FALL_RATE	2022-07-04 18:18:43 +02:00
IsseW	a7c724a46d	Limit figures drawn for rain occlusion	2022-07-04 18:18:35 +02:00
IsseW	27ec6d7469	add weather_zone command	2022-07-04 18:18:33 +02:00
IsseW	9f26afb4a5	refactor rain_dir to rain_vel	2022-07-04 18:11:45 +02:00
IsseW	121cf3becc	Comment fixes	2022-07-04 18:11:44 +02:00
Treeco	0d21361e05	Add player-relative rain direction	2022-07-04 18:11:42 +02:00
IsseW	fd12c8abdb	Remove dead shader code, clean up weather.rs	2022-07-04 18:10:06 +02:00
IsseW	6215ccd522	Remove dead code	2022-07-04 18:07:24 +02:00
IsseW	3eabe24f12	base occlusion texture size of off voxels	2022-07-04 18:07:19 +02:00
IsseW	08b0989789	add slider for rain map resolution	2022-07-04 18:07:18 +02:00
IsseW	54f958acc7	more correct occlusion	2022-07-04 18:07:16 +02:00
DaforLynx	aafd13508d	Completely redoing ambient sound again.	2022-07-04 18:07:08 +02:00
DaforLynx	16ca1410be	Remove extraneous sfx code	2022-07-04 18:07:08 +02:00
DaforLynx	ca815f25a1	merging some UI sfx from a now-dead branch ... Merge part 2 merge part 3 Merge part 4 merge part 5	2022-07-04 18:07:07 +02:00
IsseW	4fa2644507	Interpolate weather in voxygen	2022-07-04 18:07:04 +02:00
IsseW	78c1de19cf	More accurate weather sim	2022-07-04 18:04:39 +02:00
IsseW	6585ef1513	weather dependant music	2022-07-04 18:11:43 +02:00
IsseW	b7c0196129	Server weather sim	2022-07-04 18:11:41 +02:00
Socksonme	6a355c58f2	Remove instance from PoiseChange	2022-06-29 18:36:05 +03:00
Socksonme	2c5fd06d0b	Address review ... - Change hp_pulse to not be framerate dependent - Change some of the HpFloater checks to be inside the find() function - Remove unnecessary join - Add back option for showing incoming damage + add option for experience accumulation - Change `ExpFloater`s to not store the owner, as they are only shown for the player (will have to see if the implementation is correct so that it may be applied to the other floaters) - Rename `Outcome::Damage` to `Outcome::HealthChange` and `DamageInfo` to `HealthChangeInfo` - Update some outdated comments/documentation	2022-06-29 17:31:58 +03:00
socksonme	eabbfe6a51	Remove damage batch option + crit_mult	2022-06-29 17:31:54 +03:00
socksonme	0e84794217	change font size formula to not use crit_mult + use ints for change by check	2022-06-29 17:31:43 +03:00
socksonme	3d2dcbf894	Revert some changes	2022-06-29 17:31:43 +03:00
socksonme	559d5ca804	Some changes to DamageSources + various code qual changes	2022-06-29 17:31:43 +03:00
socksonme	5360a7c93e	Tons of code quality changes, added damage rounding option	2022-06-29 17:31:37 +03:00
socksonme	64f0f05608	Fixed bug with healing above 5.0 and preparing for options	2022-06-29 17:31:10 +03:00
socksonme	db16e6147c	Instance inside projectile constructor is now a variable	2022-06-29 17:31:09 +03:00
socksonme	202d558246	Instance number generated inside projectile constructor, remove crit field	2022-06-29 17:31:07 +03:00
socksonme	6c75ad6ef8	Code quality changes and comments	2022-06-29 17:30:54 +03:00
socksonme	c0e78d869e	Instance numbers are now based on the AttackDamage struct	2022-06-29 17:30:53 +03:00
socksonme	ac5bf53c42	Instance numbers for HpChanges	2022-06-29 17:30:50 +03:00
socksonme	f8924d6c1a	tweaks to damage floaters ... Added some comments where stuff needs to be discussed	2022-06-29 17:30:32 +03:00
socksonme	7a1e19d42c	Crits now only glob with eachother, now show up like healing ... Still a WIP, need to change crits to being non-floating and try implementing crits popping, need to remove some debugging stuff later	2022-06-29 17:30:29 +03:00
socksonme	ce95680df9	Addressed comments, health and damage floaters are now separated ... Enemy healing probably needs to be discussed as it doesn't show up as of now and the way crits are handled also needs to be discussed	2022-06-29 17:29:59 +03:00
socksonme	94f193fbe0	Damage outcomes are now emitted with health change events ... Being healed and damaged at the same time still leads to issues - needs to be sorted out	2022-06-29 17:29:19 +03:00
socksonme	634a3095d6	Handling crits (very bad color choice+naming)	2022-06-29 17:24:05 +03:00
socksonme	93d3ce18b4	Remove dbgs and temporary? 0.0 damage fix	2022-06-29 17:24:05 +03:00
socksonme	aee7888a92	HpFloaters are now created by Outcomes, touched up Damage Outcome	2022-06-29 17:24:05 +03:00
socksonme	bf6c6fb33d	Changed Damage Outcome to store more data	2022-06-29 17:24:05 +03:00
Sam	4a5ef6dce3	Poise damage dealt to a target in a stunned state is now no longer universally applied to the target as health damage. ... Instead poise damage is only converted to health damage when its source is mitigated crushing damage. Fixed 'Long Pole' -> 'Longpole'	2022-06-17 21:13:45 -04:00
Imbris	950723dd0d	Add metrics for counting server events	2022-06-15 00:40:58 -04:00
Samantha W	57ab1c5767	Add a client-side mutelist	2022-06-14 20:35:01 +00:00
IsseW	e05da7f6fa	fix depot bug	2022-06-09 09:53:06 +02:00