3224 Commits

Author	SHA1	Message	Date
Marcel	39ea9d3aa3	Merge branch 'xMAC94x/ci_bin_features' into 'master' ... Add bot tests to CI See merge request veloren/veloren!2326	2021-06-08 10:04:17 +00:00
Marcel	eecb561838	Merge branch 'slipped/meatfollowup' into 'master' ... various fixes to items See merge request veloren/veloren!2399	2021-06-08 09:57:31 +00:00
Christof Petig	b3956517fc	suppress recipes with no cost	2021-06-08 09:17:04 +02:00
jshipsey	fe1cbec37c	various fixes to items	2021-06-07 21:21:12 -04:00
Avi Weinstock	3cbf84ddb1	Restore collision data for airships, and add the test that would have caught this.	2021-06-07 18:09:09 -04:00
Marcel Märtens	846df3a18a	--all-targets does not run targets that needs some features which are not provided. --all-features is NOT possible as we have some features which are conflicting. ... The only possibility is to manually add the features we need to check in CI to the clippy query	2021-06-07 12:29:08 +02:00
Marcel	f2eedf81f4	Merge branch 'imbris/648-cleanup' into 'master' ... Make handling of shortcut keywords for commands clearer and revise a TODO... Closes #648 See merge request veloren/veloren!2387	2021-06-07 10:27:54 +00:00
Marcel Märtens	b1c2a1bde0	put ron behind a cargo feature as its only used in a bin and fix a logical merge conflict, overwriting with edfe713076	2021-06-07 11:13:55 +02:00
Sam	0488b2fcd0	Adressed comments on energy and armor functions.	2021-06-07 11:06:25 +02:00
Snowram	76ca99ece4	Derive str from Material, better deserialization	2021-06-07 11:03:50 +02:00
jshipsey	4deeb42155	cave adjustments	2021-06-07 11:02:34 +02:00
jshipsey	9034d0f25d	comment addressing, cave tweaks	2021-06-07 11:01:46 +02:00
jshipsey	0e269b59d7	tooltip work	2021-06-07 11:01:32 +02:00
Snowram	29a38e6d4f	Split tags into material class and material	2021-06-07 11:00:57 +02:00
Snowram	3fa7d0b6d4	Add material and armor class tags	2021-06-07 11:00:31 +02:00
jshipsey	7a573efab7	proper recipes, tanning racks, various fixes	2021-06-07 11:00:14 +02:00
jshipsey	05de96c94b	ore deposits, flower drops	2021-06-07 10:59:50 +02:00
jshipsey	1c17d8fe5e	cave changes	2021-06-07 10:59:44 +02:00
jshipsey	754b60d810	crafting stations	2021-06-07 10:59:35 +02:00
Sam	2a07fad802	Removed armor stat hackery. ... Added new armor stats to remaining armor items. Fixed broken tests.	2021-06-07 10:59:26 +02:00
Sam	fa0fe38699	Fixed csv tools	2021-06-07 10:58:47 +02:00
Sam	855384fbeb	Crit power stat now functional, added comments on each stat field to better describe what the stat does and what values should be used.	2021-06-07 10:58:42 +02:00
Sam	c3b834ec15	Max energy stat functional.	2021-06-07 10:58:37 +02:00
Sam	6790b71d53	Energy recovery stat functional.	2021-06-07 10:58:32 +02:00
jshipsey	1b575a5a04	crafting item partial re-organization, armor recipes, some specific animal drops	2021-06-07 10:56:35 +02:00
Imbris	0b92c72096	Make handling of shortcut keywords for commands clearer and revise a TODO related to how chat messages are stored and renamed with alias changes	2021-06-06 23:45:51 -04:00
Marcel	521e1eacf3	Merge branch 'aweinstock/add-models-20210603' into 'master' ... Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty. See merge request veloren/veloren!2371	2021-06-06 16:56:21 +00:00
Snowram	edfe713076	Cyclops, basilisk, air balloon offsets	2021-06-06 14:12:08 +02:00
Sam	acf7ad27f1	Balance tweaks.	2021-06-05 17:15:04 -05:00
Sam	74b7039219	Yeti AI	2021-06-05 13:25:47 -05:00
Sam	93f90d514c	Particles for ice spikes	2021-06-04 18:17:15 -05:00
Sam	81f7e690fd	Snowball attack.	2021-06-04 18:17:15 -05:00
Sam	a82984b925	Added base ability set	2021-06-04 18:17:14 -05:00
Sam	eaf87a53bb	Final tweaks.	2021-06-03 21:39:47 -05:00
Sam	5bf99eac11	Added totem ability, totem ai, totem ability set, particles for totem abilities, and totem voxel model.	2021-06-03 21:39:15 -05:00
Sam	ac2f097d80	Tidal warrior AI.	2021-06-03 21:39:14 -05:00
Sam	c81e1534f7	First 3 abilities for tidal warrior functional. Added bubble particles.	2021-06-03 21:39:13 -05:00
Avi Weinstock	05c699878f	Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty.	2021-06-03 19:24:34 -04:00
Samuel Keiffer	4b359b8ca4	Merge branch 'aweinstock/price-equality' into 'master' ... Add a manifest for making different items count as the same item for the purpose of pricing. See merge request veloren/veloren!2360	2021-06-02 23:48:45 +00:00
Samuel Keiffer	9a31d77f0a	Merge branch 'tygyh/default-loadout' into 'master' ... LoadoutBuilder refactoring See merge request veloren/veloren!2361	2021-06-02 23:42:39 +00:00
Samuel Keiffer	d235e98efe	Merge branch 'aweinstock/agent-pid' into 'master' ... Implement PID controllers and use them to stabilize Agent airship flight. See merge request veloren/veloren!2356	2021-06-02 23:15:08 +00:00
Avi Weinstock	054fb1d763	Add a manifest for making different items count as the same item for the purpose of pricing.	2021-06-02 19:12:51 -04:00
juliancoffee	1fc3fce970	Move warning-supressing from global onto function	2021-06-03 01:58:34 +03:00
juliancoffee	00714db492	Implement Choice of Choice in loadout files	2021-06-02 18:35:22 +03:00
juliancoffee	674a7f41bd	Using clippy::pedantic and improve asset tests ... - Turned clippy::pedantic on for loadout_builder.rs and applied some proposition - Check for invalid weights in loadout files	2021-06-02 17:54:14 +03:00
juliancoffee	952156ad99	Add ability to override weapon in loadout assets	2021-06-02 17:17:19 +03:00
juliancoffee	3c66e62fe0	Decompose LoadoutBuilder::from_asset_expect ... - Introduce apply_asset_expect() to mutate passed builder and complete it from asset - Remove runtime panic from choosing item - Rewrite defaults() to load from asset	2021-06-02 17:17:19 +03:00
Dr. Dystopia	641ccd5282	Replace object initialization with read from file	2021-06-02 17:17:19 +03:00
Imbris	3a1a65b134	Remove stabilized or_patterns feature	2021-06-01 13:19:20 -04:00
Imbris	48ebb10d50	Update toolchain	2021-05-31 20:44:57 -04:00
Adam Whitehurst	daa18dd92a	fix: remove limit	2021-05-30 13:42:47 -07:00
Adam Whitehurst	9e7937d98f	refactor: BuffKind::Frozen comment	2021-05-30 13:39:18 -07:00
Adam Whitehurst	98fdf5c3e1	fix: more succinct checked_tick_attack	2021-05-30 13:36:18 -07:00
Adam Whitehurst	6dc1c05089	fix: better scaling	2021-05-30 13:06:01 -07:00
Adam Whitehurst	6b1351bdc3	feat: impl attack speed modifier	2021-05-30 12:39:30 -07:00
Adam Whitehurst	0b92cc5732	feat: tick_attack utils	2021-05-30 12:39:00 -07:00
Avi Weinstock	e09ae8ad83	Address MR 2356 comments.	2021-05-30 13:36:25 -04:00
Avi Weinstock	5164b1a539	Add comments to the PID controller code.	2021-05-30 13:36:25 -04:00
Avi Weinstock	8b20175b6e	Implement PID controllers and use them to stabilize Agent airship flight.	2021-05-30 13:36:25 -04:00
Adam Whitehurst	eea7eead2e	wip: impl Stats::attack_speed_modifier	2021-05-30 09:40:11 -07:00
Adam Whitehurst	e06bd0eaa3	feat: BuffKind::Frozen	2021-05-30 08:51:47 -07:00
Avi Weinstock	3684cf0454	Fix economy data not properly being used to price trades, resulting in default prices being applied at most towns. ... Also add an exporter from econsim results to sqlite to aid in debugging the economy (which revealed this bug).	2021-05-28 15:09:29 -04:00
Avi Weinstock	7a97fbb5cf	Add zoom scaling as well as FOV scaling to ChargedRanged, and restore the old zoom afterwards.	2021-05-26 09:34:08 -04:00
Avi Weinstock	4d7828ec94	Make the camera zoom as the bow (or any ChargedRanged attack) is charging.	2021-05-26 09:34:07 -04:00
Justin Shipsey	d7c7f6bf5d	Merge branch 'sam/rework-bow' into 'master' ... Bow Rework See merge request veloren/veloren!2310	2021-05-26 04:44:09 +00:00
Justin Shipsey	1074352ca4	Merge branch 'juliancoffee/dungeon_chests' into 'master' ... dungeon chests See merge request veloren/veloren!2342	2021-05-24 23:05:20 +00:00
juliancoffee	c618ec7222	fmt	2021-05-25 01:23:32 +03:00
juliancoffee	940655dcb6	Adding different chests for each dungeon	2021-05-24 23:00:44 +03:00
Marcel	80b8561317	Merge branch 'lboklin/wing-clip' into 'master' ... Fix higher than intended drag for winged entities See merge request veloren/veloren!2336	2021-05-24 11:42:12 +00:00
juliancoffee	e248e795a1	fixing tests	2021-05-24 00:06:03 +03:00
juliancoffee	d80a45a066	Fix species tests for random body_type and fmt	2021-05-23 22:59:48 +03:00
juliancoffee	457e5b14d8	Add tests for validation assets	2021-05-23 22:27:33 +03:00
juliancoffee	8c1643cad9	Switch to using EquipSlot key instead of String	2021-05-23 21:37:41 +03:00
juliancoffee	22b1880ae5	LoadoutBuilder efactoring	2021-05-23 20:29:19 +03:00
Sam	0961f00c7c	Updated comments in states code.	2021-05-23 11:41:09 -05:00
juliancoffee	00b182c183	Remove unused LoadoutConfig-s	2021-05-23 19:19:20 +03:00
juliancoffee	6656cfe010	Add directory hierarchy	2021-05-23 19:19:20 +03:00
juliancoffee	cbdb7dc1c1	add TODO about tests	2021-05-23 19:19:20 +03:00
juliancoffee	0722861364	Move loadout config handling to .ron files	2021-05-23 19:19:20 +03:00
juliancoffee	f0692c491b	Implement random choosing of item from loadout	2021-05-23 19:19:20 +03:00
juliancoffee	a8699cfa15	Add support for .ron loadouts	2021-05-23 19:19:20 +03:00
James Melkonian	419cd2a5e4	Don't modify position in glide character state	2021-05-23 07:26:11 +00:00
Ludvig Böklin	a2afb75c83	Birds don't have wings	2021-05-23 08:17:49 +02:00
hqurve	854930bc1a	Item pickups are shown in separate window and "inventory-full" messages are shown above the item attempted to be picked up	2021-05-22 20:47:08 +00:00
Sam	7828112486	Balance tweaks.	2021-05-22 15:00:05 -05:00
Sam	0592d14d04	Fix	2021-05-22 13:29:03 -05:00
Samuel Keiffer	9f1bb37b70	Merge branch 'lboklin/bird-drag' into 'master' ... Adjusted masses; less excessive knockbacks; prevent loot shooting off See merge request veloren/veloren!2307	2021-05-22 17:56:14 +00:00
Ludvig Böklin	46d1bb5f18	Adjusted masses; less excessive knockbacks; prevent loot shooting off	2021-05-22 17:56:13 +00:00
Samuel Keiffer	e543941073	Merge branch 'juliancoffee/boss_armour' into 'master' ... Boss armor See merge request veloren/veloren!2327	2021-05-22 17:42:27 +00:00
Sam	f993f28eff	Various tweaks.	2021-05-22 12:41:47 -05:00
juliancoffee	ca6266e780	Fix skill presets, add tests	2021-05-22 12:33:22 -05:00
Sam	1014ac45bf	Made new skills for reworked bow. ... Created migration to reset bow skills.	2021-05-22 12:33:21 -05:00
Sam	3f16d15bbb	Reworked bow	2021-05-22 12:33:20 -05:00
Monty Marz	30bcc6aaa3	Ferocious armour for t5-dungeon minibosses	2021-05-22 10:55:36 +00:00
juliancoffee	7dc50891d2	Add placeholders for bosses armour	2021-05-22 00:20:56 +03:00
juliancoffee	312a01122a	Add tests to loadout builder	2021-05-21 23:36:09 +03:00
Samuel Keiffer	a0599ac046	Merge branch 'sam/extra-equip-slots' into 'master' ... Added Extra Loadout Slots See merge request veloren/veloren!2295	2021-05-21 20:28:53 +00:00
Ludvig Böklin	270f89db6b	Disable glider input until keys are pressed again after deploy	2021-05-20 12:13:59 +02:00
Sam	3a004d9d4c	Removed commented code	2021-05-17 16:48:56 -05:00
Sam	93b5e674f6	Fixed comments and some functionality.	2021-05-16 21:35:17 -05:00
Ben Wallis	fcf4ab7619	main/offhand weapon swap check refactor	2021-05-16 21:07:36 -05:00
Sam	ad0c247838	Removed special case for equipping a weapon that is no longer needed.	2021-05-15 15:16:39 -05:00
Sam	5cc6168553	Unequipping a mainhand weapon now moves offhand weapon into mainhand.	2021-05-15 15:16:39 -05:00
Sam	19926a2322	Swapping weapon sets is now functional. (Though very hacky?)	2021-05-15 15:16:39 -05:00
Sam	23cc3d671b	Now allows weapons to be swapped between the mainhand and offhand slot. (Probably hacky?)	2021-05-15 15:16:38 -05:00
Sam	6b153bcf47	Enforced certain invariants in how an item was equipped into the loadout: ... - a 2h weapon can only be equipped in a mainhand slot if the offhand slot is empty - a 1h weapon can only be equipped in an offhand slot if the mainhand slot has a 1h weapon - 2h weapons can never be equipped in an offhand slot Fixed some tests	2021-05-15 15:16:38 -05:00
Sam	9173dca03f	Added equip slots for other weapons.	2021-05-15 15:16:37 -05:00
holychowders	d5f3ba77d4	Make NPCs Aware of Sound - See Issue #913	2021-05-15 19:36:27 +00:00
Marcel	7d5ca0e7bf	Revert "Merge branch 'snowram/hacky-mount' into 'master'" ... This reverts merge request !2219	2021-05-14 13:43:20 +00:00
Snowram	8745fb803a	Use Body to determine mountee offsets	2021-05-14 00:11:54 +02:00
Snowram	b063ec5a8f	Clean unused mount offset	2021-05-14 00:11:46 +02:00
Snowram	486fbf940e	Anims export a transform for mounts	2021-05-14 00:11:37 +02:00
Snowram	026ba616ff	Expose the mounting bone to the mounter anims	2021-05-14 00:11:28 +02:00
Snowram	e4f3064b8a	Collar can make QuadMeds mountable, state + offsets	2021-05-14 00:11:15 +02:00
Joshua Yanovski	3869cdf1d2	Don't remesh chunk vertex data on sprite update. ... This results in an extremely visually noticeable improvement in latency when adding or removing sprite data and makes the game feel more responsive. This happens, for instance, when picking up a sprite like an apple or flower from the environment. We check to make sure that for items with lighting (like Velorite) or changes that otherwise affect meshing (like changing from fluid to nonfluid) this doesn't trigger.	2021-05-11 12:58:15 -07:00
James Melkonian	f76b61ac17	Make merchants /tell instead of /say	2021-05-11 17:26:22 +00:00
Sam	7f6c6c5603	Fixed offsets for laser and rocket attacks of clay golem.	2021-05-10 18:54:04 -05:00
Sam	0d53e790fd	Made golem laser spawn based off of orientation rather than look_dir. Additional balance tweaks.	2021-05-10 18:54:00 -05:00
Sam	fca56be4c0	Balance tweaks	2021-05-10 18:53:52 -05:00
Sam	d14fd59711	Increased exp of clay golems.	2021-05-10 18:53:51 -05:00
Sam	9bbdc26089	Added haniwa sentries to level 3 dungeons.	2021-05-10 18:53:50 -05:00
Snowram	47a2bf7de8	Adds haniwa sentry object	2021-05-10 18:53:48 -05:00
Sam	c67c56d194	Dungeon placement. Tweaks to melee.	2021-05-10 18:53:47 -05:00
Sam	9f8aeb91c0	Added armor, more ai tweaks.	2021-05-10 18:53:46 -05:00
Sam	1c8db241e2	Golem AI	2021-05-10 18:53:43 -05:00
Sam	5fa4358e74	Clay golem attacks done.	2021-05-10 18:53:01 -05:00
Joshua Yanovski	0cf0f59fa7	Merge branch 'sharp/modtools' into 'master' ... Added non-admin moderators and timed bans. See merge request veloren/veloren!2276	2021-05-10 04:54:06 +00:00
Joshua Yanovski	e7587c4d9d	Added non-admin moderators and timed bans. ... The security model has been updated to reflect this change (for example, moderators cannot revert a ban by an administrator). Ban history is also now recorded in the ban file, and much more information about the ban is stored (whitelists and administrators also have extra information). To support the new information without losing important information, this commit also introduces a new migration path for editable settings (both from legacy to the new format, and between versions). Examples of how to do this correctly, and migrate to new versions of a settings file, are in the settings/ subdirectory. As part of this effort, editable settings have been revamped to guarantee atomic saves (due to the increased amount of information in each file), some latent bugs in networking were fixed, and server-cli has been updated to go through StructOpt for both calls through TUI and argv, greatly simplifying parsing logic.	2021-05-09 21:19:16 -07:00
Samuel Keiffer	a86c3af42b	Merge branch 'aweinstock/mindflayerfixes-202105' into 'master' ... Mindflayer AI improvments See merge request veloren/veloren!2285	2021-05-10 02:54:21 +00:00
Samuel Keiffer	6c9a2663ba	Merge branch 'aws107/roll-to-remove-burning' into 'master' ... Implement #1105: Rolling removes burning debuff Closes #1105 See merge request veloren/veloren!2271	2021-05-10 02:40:08 +00:00
Avi Weinstock	1ae105125d	Change agent's condition field back to a bool (from bitflags) and add a separate int_counter field.	2021-05-09 18:09:53 -04:00
Avi Weinstock	1dfcdce1c0	Add a purple fireball to mindflayer and have it shoot it a few times before teleporting, and fix mindflayer AI's husk summons.	2021-05-09 18:09:31 -04:00
juliancoffee	d3be89f5eb	Add species to /spawn auto-complete	2021-05-09 20:43:13 +03:00
juliancoffee	3d011098b8	style convention	2021-05-09 19:05:01 +03:00
juliancoffee	735e8ab4ec	Extract common/src/assets.rs to own crate ... This gives us ability to use assets-related code in i18n without depending on whole veloren-common	2021-05-09 13:12:26 +03:00
Illia Denysenko	1c22a2b3fd	/skill_preset command	2021-05-08 15:47:09 +00:00
Adam Strauss	a5b7e34bf8	Fix #1105: Move server event so it does not emit constantly during build up	2021-05-07 15:40:11 -07:00
Adam Strauss	3d17fde537	Implement #1105: Rolling removes burning debuff	2021-05-07 15:38:41 -07:00
Snowram	831bfd0be9	Snowram/craft mats	2021-05-07 17:03:45 +00:00
Samuel Keiffer	a2999ce96f	Merge branch 'aweinstock/damage-types' into 'master' ... Add `DamageKind`, and make piercing damage partially ignore damage resistence. See merge request veloren/veloren!2262	2021-05-06 22:22:49 +00:00
Avi Weinstock	e4cda4309e	Add DamageKind, and make piercing damage partially ignore damage resistence. ... - Tweak bow/staff M1 stats.	2021-05-06 17:39:06 -04:00
James Melkonian	346eb48a27	Move weapon tactics to functions and take target body into attack radius consideration	2021-05-06 21:17:05 +00:00
Marcel	91f76d3b00	Merge branch 'xMAC94x/fixDisconnectMetrics' into 'master' ... instead of manually trying to sync disconnect metrics we now pass a Reason to... See merge request veloren/veloren!2259	2021-05-06 11:32:37 +00:00
Marcel Märtens	8196fd8b35	instead of manually trying to sync disconnect metrics we now pass a Reason to the handle_disconnect. ... There we make sure that the disconnect only happens once and decrease the respective Metrics. Also added more reasons	2021-05-06 11:43:10 +02:00
Marcel	efed14ccf9	Merge branch 'duelsik/wiring-on-death' into 'master' ... (Wiring) OnDeath See merge request veloren/veloren!2256	2021-05-06 09:00:50 +00:00
Sam	dc7e45c8bd	Rebalancing	2021-05-05 14:43:56 -04:00
Daniel Mizerski	b34704ea3f	(Wiring) OnDeath	2021-05-05 19:08:18 +02:00
Marcel Märtens	4cfdbdd069	use a constant for recommended_threads	2021-05-05 14:35:06 +02:00
Sam	062c290e49	Made buff commands exhaustive	2021-05-04 09:54:28 -04:00
Sam	2652660a58	Addressed comments and more testing feedback.	2021-05-04 08:45:14 -04:00
Sam	240a8e577d	Minor balancing tweaks.	2021-05-04 08:45:13 -04:00
Sam	5c241850f1	Added sfx. Addressed comments.	2021-05-04 08:45:12 -04:00
Sam	48fa4e7c1f	Balancing.	2021-05-04 08:45:11 -04:00
Sam	7ac1488181	Added kit for testing tier 4 dungeons.	2021-05-04 08:45:11 -04:00
Sam	164fd0de04	Particles for frenzy buff and ground cleave.	2021-05-04 08:45:10 -04:00
Sam	2290a22a15	Gave minotaur AI.	2021-05-04 08:45:09 -04:00
Sam	811f1fadb2	Replaced action_timer with action_state so there are additional fields.	2021-05-04 08:45:09 -04:00
jshipsey	c886accaf1	anims	2021-05-04 08:45:08 -04:00
Sam	d1139c3b7c	Added frenzy ability to minotaur. ... Added self-buff character state. Added frenzied buff kind. Added better comments on each buff kind.	2021-05-04 08:45:07 -04:00
Sam	160bd3ef0c	Crippling strike now functional. Crippled debuff added.	2021-05-04 08:45:05 -04:00
juliancoffee	b81981f805	Draft implementation	2021-05-03 22:07:09 +03:00
Samuel Keiffer	771a8db2a8	Merge branch 'slipped/oritweak' into 'master' ... ori tweaks, animal adjusts See merge request veloren/veloren!2234	2021-05-03 18:49:22 +00:00
Samuel Keiffer	610c529c42	Merge branch 'sam/ability-sets' into 'master' ... Allow Specification of Custom Ability Sets per Weapon See merge request veloren/veloren!2231	2021-05-03 17:50:11 +00:00
jshipsey	63fdc4f590	animal adjustments	2021-05-02 23:17:58 -04:00
Daniel Mizerski	7faa0d3cd9	Add fundamentals for wiring system.	2021-05-02 22:38:44 +02:00
jshipsey	769e21104e	higher health lower damage	2021-05-01 12:29:28 -04:00
jshipsey	dc5a38f1e8	ori addition to combomelee	2021-05-01 12:29:28 -04:00
Ludvig Böklin	d7ef414f59	Fix glider pitching down when trying to take off	2021-05-01 15:35:26 +02:00
Sam	d500a00414	Made naming of fields more explicit.	2021-05-01 09:25:56 -04:00
Sam	708cb12086	Fixed tests.	2021-05-01 09:25:55 -04:00
Sam	d3d4ee8bb0	Formatting stuffs.	2021-05-01 09:25:53 -04:00
Sam	3cb0ee98c8	Removed all unique and simple tool kinds.	2021-05-01 09:25:51 -04:00
Sam	a35b8b4aad	Removed ability set as field on items.	2021-05-01 09:25:49 -04:00
Ludvig Böklin	cc7f0f3ac2	Fix ori	2021-04-30 17:37:51 +02:00
DaforLynx	7334cce426	Poise (stun) SFX and fix for town music	2021-04-29 23:36:22 +00:00
Samuel Keiffer	e177aebd9e	Merge branch 'lboklin/lower-zero-lift-drag' into 'master' ... Lower zero-lift drag See merge request veloren/veloren!2223	2021-04-29 19:11:12 +00:00
Ludvig Böklin	c4444a908a	Lower zero-lift drag	2021-04-29 19:22:09 +02:00
Ludvig Böklin	6b52ea89b4	Add more specific masses to objects	2021-04-29 11:46:03 +02:00
Ben Wallis	b0aca9a348	Merge branch 'xvar/item-serialization' into 'master' ... Changed Item serialization to not send ItemDef struct across the network See merge request veloren/veloren!2215	2021-04-28 20:50:32 +00:00
Ben Wallis	14caae3667	Changed Item serialization to only send item_definition_id across the network rather than the whole ItemDef	2021-04-28 21:00:25 +01:00
DaforLynx	2e0272ce28	Town music	2021-04-28 05:07:59 +00:00
Ludvig Böklin	34660462e9	Glider physics	2021-04-27 14:41:48 +00:00
jshipsey	f845f2bd11	fix glide wield	2021-04-26 23:17:04 -04:00
Sam	1a7779beb3	Added angle check for new npcs.	2021-04-25 22:19:30 -04:00
jshipsey	a0a75b1921	comments	2021-04-25 22:02:32 -04:00
jshipsey	2c74a86170	skill adjustments, ori changes	2021-04-25 22:02:32 -04:00
jshipsey	c01fd86f44	ori fixes	2021-04-25 22:02:30 -04:00
Joshua Barretto	94b6fa6da3	Don't use movement efficiency for orientation	2021-04-25 23:00:30 +01:00
Joshua Barretto	3af4793762	Minor control over velocity when in the air	2021-04-25 22:37:25 +01:00
Sam	372eff2a02	Initial SCT implementation to display blocks.	2021-04-25 13:09:09 -04:00
Sam	d2d8d43410	Addressed testing feedback. ... Particles better.	2021-04-25 13:09:08 -04:00
Sam	b9d6bd2fd2	Parrying no longer requires releasing the block button, and instead can parry if block happened in buildup.	2021-04-25 13:09:07 -04:00
Sam	288a6f3a82	Blocking now works if no weapon is equipped in main hand. ... Added temp sfx for blocking and parrying. Added temp particles for successful parry. Tweaked values of default block ability.	2021-04-25 13:09:02 -04:00
Sam	f5ec23df48	Parrying	2021-04-25 13:08:42 -04:00
Sam	91c6288213	Melee weapons can now block.	2021-04-25 13:08:42 -04:00
Sam	0170a38ebc	Removed unwraps in buffs	2021-04-25 12:01:21 -04:00
Snowram	c16ec43938	Body specific beam offsets	2021-04-25 04:07:12 +02:00
Snowram	8f54a0bf31	More phoenix AI work ... More phoenix AI work	2021-04-25 04:07:12 +02:00
Snowram	8cf8e51962	Phoenix npc + AI (WIP)	2021-04-25 04:07:11 +02:00
Snowram	ab26efa970	Improves bird_large anims	2021-04-25 04:07:09 +02:00
Snowram	bd84677906	Day period dependant wildlife spawns	2021-04-25 02:14:51 +02:00
Snowram	fd177c9669	Breathe and stun anims	2021-04-25 02:14:50 +02:00
Snowram	eb98360183	Cockatrice bird_large conversion	2021-04-25 02:14:50 +02:00
Snowram	bc95484863	Swaps bird_small skeleton to a new bird_large	2021-04-25 02:14:49 +02:00
Ada Lovegirls	01c30868eb	Add option to load English string as fallback if string missing	2021-04-24 14:39:35 +00:00
Monty Marz	b69eb61e7b	Add handles to lanterns, fix cooking pot scale	2021-04-22 17:12:07 +00:00
jshipsey	9d82b20891	remove 0.8, add snow's mixed_vel idea for other bodies	2021-04-22 00:04:39 -04:00
Dominik Broński	1d25016459	Merge branch 'lboklin/arrow-turret-drag-fix' into 'master' ... Fix ArrowTurret drag coefficient See merge request veloren/veloren!2175	2021-04-21 20:17:44 +00:00
Imbris	1af4a04231	Revert "Merge branch 'revert-b10718c5' into 'master'" ... This reverts merge request !2172	2021-04-21 17:10:13 +00:00
Joshua Barretto	880236f223	Merge branch 'zesterer/lanterns' into 'master' ... Made characters carry lanterns higher when possible See merge request veloren/veloren!2169	2021-04-21 16:40:20 +00:00
Ludvig Böklin	37713cb4ad	Fix ArrowTurret drag coefficient	2021-04-21 18:26:23 +02:00
Joshua Barretto	ed7cc12213	Made characters carry lanterns higher when possible	2021-04-21 15:59:29 +01:00
Imbris	fd672980c4	Revert "Merge branch 'imbris/agent-opt' into 'master'" ... This reverts merge request !2024	2021-04-21 14:10:06 +00:00
Imbris	76ff00757f	Appease clippy, add CHANGELOG entry	2021-04-20 15:29:20 -04:00
Imbris	e750c9d570	Switch agent target search to use a spatial grid, add convience method for querying the aabr of a circle	2021-04-20 15:25:04 -04:00
Imbris	a76fdbc325	Expose CachedSpatialGrid resource that is updated by the physics system, move BuildAreas into its own module, removed unused ExecMode	2021-04-20 15:25:04 -04:00
Ludvig Böklin	762c68cfbb	Basic fluid dynamics and physical properties for entities	2021-04-20 17:38:19 +02:00
Joshua Barretto	68004bc39c	Made cooking pots glow	2021-04-20 15:39:46 +01:00
Joshua Barretto	36e95e0c03	Cleaned up client-side recipe handling	2021-04-20 12:33:22 +01:00
Monty	86445af09c	change cauldron spawning ... cooking pot height fmt fmt, changelog	2021-04-20 02:48:13 +02:00
Monty	a4d56e7843	more sprite stuff and crafting UI update ... fix item images fix CR display	2021-04-20 02:46:06 +02:00
Monty	a1fe7c12c3	fmt, add sprites	2021-04-20 02:46:04 +02:00
Joshua Barretto	5598d07944	Added crafting stations	2021-04-20 02:45:59 +02:00
Joshua Barretto	b700d9a641	Merge branch 'zesterer/econ-tweaks' into 'master' ... Limit trading currency to sane amounts See merge request veloren/veloren!2154	2021-04-19 10:46:17 +00:00
Joshua Barretto	324148d9a3	Limit trading currency to sane amounts	2021-04-19 10:04:28 +01:00
Sam	ce7581037c	Overhauled dash melee.	2021-04-18 18:36:12 -04:00
Joshua Barretto	cb817c0313	Merge branch 'zesterer/econ-tweaks' into 'master' ... Rebalanced economy somewhat See merge request veloren/veloren!2148	2021-04-18 21:20:49 +00:00
Samuel Keiffer	60d38cc03b	Merge branch 'aweinstock/dodgesplosion' into 'master' ... Unlock dodge roll iframes and staff explosion by default. See merge request veloren/veloren!2146	2021-04-18 20:46:15 +00:00
Avi Weinstock	0404250300	Unlock dodge roll iframes and staff explosion by default.	2021-04-18 16:16:06 -04:00
Joshua Barretto	352fce239e	Allow trading items not sold by merchants	2021-04-18 20:07:00 +01:00
Joshua Barretto	cac9ac6807	Trading stock limits	2021-04-18 18:58:26 +01:00
Samuel Keiffer	1892ec571d	Merge branch 'sam/permanent-spawn-safezone' into 'master' ... Safezone is now permanently in existence at spawn. See merge request veloren/veloren!2144	2021-04-17 23:44:10 +00:00
Sam	416fe5c2af	Safezone is now permanently in existence at spawn.	2021-04-17 17:33:54 -04:00
Ben Wallis	a4cdb89987	Implemented inventory sorting	2021-04-17 22:04:08 +01:00
Avi Weinstock	af47c0dc21	Added /server_physics admin command.	2021-04-17 13:44:22 -04:00
Samuel Keiffer	c962c5f12e	Merge branch 'gGmMsS/Burning' into 'master' ... Added burning debuff for Staff M2 See merge request veloren/veloren!2134	2021-04-15 23:51:33 +00:00
Imbris	85ee4c8cd1	Merge branch 'aweinstock/server-authoritative-physics' into 'master' ... Aweinstock/server authoritative physics See merge request veloren/veloren!2126	2021-04-15 22:24:00 +00:00
gGmMsS123	d5a887f195	m2 staff	2021-04-16 00:48:20 +03:00
gGmMsS123	e33961e1fa	M2 Staff Final Touch	2021-04-16 00:34:24 +03:00
gGmMsS123	0d956610ec	Added burning debuff for Staff M2	2021-04-15 23:34:28 +03:00
Avi Weinstock	2fb7575d60	Address MR 2126 comments.	2021-04-15 15:17:39 -04:00
jshipsey	8f20d17c9a	attacking movement tweaks	2021-04-15 12:13:50 -04:00
Avi Weinstock	50d0314a75	Add a toggle to negotiate the use of server-authoritative physics.	2021-04-15 08:50:17 -04:00
Justin Shipsey	f7f2eb4b9b	Merge branch 'sam/2h-offhand-anim-fixes' into 'master' ... 2 Hand Offhand Animation Fixes See merge request veloren/veloren!2129	2021-04-15 01:21:52 +00:00
Sam	c88df846a7	Fixes animation parameters so a 2h weapon in the offhand slot doesn't look wonky.	2021-04-14 17:38:37 -04:00
Sam	94042bdf79	Stats adjusted for 2h. Poise adjusted by handedness.	2021-04-14 15:03:37 -04:00
holychowders	568a8d9666	Resolve Issue #978 - Extract SkillSet Into Its Own Component	2021-04-14 15:35:34 +00:00
jshipsey	161382d06a	changelog	2021-04-13 20:19:35 -04:00
jshipsey	ea9b871374	loot tables, clippy, animation tweaks	2021-04-13 20:18:59 -04:00
Sam	0b10ffc715	You can now roll without a weapon equipped.	2021-04-13 20:18:58 -04:00
jshipsey	b53e1653f6	initial wield testing	2021-04-13 20:18:58 -04:00
Ben Wallis	1de94a9979	* Replaced diesel with rusqlite and refinery ... * Added "migration of migrations" to transfer the data from the __diesel_schema_migrations table to the refinery_schema_history table * Removed all down migrations as refinery does not support down migrations * Changed all diesel up migrations to refinery naming format * Added --sql-log-mode parameter to veloren-server-cli to allow SQL tracing and profiling * Added /disconnect_all_players admin command * Added disconnectall CLI command * Fixes for several potential persistence-related race conditions	2021-04-13 22:05:47 +00:00
Vincent Foulon	a4bd47f340	Support quantity + use Enum for autocompletion + Address comments	2021-04-12 20:07:34 +02:00
Vincent Foulon	0692562533	New Command: "kit" + Removed Command: "debug" ... Update CHANGELOG.md Update CHANGELOG.md	2021-04-12 18:53:36 +02:00
Marcel	54024ce401	Merge branch 'DaforLynx/more-music' into 'master' ... Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds See merge request veloren/veloren!2102	2021-04-12 00:43:08 +00:00
DaforLynx	9db290d4ea	Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds	2021-04-12 00:43:08 +00:00
Avi Weinstock	ddf6a26577	Give NPCs the ability to use potions.	2021-04-11 23:47:29 +00:00
Joshua Yanovski	af94753ad9	Remove panics and unwraps, part 1. ... Also fixes various other miscellaneous bugs.	2021-04-10 10:03:21 +02:00
Imbris	0eecc61ddf	Merge branch 'vfoulon80/behavior-component' into 'master' ... New Component: Behavior See merge request veloren/veloren!2033	2021-04-08 19:16:28 +00:00
Vincent Foulon	d80db38bc9	Remove TRADE capability, use trade_site attribute instead	2021-04-08 19:06:57 +02:00
Vincent Foulon	bc1797a240	Address comments	2021-04-08 18:33:00 +02:00
holychowders	a4b00a3b97	Fix issue #1061 - Combat Rating is Affected by Buffs ... Replaced `stats` with `None` into the calculation for damage reduction	2021-04-07 17:09:51 -07:00
Vincent Foulon	a30cbaf735	Move Behavior to Agent's Component	2021-04-07 22:11:29 +02:00
Vincent Foulon	dbee13f9be	Finally Behavior isn't good enough as a component, Remove it from ECS and include it onto Agent directly	2021-04-07 22:02:57 +02:00
Vincent Foulon	45fb9f3211	Address comments ... - make Behavior's capabilities and state private - Typo in a comment - add basic tests Apply 1 suggestion(s) to 1 file(s) Remove comments in agent.rs	2021-04-07 22:02:42 +02:00
Vincent Foulon	a0157ac5f5	use bitflags instead of HashSet	2021-04-07 17:37:21 +02:00
Vincent Foulon	114715908a	fix tag removing	2021-04-07 17:26:54 +02:00
Vincent Foulon	b1718cf578	Use HashSet instead of Vec	2021-04-07 17:26:48 +02:00
Vincent Foulon	211ab02897	Use Behavior::CanTrade instead of Agent::trade_for_site + addressed comments	2021-04-07 17:26:42 +02:00
Vincent Foulon	18694b30ad	Use Behavior into Agent	2021-04-07 17:26:12 +02:00
Vincent Foulon	41314e9098	Create Behavior component	2021-04-07 17:21:53 +02:00
Marcel	45b4349bc7	Merge branch 'james/topo-map' into 'master' ... Adds topographic map option and allows for map layers See merge request veloren/veloren!2074	2021-04-07 09:34:13 +00:00
James Melkonian	16871208f2	Add topographic option to map	2021-04-06 09:16:17 -07:00
James Melkonian	8ee1fc4a0f	Add layers to minimap	2021-04-06 08:42:08 -07:00
James Melkonian	bacda06dba	Added map layers	2021-04-06 08:42:07 -07:00
James Melkonian	70ede7f34d	Topographic map	2021-04-06 08:42:06 -07:00
Avi Weinstock	2c4612bff1	Fix loadout_builder panic.	2021-04-06 10:34:13 -04:00
Marcel	f0cabf1add	Merge branch 'aweinstock/stackable-merchants' into 'master' ... Make merchants spawn with stacks of stackable items. See merge request veloren/veloren!2062	2021-04-06 08:14:33 +00:00
Samuel Keiffer	3c50321a80	Merge branch 'sam/consolidate-roll' into 'master' ... Flattened roll progression. See merge request veloren/veloren!2073	2021-04-06 03:31:46 +00:00
Sam	ba0b6c309b	Flattened roll progression.	2021-04-05 17:50:53 -04:00
Sam	a7e39bc8c9	Nerfs	2021-04-05 17:38:52 -04:00
Avi Weinstock	56137aff92	Address MR 2062 comments: avoid an expect-equivalent pattern.	2021-04-05 11:29:10 -04:00
Louis Pearson	91a647e35f	Return none from depot get if stale id used	2021-04-05 06:16:23 -06:00
Marcel	69891f0b70	Merge branch 'login-trim-username' into 'master' ... login trim username, improve validation, social ordering #1040 Closes #1040 See merge request veloren/veloren!2042	2021-04-04 22:09:16 +00:00
Marcel	958c75642c	Merge branch 'christof/stats_per_price' into 'master' ... output stats per value for all categories in the trade pricing test See merge request veloren/veloren!2057	2021-04-04 18:35:39 +00:00
Avi Weinstock	a1cfd9ea3c	Make merchants spawn with stacks of stackable items.	2021-04-04 13:47:05 -04:00
Monty Marz	06bbb7f0ff	Crafting Tabs and more item tags	2021-04-04 13:02:27 +00:00
DaforLynx	6734198104	Adds on-hit combat sfx	2021-04-04 03:04:02 +00:00
Joshua Yanovski	4be0f1b02e	Merge branch 'sam/hashset-touch-entities' into 'master' ... Changed touch_entities from a vec to a hashset. See merge request veloren/veloren!2056	2021-04-03 22:06:05 +00:00
Christof Petig	d3bdaaec1a	output stats per value for all categories in the trade pricing test	2021-04-03 23:22:34 +02:00
Joshua Yanovski	143fe3876d	Merge branch 'sam/use-lottery-result' into 'master' ... Handled error in setting stack size for item quantity in lottery. See merge request veloren/veloren!2055	2021-04-03 20:11:12 +00:00
Sam	18eed650f4	Changed touch_entities from a vec to a hashset.	2021-04-03 15:13:04 -04:00
Samuel Keiffer	8d9f63404e	Merge branch 'sam/combat-ratings' into 'master' ... Tweaks to Combat Rating Calculation See merge request veloren/veloren!2051	2021-04-03 17:33:34 +00:00
Sam	fd61b94b5d	Handled error in setting stack size for item quantity in lottery.	2021-04-03 11:37:57 -04:00
Sam	ca1a93ba21	Actually committed bone staff fix.	2021-04-03 10:26:32 -04:00
Samuel Keiffer	69b64e26c7	Merge branch 'sam/loot-table-features' into 'master' ... Loot Table Rework See merge request veloren/veloren!2046	2021-04-03 08:45:53 +00:00
Justin Shipsey	d99627e1dd	Merge branch 'refactor-cell' into 'master' ... refactor Cell back to 4 byte size #993 Closes #993 See merge request veloren/veloren!1997	2021-04-03 07:56:06 +00:00
Snowram	9a3f6d8261	Substitutes DPS for CR in item tooltip	2021-04-03 00:10:31 -04:00
Sam	be5d47a512	Factored out weapons into their own rating.	2021-04-03 00:08:40 -04:00
Sam	27f178286d	Removed all rng matches in code to determine loot tables, and moved to loot tables specific for each sprite, creature, or dungeon.	2021-04-02 23:24:55 -04:00
Sam	9ad5b0f6b7	Changelog. Fixed a few qualities.	2021-04-02 23:04:36 -04:00
Sam	7c8242b5b1	Added unit test to validate contents of loot tables.	2021-04-02 23:04:35 -04:00
Sam	c8b8cd436e	Made item prices sane.	2021-04-02 23:04:34 -04:00
Sam	7eb1eefa13	Re-created item_price_calculation with new loot tables.	2021-04-02 23:04:34 -04:00
Sam	a2906168a6	Moved materials into their own loot tables.	2021-04-02 23:04:33 -04:00
Sam	cb638180f8	Moved food items into their own loot tables.	2021-04-02 23:04:32 -04:00
Sam	31e69021cb	Switched loot tables from declaring each weapon individually to just referencing a different loot table.	2021-04-02 23:04:31 -04:00
Sam	2e37cefce5	Created weapon loot tables.	2021-04-02 23:04:29 -04:00
Sam	833f1f3309	Converted all armor in loot tables to reference armor set loot tables.	2021-04-02 23:04:28 -04:00
Sam	96b354c178	Consolidated loot tables by switching to CreatureMaterial where possible	2021-04-02 23:04:27 -04:00
Sam	ab2fca21cf	Fixed trading	2021-04-02 23:04:26 -04:00
Sam	bdbe6134f2	Fixed csv tools	2021-04-02 23:04:26 -04:00
Sam	cbca2a66b6	Support for creature specific materails and materials having a quantity.	2021-04-02 23:04:25 -04:00
Sam	247004d180	Loot tables can now recursively specify loot tables. Mercahnts broken.	2021-04-02 23:04:25 -04:00
aljazerzen	9b3f080838	refactor Cell back to 4 byte size	2021-04-01 17:38:10 +02:00
aljazerzen	08146f6a3a	login trim username, improve validation, social ordering	2021-04-01 16:43:27 +02:00
aljazerzen	8ac879e4c1	after leaving group, issue warning instead of changing chat mode	2021-04-01 15:43:50 +02:00
Avi Weinstock	0122dca3c3	Allow fast stacking into and out of a trade with {ctrl,shift} click. ... Shift click goes 1 at a time, Ctrl click automatically balances the trade w.r.t. that quantity.	2021-03-30 18:39:10 -04:00
Joshua Barretto	3c19713e63	Merge branch 'zesterer/sprite-text' into 'master' ... Added text prompts to sprites See merge request veloren/veloren!2034	2021-03-30 11:41:14 +00:00
Joshua Barretto	92afdaf423	Merge branch 'zesterer/small-fixes' into 'master' ... Bow improvements See merge request veloren/veloren!2032	2021-03-30 00:16:45 +00:00
Joshua Barretto	bed863c50c	Added indicator text to terrain sprites	2021-03-30 01:04:23 +01:00
Samuel Keiffer	12ec46c572	Merge branch 'sam/mindflayer-balancing' into 'master' ... Mindflayer balance tweaks. See merge request veloren/veloren!2031	2021-03-29 21:05:49 +00:00
Joshua Barretto	85237c7a32	Fixed training dummy hitbox	2021-03-29 21:52:05 +01:00
Joshua Barretto	b0acbda236	Improved archery with feedback sfx and particles	2021-03-29 21:52:04 +01:00
Snowram	6adaac8106	Addresses comments	2021-03-29 18:35:12 +02:00
Snowram	d1e734b9b1	Tooltip now use ItemDesc instead of Item	2021-03-29 18:34:45 +02:00
Snowram	2c09180189	Set the item tooltip for every bag slots	2021-03-29 18:34:45 +02:00
Snowram	aa71dcb9c7	Make the new tooltip item specific	2021-03-29 18:34:45 +02:00
Snowram	4786f84afd	New tooltip	2021-03-29 18:34:45 +02:00
Vincent Foulon	a35fa19409	Implement a basic dialogue system	2021-03-29 14:47:42 +00:00
Sam	71ba9b6a54	Mindflayer balance tweaks.	2021-03-29 10:44:46 -04:00
Treeco	12cf8847c8	Added command to teleport to sites by name	2021-03-28 17:02:17 +01:00
Avi Weinstock	40f2c59401	Reclassify Glowing Remains as Armor for econsim.	2021-03-28 10:29:40 -04:00
Marcel	519c01a888	Merge branch 'christof/item_price_fix' into 'master' ... Fix the price category of the newly added items See merge request veloren/veloren!2010	2021-03-28 09:25:52 +00:00
Christof Petig	66d0948d06	Fix the price category of the newly added items	2021-03-28 09:25:51 +00:00
Sam	f117a57083	Switched to using ForceUpdate to forcefully update the client position after a blink	2021-03-27 21:33:45 -04:00
Sam	ade466a12b	Removed potential for divide by zero	2021-03-27 21:06:21 -04:00
Sam	0e3b0a9ee7	Repalced stone golems with 10 husks in T5 dungeon miniboss rooms.	2021-03-27 21:06:18 -04:00
jshipsey	558c82ee54	flayer anims	2021-03-27 21:05:16 -04:00
Sam	91ddcaa155	Particles for summoned minions	2021-03-27 21:05:15 -04:00
Sam	1edf79d109	Moved all legendaries to mindflayer loot table.	2021-03-27 21:05:12 -04:00
Sam	4ec387af82	Added particles for lifesteal effect	2021-03-27 21:05:12 -04:00
Sam	5966b1541d	Mindflayer can now lifesteal off of its own minions	2021-03-27 21:05:11 -04:00
Sam	50e832b6d0	Mindflayer summons husks instead of dogs now	2021-03-27 21:05:10 -04:00
Snowram	39c8efe11f	Adds husk npc	2021-03-27 21:05:09 -04:00
Sam	f9835e78da	Pets no longer drop loot on death. Code to determine targeting of pets is less hacky and now takes into account alignment of their owner.	2021-03-27 21:05:07 -04:00
Sam	720482d994	Gave mindflayer AI. ... Fixed particles and made them sync across network.	2021-03-27 21:05:06 -04:00
Sam	a5b7477e96	Added summon minions ability to mindflayer	2021-03-27 21:05:05 -04:00
Sam	30da614e89	Added dimensional door ability for mindflayer	2021-03-27 21:05:05 -04:00
Sam	f1156c9ce5	Added necrotic vortex attack to mindflayer	2021-03-27 21:05:03 -04:00
Sam	0d3795112c	Added cursed flame attack to mindflayer	2021-03-27 21:05:03 -04:00
Sam	46799daed2	Switched normalized function to try_normalized	2021-03-27 19:05:48 -04:00
Louis Pearson	165065725e	Add build_area_list command ... * Reworks CanBuild to use HashSet * Removes player argument from build permission, use sudo instead	2021-03-27 07:54:02 -06:00
Louis Pearson	21f794f84c	Use Depot instead of Store for BuildArea	2021-03-27 07:54:02 -06:00
Louis Pearson	f08c4e6585	Add commands to manage build areas	2021-03-27 07:54:02 -06:00
Louis Pearson	77d48657c6	Store build areas outside of CanBuild component	2021-03-27 07:54:02 -06:00
Louis Pearson	120a0cd9a7	Limit build mode to bounding box	2021-03-27 07:54:02 -06:00
Louis Pearson	eade0540b2	Add permit_build command ... This commit separates permission to build from building mode, allowing build to become a NoAdmin command (since players will first need permission from an Admin to enter build mode)	2021-03-27 07:54:02 -06:00
Sam	6c2de7d70e	Fixed boost having ridiculous velocity.	2021-03-26 16:11:25 -04:00
Scott Williams	d35475eaef	Added leather scraps recipe	2021-03-26 16:44:38 +00:00
Marcel	843850a4b8	Merge branch 'aweinstock/tradepricing' into 'master' ... Get SitePricing information to clients, and use it to display coin-denominated... See merge request veloren/veloren!1991	2021-03-26 00:17:39 +00:00
Louis Pearson	0a294bcf56	Use older version of Store and introduce Depot ... Removal of items in Store can cause get to fail. It has been reverted to an older version that did not support removal. The newer version is now called Depot and changed so that None is returned if the item does not exist instead of crashing.	2021-03-25 07:41:53 -06:00
Avi Weinstock	8d90548331	Get SitePricing information to clients, and use it to display coin-denominated prices in voxygen on tooltips during a trade. Also boost merchant spawn rate slightly.	2021-03-25 02:11:58 -04:00
Marcel	28952f6d7b	Merge branch 'aweinstock/agent-retargetting' into 'master' ... In `agent::Sys`, perform target selection periodically to avoid agents going... See merge request veloren/veloren!1985	2021-03-24 22:22:04 +00:00
Christof Petig	aa6a75808f	adapt unit test	2021-03-24 07:37:46 +01:00
Christof Petig	acba98366a	loop over slots_mut instead of using an index	2021-03-24 07:37:46 +01:00
Christof Petig	a83a74d216	replace an unwrap by returning an Option	2021-03-24 07:37:45 +01:00
Avi Weinstock	ebc8e945d4	In agent::Sys, perform target selection periodically to avoid agents going after their target too singlemindedly.	2021-03-23 23:00:05 -04:00
Joshua Barretto	21b20ea75e	Merge branch 'aweinstock/enable-rtsim-airships' into 'master' ... Enable RtSim Airships. See merge request veloren/veloren!1973	2021-03-23 14:29:43 +00:00
Avi Weinstock	75f1b0f5e0	Remove level from create_ship and CreateShip.	2021-03-23 10:44:42 +01:00
Avi Weinstock	deb9358c3a	Add ServerEvent::CreateShip, and use it instead of CreateNpc for RtSim airships.	2021-03-23 10:44:37 +01:00
Avi Weinstock	49f39fb752	Make more systems work with an optional health component, to allow disabling health on rtsim airships (so that players can't hammer them out of the sky).	2021-03-23 10:44:32 +01:00
Sam	356bb5baee	If roll input remains held, allows you to keep rolling and stay in roll state. ... You can now jump to interrupt the recovery portion of roll. Jumping out of roll slightly increases jump strength.	2021-03-22 18:47:13 -04:00
Marcel Märtens	6b23101fac	update toolchain to nightly-2021-03-22	2021-03-22 16:41:04 +01:00
Samuel Keiffer	4356f67bed	Merge branch 'loot-tables' into 'master' ... Loot tables See merge request veloren/veloren!1968	2021-03-22 09:39:35 +00:00
Samuel Keiffer	f65cd1e771	Loot tables	2021-03-22 09:39:35 +00:00
Justin Shipsey	f57af6f776	Merge branch 'slipped/animtweaks' into 'master' ... airship movement bits See merge request veloren/veloren!1967	2021-03-22 08:49:04 +00:00
Samuel Keiffer	1374900928	Merge branch 'sam/combat-fixes' into 'master' ... Fixes gaining combo by shooting loot bag See merge request veloren/veloren!1953	2021-03-22 02:01:22 +00:00
jshipsey	31747d8ff1	airship movement bits	2021-03-21 21:43:49 -04:00
Joshua Barretto	7ae4230dc8	Merge branch 'zesterer/pick' into 'master' ... Pickaxe See merge request veloren/veloren!1959	2021-03-22 00:19:42 +00:00
Joshua Barretto	6ea5aa796b	Faster pick, less vibrant block selection	2021-03-21 20:38:08 +00:00
Joshua Barretto	fb3980e273	Outcome for block destruction, take select_pos from ControllerInputs	2021-03-21 20:10:05 +00:00
Joshua Barretto	003e76113f	Fetch InputAttr from controller	2021-03-21 19:11:44 +00:00
Marcel	983523c463	Merge branch 'vfoulon80/climbing-skill' into 'master' ... Add climbing speed and cost See merge request veloren/veloren!1950	2021-03-21 18:35:44 +00:00
Marcel Märtens	a77578a25b	harden slowjob code	2021-03-21 18:45:23 +01:00
Joshua Barretto	b45df7fe10	Switched to BasicMelee	2021-03-21 17:45:01 +00:00
Joshua Barretto	347e1022a0	Initial implementation of pickaxe	2021-03-21 16:09:16 +00:00
Vincent Foulon	e06870702f	Add skill for swimming speed	2021-03-21 15:58:38 +01:00
Vincent Foulon	9e11a574d2	remove CharacterAbility::Climb	2021-03-21 00:35:34 +01:00
Vincent Foulon	d0df01fe51	move climbing skill adjustment into climb module	2021-03-21 00:22:04 +01:00
Vincent Foulon	8b01abde67	address comments	2021-03-20 22:56:54 +01:00
Sam	d7090315ff	Increased combo duration by 50%	2021-03-20 16:44:18 -04:00
Sam	92c9e8c477	Fixed gaining combo by shooting loot bags	2021-03-20 16:26:10 -04:00
Vincent Foulon	d0aa68a9d2	Add climbing speed and cost	2021-03-20 17:17:28 +01:00
Snowram	e5afb2fcf7	Various visual fixes	2021-03-18 22:53:06 +01:00
Marcel	a6cae66a54	Merge branch 'sam/fix-dash' into 'master' ... Fixed dash See merge request veloren/veloren!1933	2021-03-18 03:09:46 +00:00
Sam	5384e5a01e	Fixed dash	2021-03-17 20:13:12 -04:00
DaforLynx	fbf4defa04	Adds sfx for Sceptre aura	2021-03-17 23:54:49 +00:00
Marcel Märtens	49e5fe96df	add a check that at least 1 thread works for slowJobPool and for every configuration	2021-03-17 14:36:58 +01:00
Marcel Märtens	529eae2e9d	slowjob: allow at least 1 job of every type	2021-03-17 08:26:43 +01:00
Monty Marz	e9cbac387e	new loading bg, staff models ... item images fix paths loot tables, adjustments Update main.ron	2021-03-16 23:23:24 +00:00
Avi Weinstock	4d6fb0584a	Fix mounting by making deferred {pos,vel} writes optional in physics.	2021-03-16 14:04:28 -04:00
Marcel Märtens	a286eb084a	create a wrapper around rayon, slowjobpool, that spawns on rayon but drop feed it	2021-03-16 13:31:04 +01:00
Marcel Märtens	0ec863b236	further experiments via a special Group	2021-03-16 09:59:05 +01:00
Marcel Märtens	8b6b463177	experiment with a slowjob that can return data	2021-03-16 09:58:58 +01:00
Imbris	f2ff5c9655	Instrument all par joins, defer ubiquitous pos/vel writes with a component instead of using vecs	2021-03-16 03:50:45 -04:00
James Melkonian	6ea43cfd75	Various RtSim and Agent Interaction Fixes	2021-03-16 01:30:35 +00:00
Avi Weinstock	41342deab6	Cargo fmt after rebasing.	2021-03-14 23:23:03 -04:00
Avi Weinstock	9304ecab3d	Address Imbris's MR 1888 comments, and add changelog entry. ... - Use Ori::{new,to_quat} and make the field private. - Update/capitalize/add various comments. - Implicitly drop scope guards where applicable. - Take !Copy colliders by reference instead of cloning. - s/cylinder_voxel_collision/box_voxel_collision/ - Unindent some physics code with a continue.	2021-03-14 23:21:46 -04:00
Joshua Barretto	1e9ee3d243	Improved climbing, block-hopping on airships	2021-03-14 23:21:45 -04:00
Avi Weinstock	546ee48073	Fix interpolation for possession, and make the mount point of airships above their deck.	2021-03-14 23:21:45 -04:00
Joshua Barretto	6add95bd5c	Fixed block-snapping, climbing and airship takeoff	2021-03-14 23:21:44 -04:00
Joshua Barretto	29b93d791b	Made level flight work	2021-03-14 23:20:48 -04:00
Avi Weinstock	dad0012973	Get linear interpolation working for {Pos,Vel,Ori} with client-side timestamps.	2021-03-14 23:20:48 -04:00
Joshua Barretto	f6c6319952	Made entities rotate smoothly with airships, fixed rotation speeds	2021-03-14 23:20:47 -04:00
Joshua Barretto	e232a2e473	Fixed jumping inconsistencies, no block-snapping for ships	2021-03-14 23:20:46 -04:00
Joshua Barretto	8247c136bc	Prevented jumping airships	2021-03-14 23:17:29 -04:00
Joshua Barretto	1af86ef2f8	Removed unnecessary matrix mul	2021-03-14 23:17:29 -04:00
Joshua Barretto	44f9932450	Properly propagate velocity steps during airship collision to avoid falling through airships	2021-03-14 23:17:28 -04:00
Joshua Barretto	6d8ba31e5b	Reduced air resistance for better-behaving airships	2021-03-14 23:17:28 -04:00
Avi Weinstock	a32be4ac5a	Address MR 1888 review comments. ... - Delete obsolete symbolic links. - Add suggested comments. - Remove dead code.	2021-03-14 23:17:28 -04:00
Avi Weinstock	aa56166c80	Fix fmt and clippy, and rename {psdr,psdw} to {read,write} in physics.	2021-03-14 23:17:26 -04:00
Joshua Barretto	3496c356e2	More relative motion changes	2021-03-14 23:14:26 -04:00
Avi Weinstock	5ff72a4a2e	/airship angle command and RtSim airships.	2021-03-14 23:14:26 -04:00
Joshua Barretto	e59b68c262	Mountable airships	2021-03-14 23:14:25 -04:00
Joshua Barretto	f4b3d8145b	Smooth airship movement	2021-03-14 23:14:21 -04:00
Joshua Barretto	afd99788b2	Made animations and friction ground-relative	2021-03-14 23:09:52 -04:00
Joshua Barretto	e1e6403c63	Fixed airship collisions under rotation, added position increment for velocity when on ground	2021-03-14 23:09:52 -04:00
Avi Weinstock	e9aab63a04	Account for model translation in the physics. The voxel collider still needs to be north-aligned for now.	2021-03-14 23:09:52 -04:00
James Melkonian	6ff054099f	Allow spawned airships to move	2021-03-14 23:09:52 -04:00
Avi Weinstock	5d85775dcf	Airship progress: now possessable, and physics kind of works (desyncs from the visuals by a shift + scale, and rotation isn't done at all yet, but the contours are correct).	2021-03-14 23:09:51 -04:00
Avi Weinstock	8b9e84972a	Draft of airships (spawn command, visuals, some physics refactoring, no collision yet).	2021-03-14 23:09:49 -04:00
Marcel	5570b57282	Merge branch 'sam/yeet-inputs' into 'master' ... Reworked Controller Inputs to use Control Actions See merge request veloren/veloren!1900	2021-03-15 01:32:02 +00:00
Sam	ecff675cc4	Wielding now works again ... Rolling now resumes combo states correctly again Cleanup	2021-03-14 17:26:55 -04:00
Sam	ac6e192db4	Completely purged old method of inputs	2021-03-14 17:26:55 -04:00
Sam	be27289a7f	Inputs remain in queue while active, allowing interrupts and queued inputs to be more cleanly handled	2021-03-14 17:26:54 -04:00
Sam	b5d501199d	Secondary input now fully functional	2021-03-14 17:26:53 -04:00
Sam	21e6f4797c	Primary ability fully functional.	2021-03-14 17:26:53 -04:00
Sam	19c81f1528	Support for canceling an input. Boost state hooked up to system.	2021-03-14 17:26:52 -04:00
Sam	c6d8daaae3	Primary input now activated from control actions. ... Moved a lot of key_state to a HashSet so that it is handled automatically.	2021-03-14 17:26:51 -04:00
Snowram	60dd47cdea	Theropod charge attack	2021-03-14 18:10:40 +01:00
Snowram	9d7e8957bb	Add new npcs	2021-03-14 14:24:35 +01:00
Christof Petig	15b11d9154	Implement /price_list (work in progress), stub for /buy and /sell ... remove outdated economic simulation code remove old values, document add natural resources to economy Remove NaturalResources from Place (now in Economy) find closest site to each chunk implement natural resources (the distance scale is wrong) cargo fmt working distance calculation this collection of natural resources seem to make sense, too much Wheat though use natural resources and controlled area to replenish goods increase the amount of chunks controlled by one guard to 50 add new professions and goods to the list implement multiple products per worker remove the old code and rename the new code to the previous name correctly determine which goods guards will give you access to correctly estimate the amount of natural resources controlled adapt to new server API instrument tooltips Now I just need to figure out how to store a (reference to) a closure closures for tooltip content generation pass site/cave id to the client Add economic information to the client structure (not yet exchanged with the server) Send SiteId to the client, prepare messages for economy request Make client::sites a HashMap Specialize the Crafter into Brewer,Bladesmith and Blacksmith working server request for economic info from within tooltip fully operational economic tooltips I need to fix the id clash between caves and towns though fix overlapping ids between caves and sites display stock amount correctly handle invalid (cave) ids in the request some initial balancing, turn off most info logging less intrusive way of implementing the dynamic tool tips in map further tooltip cleanup further cleanup, dynamic tooltip not fully working as intended correctly working tooltip visibility logic cleanup, display labor value separate economy info request in a separate translation unit display values as well nicer display format for economy add last_exports and coin to the new economy do not allocate natural resources to Dungeons (making town so much larger) balancing attempt print town size statistics cargo fmt (dead code) resource tweaks, csv debugging output a more interesting town (and then all sites) fix the labor value logic (now we have meaningful prices) load professions from ron (WIP) use assets manager in economy loading professions works use professions from ron file fix Labor debug logic count chunks per type separately (preparing for better resource control) better structured resource data traders, more professions (WIP) fix exception when starting the simulation fix replenish function TODO: - use area_ratio for resource usage (chunks should be added to stock, ratio on usage?) - fix trading documentation clean up fix merge artifact Revise trader mechanic start Coin with a reasonable default remove the outdated economy code preserve documentation from removed old structure output neighboring sites (preparation) pass list of neighbors to economy add trade structures trading stub Description of purpose by zesterer on Discord remember prices (needed for planning) avoid growing the order vector unboundedly into_iter doesn't clear the Vec, so clear it manually use drain to process Vecs, avoid clone fix the test server implement a test stub (I need to get it faster than 30 seconds to be more useful) enable info output in test debug missing and extra goods use the same logging extension as water, activate feature update dependencies determine good prices, good exchange goods a working set of revisions a cozy world which economy tests in 2s first order planning version fun with package version buy according to value/priority, not missing amount introduce min price constant, fix order priority in depth debugging with a correct sign the trading plans start to make sense move the trade planning to a separate function rename new function reorganize code into subroutines (much cleaner) each trading step now has its own function cut down the number of debugging output introduce RoadSecurity and Transportation transport capacity bookkeeping only plan to pay with valuable goods, you can no longer stockpile unused options (which interestingly shows a huge impact, to be investigated) Coin is now listed as a payment (although not used) proper transportation estimation (although 0) remove more left overs uncovered by viewing the code in a merge request use the old default values, handle non-pileable stocks directly before increasing it (as economy is based on last year's products) don't order the missing good multiple times also it uses coin to buy things! fix warnings and use the transportation from stock again cargo fmt prepare evaluation of trade don't count transportation multiple times fix merge artifact operational trade planning trade itself is still misleading make clippy happy clean up correct labor ratio of merchants (no need to multiply with amount produced) incomplete merchant labor_value computation correct last commit make economy of scale more explicit make clippy happy (and code cleaner) more merchant tweaks (more pop=better) beginning of real trading code revert the update of dependencies remove stale comments/unused code trading implementation complete (but untested) something is still strange ... fix sign in trading another sign fix some bugfixes and plenty of debugging code another bug fixed, more to go fix another invariant (rounding will lead to very small negative value) introduce Terrain and Territory fix merge mistakes	2021-03-14 03:18:32 +00:00
Imbris	0127832172	Fix tracy not working in certain areas, add span to chunk gen, missing fmt, remove extra span, make voxygen use INFO level instead of TRACE in tracy mode	2021-03-13 13:30:20 -05:00
Imbris	2511b8959c	Add tracy entity count plot, span tweaks	2021-03-13 02:59:58 -05:00
Imbris	8d0b776f18	Move server-cli commands to separate file, tracy profiling par_join improvements, misc improvements ... - remove overwritten logging setting in server-cli - add server-cli command to load a random area for testing without a client - make admin add/remove commands modify ingame players instead of needing to reconnect - add spans to par_join jobs - added test command that loads up an area of the world - add tracy-world-server alias - set debug directives to info for logging	2021-03-13 02:28:59 -05:00
jshipsey	49f496e290	intitial values	2021-03-12 00:58:12 -05:00
Joshua Barretto	f479231b15	Merge branch 'glowy-shiny-pretty' into 'master' ... Glowy shiny pretty See merge request veloren/veloren!1874	2021-03-11 17:37:33 +00:00
Joshua Barretto	6e0807f3f5	Cheaper and less broken material reflection/glow	2021-03-11 13:56:11 +00:00
Joshua Barretto	09e32cb952	Initial implementation of glow/shininess	2021-03-10 18:58:25 +00:00
Sam	de5ef03ac4	Auras will now refresh buffs if a buff was already present that had a lesser duration. ... Attack effects can now have multiple requirements. Fix for sceptre heal not requiring energy. Nerfed warding aura protection. Added icon for warding aura. Changelog.	2021-03-09 18:03:06 -05:00
Sam	16222948a3	Sceptre skill tree and migration.	2021-03-09 18:02:07 -05:00
Sam	c13e84aff5	Aura duration separated from cast duration in aura state ... Healing beam now requires combo > 0 to enter character state Removed last vestiges of old sceptre abilities Combo extended to most other attacks Cast aura state renamed to basic aura	2021-03-09 18:02:00 -05:00
Sam	940b4b5de7	Combo counter now uses outcomes.	2021-03-09 17:59:42 -05:00
Sam	398370ca51	Changed lifesteal beam particles to look better. ... Warding aura now just provides damage reduction instead of invulnerability. Also with a longer duration and less movespeed penalty.	2021-03-09 17:59:41 -05:00
Sam	b6f4543a14	Fixed beam offsets, told healing beam to use beam animation.	2021-03-09 17:59:40 -05:00
Sam	c6a222340e	Particles for lifesteal beam. Changed how frontend recognized beams.	2021-03-09 17:59:39 -05:00
Sam	18edc1092b	Basic beam now generates combo. Healing beam now consumes combo, and requires combo to heal.	2021-03-09 17:59:33 -05:00
Sam	43874a4aa5	Added healing beam character state. ... This was done as there was a lot of special casing in basic beam to account for healing.	2021-03-09 17:58:20 -05:00
Sam	a1bbc136fc	New abilities for sceptre are done	2021-03-09 17:56:38 -05:00
Marcel	d229ab1eb9	Merge branch 'aweinstock/critical-stats' into 'master' ... Add critical chance and critical multiplier stats to weapons. See merge request veloren/veloren!1864	2021-03-09 10:55:36 +00:00
Avi Weinstock	d8f0a1c426	Add critical chance and critical multiplier stats to weapons.	2021-03-08 23:27:25 -05:00
Marcel Märtens	4ebfbdde0f	Move Specs code to own common_ecs create, put tracy and macros into common_base	2021-03-09 00:54:01 +01:00
Marcel Märtens	f353f14703	change Name from VSystem to System	2021-03-08 13:15:00 +01:00
Marcel Märtens	6b88545481	restructure server metrics ... - get rid of old SysTimers for each system in favour of VSystem tracking - move metrics generation from lib.rs to own system - code cleanup - remove time tracking in common::sys	2021-03-08 11:51:13 +01:00
Marcel Märtens	c515fece28	Implement a VSystem trait that can be implemented by Systems. ... It will autodo some things, like track start and time and export those in system metrics Add a origin and implement it for all Systems in Veloren	2021-03-08 11:51:04 +01:00
Marcel	e29964ead1	Merge branch 'sarrakitty/fireworks' into 'master' ... added a white firework See merge request veloren/veloren!1856	2021-03-07 18:37:35 +00:00
Joshua Barretto	911acdd9db	Fixed clippy warnings and fmt	2021-03-07 14:25:07 +00:00
Joshua Barretto	862cd5fe49	fmt	2021-03-07 14:25:03 +00:00
Joshua Barretto	a229d65932	Static light improvements, fixed lighting update bug	2021-03-07 14:25:02 +00:00
Joshua Barretto	9875e2c025	Began work on CSG-based primitive tree site structure generation system	2021-03-07 14:25:02 +00:00
Joshua Barretto	7d94c3600f	New town layouts, initial progress	2021-03-07 14:25:02 +00:00
Joshua Barretto	6274987fa6	Fixed snow blocking all light	2021-03-07 14:25:01 +00:00
Joshua Barretto	620e2000d2	Experimental cliffs, use column alt for world map	2021-03-07 14:25:01 +00:00
Joshua Barretto	717bbbf23e	Better static light propagation between translucent objects	2021-03-07 14:25:01 +00:00
Joshua Barretto	6af0e77efd	Better stairs	2021-03-07 14:25:01 +00:00
Joshua Barretto	0c302bb020	Lanterns in trees	2021-03-07 14:25:01 +00:00
Joshua Barretto	6fc7d2a906	Faster More interesting giant trees, better oaks, hives on branches	2021-03-07 14:25:01 +00:00
Joshua Barretto	185b1c3053	Specialised giant trees	2021-03-07 14:25:01 +00:00
Joshua Barretto	7d526da735	Experimental giant mother trees	2021-03-07 14:25:01 +00:00
Joshua Barretto	e30c625d81	More tree variety, denser forests	2021-03-07 14:25:01 +00:00
Joshua Barretto	68b0aa5c50	sync	2021-03-07 14:25:00 +00:00
Joshua Barretto	9cf13ac3b2	Simple coral	2021-03-07 14:25:00 +00:00
Joshua Barretto	6dd0f73c2d	Fixed clipping issues, faster generation	2021-03-07 14:25:00 +00:00
Joshua Barretto	23f0dfb078	Began work on new sites	2021-03-07 14:25:00 +00:00
Sarra	ab12df50cc	added white firework	2021-03-07 03:59:04 -05:00
Sarra	db3bc1b9bb	added a white firework	2021-03-07 03:48:50 -05:00
Avi Weinstock	22fcc6417c	Make fireworks recursively shoot more fireworks (95% average replication).	2021-03-06 14:05:51 -05:00
Sam	39a580b5ee	Added test that all items are properly formatted and valid. Fixed items that were broken.	2021-03-03 16:45:36 -05:00
James Melkonian	018d51b1a0	Move agent data into structs	2021-03-02 15:51:43 -08:00
James Melkonian	0c25896b2c	Fix fleeing and combat a little	2021-03-02 15:51:40 -08:00
James Melkonian	29c5ae5af9	Fix interaction and clean up, broken fleeing	2021-03-02 15:51:38 -08:00
James Melkonian	045ec011c9	Behavior tree minus interacting	2021-03-02 15:51:32 -08:00
James Melkonian	8bdadc47b5	Initial behavior tree refactoring	2021-03-02 15:49:58 -08:00
ccgauche	7f4411ba1f	Merge branch 'master' into 'ccgauche/plugin-player-join-event' ... # Conflicts: # CHANGELOG.md	2021-03-02 09:45:15 +00:00
Sam	d02c61ad8a	Item use is now goes through a control action rather than a control event.	2021-03-01 20:51:08 -05:00
Justin Shipsey	9ad8804b60	Merge branch 'armor-org' into 'master' ... armor org See merge request veloren/veloren!1835	2021-03-02 01:29:46 +00:00
Ben Wallis	0f7ff21c20	Merge branch 'item-stacking-and-splitting' into 'master' ... Implement stacking and splitting Closes #904 See merge request veloren/veloren!1802	2021-03-02 00:08:47 +00:00
Jesus Bracho	c0573cca44	Implement stacking and splitting	2021-03-02 00:08:46 +00:00
heydabop	bfc82f7236	Fixes #974 - convert tool/weapon equip time to floating point seconds	2021-03-01 15:06:39 -06:00
ccgauche	dbd4d70b79	Lots of improvement in pointer management (switched from i32 to u64) + New event implemented	2021-03-01 19:00:44 +01:00
Sam	f304fe0f10	Fix a few asset paths for armors.	2021-03-01 00:58:43 -05:00
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
Sam	7e34f1225f	Migration for armor re-organization.	2021-03-01 00:42:35 -05:00
jshipsey	8944115f8e	more asset organization	2021-02-28 22:18:43 -05: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	d09baadab2	Added command: '/safezone'	2021-02-28 18:14:59 -05:00
Sam	a88ad7b971	Added invulnerability debuff. Currently tied to campfire spawned with '/campfire' command.	2021-02-28 15:02:03 -05: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
Sam	d818ea2f1d	Fixes being stuck in roll when interrupting combo melee.	2021-02-28 08:50:33 -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
Joshua Barretto	b9b36e0bf5	Merge branch 'zesterer-master-patch-28400' into 'master' ... Fix jump routes not being pathed See merge request veloren/veloren!1706	2021-02-28 00:41:38 +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
Joshua Barretto	6051c06462	fmt	2021-02-27 23:21:01 +00:00
Sam	f24433c8cf	Added combo component	2021-02-27 14:55:06 -05:00
Sam	238fcaf5f1	Particle rebase fixes	2021-02-27 01:42:47 -05:00
jshipsey	8d316aac8c	feedback adjustments	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
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
jshipsey	cb59c8017e	anim tweaks, more loadout setup	2021-02-27 01:42:46 -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	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
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	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	a99a78abdb	Merge branch 'sam/improve-aura-buffs' into 'master' ... Auras now apply a buff only once, instead of applying a buff every second. See merge request veloren/veloren!1824	2021-02-27 03:21:47 +00:00
Snowram	1172c2f2c3	Merge branch 'Sarrakitty/OceanFlora' into 'master' ... added coral reefs, kelp forests, and seagrass See merge request veloren/veloren!1819	2021-02-27 01:52:33 +00:00
Sam	64a809ee5b	Made comments more descriptive	2021-02-26 18:15:24 -05:00
Sam	45dd36be07	Auras now apply a buff only once, instead of applying a buff every second. ... Also supports for buffs persisting a period of time after leaving the aura. Campfire regen slightly buffed.	2021-02-26 17:57:01 -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
Sarra	f39f5ab5d3	added coral reefs, kelp forests, and seagrass	2021-02-25 05:33:18 -05:00
Sam	ee5c9d78ca	Swords	2021-02-24 18:54:06 -05: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
Imbris	da3edf54fb	Merge branch 'ccgauche/plugin-retreive' into 'master' ... ccgauche/plugin retreive See merge request veloren/veloren!1788	2021-02-23 16:36:05 +00:00
ccgauche	74ec5c652a	Added safety section to the EcsAccessManager	2021-02-23 13:58:07 +01:00
Marcel	2fbd382c91	Merge branch 'xMAC94x/physics_followup' into 'master' ... physics followup, fix arrow problems See merge request veloren/veloren!1811	2021-02-23 02:00:40 +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
Marcel	6081ebbe15	Merge branch 'sam/ecs-sys-struct' into 'master' ... Sam/ecs sys struct See merge request veloren/veloren!1813	2021-02-23 00:08:09 +00:00
ccgauche	387daf8aea	Change invalid message in examples and cleanup ... Updated changelog + Removed hello plugin from plugins folder	2021-02-23 00:02:58 +01:00
ccgauche	267e7d8b4c	Finalized Retrieve API	2021-02-22 23:59:41 +01:00
ccgauche	06aa7ab70c	Retrieves added + New ECS memory layout for plugins	2021-02-22 23:59:32 +01:00
Marcel Märtens	6008109413	physics followup, fix arrow problems by adding the vel_dt to the collision boundry	2021-02-22 23:51:01 +01:00
Sam	2b5120319d	Character behavior system now uses immutable data struct	2021-02-22 15:30:53 -05:00
Vincent Glize	4f37c626ea	Optimize Entity <> Entity collision check by calculating a entity via sphere.	2021-02-22 12:36:42 +01:00
Justin Shipsey	1f88b87ca4	fix glider crash	2021-02-22 06:31:12 +00:00
Joshua Barretto	e2290783fc	Merge branch 'humanoid_ai_glide_when_falling' into 'master' ... FIX #956: Humanoid ai glide when falling See merge request veloren/veloren!1772	2021-02-22 00:57:25 +00:00
Overblob	370259fe54	CI - Fix clippy errors ... Fix trailing whitspace	2021-02-22 00:57:25 +00:00
Snowram	4078eeb877	Various fixes to object animation, cleanup	2021-02-21 19:56:46 +01:00
Snowram	f25b2b1500	Various fixes to beam, body based interp	2021-02-21 19:17:56 +01:00
Sam	11050a05ce	Beam particles now determined from beam segment rather than character state.	2021-02-21 19:17:56 +01:00
Snowram	e7bbf3981d	Object animation	2021-02-21 19:17:44 +01:00
Snowram	775224983b	Initial turret implementation	2021-02-21 18:23:54 +01:00
Samuel Keiffer	3cb6a5592d	Merge branch 'aweinstock/speed-floor-quickfix' into 'master' ... Change the speed floor to `0.1` (avoiding a division by zero in modular... See merge request veloren/veloren!1804	2021-02-21 02:49:57 +00:00
Avi Weinstock	3606490308	Change the speed floor to 0.1 (avoiding a division by zero in modular weapons accidentally buffed the Twitching Root).	2021-02-20 19:19:26 -05:00
Sam	f24490dc80	Added functionality for buffs queueing. Saturation now queues.	2021-02-20 17:13:17 -05:00
Avi Weinstock	c489d095df	Implement persistence for modular weapons. ... This stores the components as children of the item that contains them via the DB's `parent_container_item_id` feature, and ensures that things are loaded in a good order with breadth-first search. Squahed fixes: - Fix some constraint violations that occurred when swapping inventory items. - Comment out recipes for modular weapons. - Make update_item_at_slot_using_persistence_key and is_modular more idiomatic. - Add changelog entry. - Document `defer_foreign_keys` usage.	2021-02-20 14:31:46 -05:00
Avi Weinstock	8bdbf4f7c9	Implement modular weapons. ... - Add ItemKind::ModularComponent, Item::components. - Add tool::StatKind::{Direct,Modular} for the modular weapons themselves. - Move ItemConfig from ItemDesc to Item, so components' stats can be taken into account. - Crafting stores into the components field. - Components/recipes/placeholders are created dynamically. - Show which components a modular weapon contains in the tooltip in voxygen. Squashed fixes: - `Item::duplicate` components in `Item::new_from_item_def`. - Speed of 1.0 for now.	2021-02-20 14:30:39 -05:00
Snowram	f78170704a	Allows some species to be immune to specific buffs	2021-02-20 14:03:15 +00:00
Samuel Keiffer	479cf9fc4e	Merge branch 'sam/dual-wielding' into 'master' ... Dual wielding backend See merge request veloren/veloren!1787	2021-02-20 05:12:17 +00:00
Sam	eaf3e02e39	Addressed comments ... Fixed audio test	2021-02-19 19:55:23 -05:00
Sam	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	18309fe4c6	Added AbilityInfo struct to attack states	2021-02-19 17:30:24 -05:00
Sam	50cbe42b07	Added one-handed axes.	2021-02-19 17:30:23 -05:00
Sam	8f0cca074d	Dual wielding now uses skillbar abilities from multiple weapons.	2021-02-19 17:30:22 -05:00
Sam	6f6a37faf2	Wielding a 1 handed weapon now correctly uses abilities when the second weapon is not also a 1 handed weapon.	2021-02-19 17:30:22 -05:00
Sam	f50fa25467	ItemConfig now stores AbilitySet directly instead of each individual ability.	2021-02-19 17:30:21 -05:00
Sam	fc01e9ea68	Handedness of weapons affects power and speed.	2021-02-19 17:30:21 -05:00
Sam	582c3f8459	Check for prerequisite skill in using an ability is no longer hardcoded.	2021-02-19 17:30:21 -05:00
Sam	341affdae2	Added hands field to all ron files of weapons. ... Removed weapons that were duplicated in weapons and npc_weapons from npc_weapons. Added migration to convert npc_weapons that ended up in anyone's inventory to weapon version. Consolidated debug boost and possess sticks into one debug_stick, and renamed the admin sword (with name cultist_purp_2h_boss-0) to admin_sword	2021-02-19 17:30:20 -05:00
Sam	d4f509b3d0	Added hands field onto weapons.	2021-02-19 17:30:20 -05:00
Avi Weinstock	559ad7b7f5	Client-side trade improvements. ... - Add item tooltips in trade. - More localization support. - Fix bindings (R for trade, B for bag).	2021-02-19 15:20:27 -05:00
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
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
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
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
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
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
Quellus	63952875d9	Rebase !1447 Chat input color and icon reflect channel message is sent to.	2021-02-10 19:42:59 +00:00
Ludvig Böklin	74badd3dbd	Add note about to_quat() being a cheap copy operation	2021-02-10 17:35:20 +01:00
Snowram	477bdfdfe7	Adresses some comments, various visual tweaks	2021-02-10 00:30:23 +01:00
Snowram	02f446fe4b	Adds lights to dungeons	2021-02-10 00:30:23 +01:00
Ludvig Böklin	990198cd87	Don't test Dir->Ori correctness because it will fail from floating point errors	2021-02-09 15:44:12 +01:00
Ludvig Böklin	065e260e78	Code quality	2021-02-09 14:06:27 +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
Sam	398fcf7bdd	Changing main tool while in wield state moves character back to idle state.	2021-02-08 17:25:40 -05:00
Sam	e033fe6bee	Inventory manipulations are now only for input from the client, and are no longer directly sent as a server event. Slot manipulations do that instead.	2021-02-08 13:55:50 -05:00
Sam	1c83c5ee6f	Loadout manipulations now emit a separate event from client instead of hackily intercepting inventory manipulations in common.	2021-02-08 12:31:17 -05:00
Sam	f026aeb2dc	Server events directly emitted in states now.	2021-02-08 12:01:48 -05:00
Sam	6a1e583d45	Eradicated clones	2021-02-08 12:01:48 -05:00
Sam	9f2255a5de	Extended what states inventory manipulations touching the loadout could affect.	2021-02-08 12:01:47 -05:00
Sam	8eebcdfcd2	Inventory changes that modify the loadout now go through a control action instead of a control event.	2021-02-08 12:01:47 -05:00
Ludvig Böklin	46750880eb	Add Plane type, Projection trait, fix upright() and add doc tests	2021-02-07 17:16:15 +01:00
Samuel Keiffer	909ed80e9e	Merge branch 'sam/fix-roll' into 'master' ... Fixes roll being free See merge request veloren/veloren!1757	2021-02-06 22:15:06 +00:00
Sam	252e421692	Roll is no longer free.	2021-02-06 15:20:08 -05:00
Phillipp Mevenkamp	f5e1d446ad	Replace magic dr constant	2021-02-06 18:21:58 +01: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
Sam	be8df9aef6	Addressed comments.	2021-02-02 16:08:09 -05:00
Sam	80954f3ba4	Made attacker entity and uid optional to remove potential for attacks to not be applied and some unwraps.	2021-02-02 13:07:07 -05:00
Sam	af982ec0bb	Changed knockback to be an effect on the overall attack, rather than a damage.	2021-02-02 13:07:07 -05:00
Sam	17d1432be0	Outcomes now correctly read if an attack had any healing components.	2021-02-02 13:07:06 -05:00
Sam	5eec915c2e	Added support for damage falloff with explosions.	2021-02-02 13:07:06 -05:00
Sam	5c16b0b532	Explosions now use attacks.	2021-02-02 13:07:06 -05:00
Sam	7675e53740	Shockwaves now use attacks.	2021-02-02 13:07:05 -05:00
Sam	e5caef8a54	Effects on attacks can now require energy.	2021-02-02 13:07:05 -05:00
Sam	2b11ae6569	Attacks can now heal.	2021-02-02 13:07:04 -05:00
Sam	edcfcc31f6	Attacks can now deal poise damage.	2021-02-02 13:07:04 -05:00
Sam	fcd89a5d41	Lifesteal now functional on Attack.	2021-02-02 13:07:03 -05:00
Sam	fdef168e82	Beams now use Attack, with limited functionality in some cases.	2021-02-02 13:07:03 -05:00
Sam	59ce8c6843	Projectiles now use attacks.	2021-02-02 13:06:57 -05:00
Sam	46dbb8aef4	Attack effects can now have requirements.	2021-02-02 13:06:34 -05:00
Sam	c77f263cd1	Effects now work when not tied to a damage.	2021-02-02 13:06:34 -05:00
Sam	18aa315f0d	Rolling now dodges melee attacks again.	2021-02-02 13:06:34 -05:00
Sam	78879d5189	Attacks can now inflict de/buffs.	2021-02-02 13:06:33 -05:00
Sam	6d509932db	Attacks can now reward energy.	2021-02-02 13:06:33 -05:00
Sam	c3408c084c	Critical hits are now functional.	2021-02-02 13:06:32 -05:00
Sam	2690e9caa1	Applied basic functionality of attack-effects system to melee.	2021-02-02 13:06:32 -05:00
Sam	d3b75df76f	Changed name of Attacking comp to MeleeAttack	2021-02-02 13:06:31 -05:00
Sam	bb019309ea	Attack builder implemented.	2021-02-02 13:06:31 -05:00
Sam	78a2459e6d	Changed knockback from an enum to a struct.	2021-02-02 13:06:30 -05:00
Pascal Fuhrmann	f4deb08a40	fixing #944 - LeapMelee fall damage fix & adjustments	2021-02-02 16:51:04 +00:00
James Melkonian	23b1df3cdd	Add basic NPC interaction and fix NPC chat spamming	2021-01-31 20:29:50 +00:00
jiminycrick	ea13f75427	Quick poise fix	2021-01-29 15:52:40 -08: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	46c8c744fa	Add migration for starter gear	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	0f244bf84b	Made stunned state invulnerable to poise damage ... Fixing silly error for comp creation	2021-01-28 17:22:35 -08:00
jiminycrick	dd69b5f2bc	Poise stats	2021-01-28 17:22:35 -08:00
jiminycrick	af076aa87f	Add knockback to poise	2021-01-28 17:22:35 -08:00
jiminycrick	e3965ae0ab	Very basic functioning stun	2021-01-28 17:22:35 -08:00
jiminycrick	c83296a4ec	Initial broken implementation of poise ... Character movement no longer broken.	2021-01-28 17:22:33 -08:00
jiminycrick	8b97199245	Update rand dependency	2021-01-26 20:35:08 -08:00
Sam	680a4e4dde	Fixed base energy being 0.	2021-01-26 21:25:00 -05: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
Sam	9b7edcf32f	Changed how beams determined the energy regen and energy cost.	2021-01-24 23:47:10 -05:00
Snowram	ad6cdcab71	Merge branch 'swilliams/gems' into 'master' ... Adds 6 different gems and removes shiny gem. See merge request veloren/veloren!1729	2021-01-25 01:25:40 +00:00
Samuel Keiffer	0343b57b2b	Merge branch 'lboklin/glider-stamina' into 'master' ... Glider stamina cost now only when first starting to glide based on fall speed See merge request veloren/veloren!1727	2021-01-25 00:17:32 +00:00
Samuel Keiffer	c349afc9e9	Merge branch 'sam/speed-beam' into 'master' ... Fixed how the speed stat was applied to beams. See merge request veloren/veloren!1732	2021-01-24 23:23:53 +00:00
Sam	a83baa8243	Fixed how the speed stat was applied to beams.	2021-01-24 16:01:38 -05:00
Sam	6dd740feaa	Nerfed bow M1 and M2, slightly buffed bow skillbar ability.	2021-01-24 14:24:59 -05: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
Scott Williams	32bbdffc38	Added 6 gems, removed shiny gem from cave, replaced with diamond.	2021-01-24 14:00:49 +00:00
Ludvig Böklin	f42869f6ec	Glider deploy stamina cost value tweak	2021-01-24 12:06:23 +01:00
Ludvig Böklin	30168e375f	Glider stamina only costs on deploy	2021-01-24 10:56:35 +01:00
Samuel Keiffer	bdbed58b09	Merge branch 'swilliams/hitbox-adjustments' into 'master' ... General NPC Hitbox Adjustments See merge request veloren/veloren!1723	2021-01-24 04:00:57 +00:00
Scott Williams	c7baf1fd86	General NPC Hitbox Adjustments	2021-01-24 04:00:57 +00:00
Samuel Keiffer	3866bc73a4	Merge branch 'lboklin/glider-stamina' into 'master' ... Fix glider stamina drain See merge request veloren/veloren!1718	2021-01-23 23:21:22 +00: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
Ludvig Böklin	5eefa86d68	Fix glider stamina drain	2021-01-23 18:20:43 +01: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
Samuel Keiffer	97f0413307	Merge branch 'sam/fix-dash' into 'master' ... Dash now ticks damage based off distance rather than duration. See merge request veloren/veloren!1715	2021-01-23 04:42:56 +00:00
Sam	5e4b6809ca	Sceptre nerfs.	2021-01-22 22:46:18 -05:00
Sam	d6be67e0a0	Dash now ticks damage based off distance rather than duration. Fix for golem no longer being able to melee.	2021-01-22 18:10:47 -05:00
Sam	4014b28d19	Removed body from stats component as there is already a body component.	2021-01-22 16:50:22 -05:00
Scott Williams	2a9c4f6f2e	Swilliams/golem hitbox fix	2021-01-22 16:30:35 +00: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
Sam	b5a3b3442c	Addressed comments.	2021-01-21 17:45:03 -05:00
Sam	d2f3c1dd25	Restores difficulty to mindflayer fight. Made various tweaks to skillset builder functions.	2021-01-21 14:56:24 -05:00
Sam	aaad5e49cc	Changed how it moved golem.	2021-01-20 17:22:24 -05:00
Sam	c888ec0535	Golems are now lactose tolerant.	2021-01-20 11:54:57 -05:00
Joshua Barretto	1223519ea1	Fix jump routes not being pathed	2021-01-20 14:39:01 +00:00
Monty Marz	1eb7f78189	Revert "Added TR translations for deaths by debuffs." ... This reverts commit 0817e45e13.	2021-01-20 11:20:06 +00:00
Sarra Kitty	e7d852835c	Sarrakitty/rotsys item sprites	2021-01-19 18:23:44 +00:00
Samuel Keiffer	b04158c5f9	Merge branch 'sam/combat-skill-trees' into 'master' ... Sam/combat skill trees See merge request veloren/veloren!1680	2021-01-19 14:18:07 +00: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 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	83fdc8806d	Added function to automatically generate a combat rating. Currently, it is used to calculate exp.	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	cb3e44a811	Health can now be scaled for npcs again.	2021-01-19 08:07:40 -05:00
Sam	1d90b64898	Added function to get the max amount of skill points that can be spent in a tree.	2021-01-19 08:07:39 -05:00
Sam	b6d2d48ead	Exp floaters. ... You load in with correct energy and health values now.	2021-01-19 08:07:36 -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	48c98b11cf	General combat skill tree. ... UI for general skill tree	2021-01-19 08:07:20 -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	0ccbdc3b8c	Sceptre skill tree.	2021-01-19 08:07:03 -05:00
Sam	5c7705f874	Staff skill tree.	2021-01-19 08:07:03 -05:00
Sam	662a08defc	Implemented bow skill tree.	2021-01-19 08:07:02 -05:00
Sam	4dfe14c103	Hammer skill tree complete.	2021-01-19 08:07:02 -05:00
Sam	72604e8a4e	Axe skill tree functional.	2021-01-19 08:07:01 -05:00
Sam	cc60ca58be	Added sword skill tree	2021-01-19 08:06:59 -05:00
Sam	0e84ba18c2	Moved skill max level and skill prerequisites into ron files.	2021-01-19 08:06:59 -05:00
Sam	5a23f063a0	Ron file now used for skills belonging to each skill group.	2021-01-19 08:06:58 -05:00
Sam	fa073bceff	Skills can now optionally have levels. Max level prevents adding skill of higher level. Support for skills having a prerequisite of a particular level.	2021-01-19 08:06:57 -05:00
Sam	5d474974b9	Skills can now have prerequisite skills. Skills can now cost different amounts of skill points.	2021-01-19 08:06:57 -05:00
Sam	cbfe064e4f	You now gain skill points after a threshold of xp within a particular skill group. ... Skills can now unlock skill groups. Temp method of using chat to unlock skills.	2021-01-19 08:06:52 -05:00
Jesus Bracho	42679201b0	Set up aura filtering	2021-01-18 22:58:56 +00:00
Sam	63eb71ed5b	Exp is now awarded to specific skill groups. It's automatically split between a general pool and weapon pools based on if you have the weapon in your loadout and if you've unlocked the weapon pools.	2021-01-18 17:54:03 -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
Ben Wallis	d7cbf479e3	Fixed a bug which prevented picking up stackable items with a full inventory	2021-01-08 23:34:35 +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	a4b9230f03	fixed Cargo.lock conflict ... Fixed `crossbeam-queue` being referenced twice in the lockfile	2021-01-07 20:25:12 +00:00
ubruntu	ae366e03c5	Reduced downward fall of birds, Humanoid travelers no longer visit dungeons, birds only travel between dungeons	2021-01-05 01:04:01 +00:00
Benoît du Garreau	8ced0a3810	Fix i18n::list_localizations	2021-01-03 17:48:23 +01:00
unknown	3c1e1c6733	Converts npcs names file to ron	2020-12-23 00:58:25 +01:00
Frinksy	53d5a9373e	fixing #881 ... - Multiple buffs make the UI icons flicker	2020-12-22 15:40:57 +00:00
Justin Shipsey	3466d638fe	Merge branch 'gliding-energy-cost' into 'master' ... Glider mid-air deploy and gliding energy-cost See merge request veloren/veloren!1626	2020-12-18 21:18:32 +00:00
Ludvig Böklin	8f9db19a4a	Glider mid-air deploy and gliding energy-cost	2020-12-18 19:16:06 +01:00
Benoît du Garreau	1ace001fde	Fix debug items	2020-12-18 18:11:48 +01:00
Benoît du Garreau	989683d2d3	Improve world::Index	2020-12-17 12:08:04 +01:00
Benoît du Garreau	1c4e334cd4	Apply suggestion ... - Remove default value for CharacterAbility - Put back accidentally removed comment	2020-12-17 12:06:32 +01:00