4671 Commits

Author	SHA1	Message	Date
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
ccgauche	10e5620642	Moved back register to a system	2021-03-09 21:16:23 +01:00
Marcel Märtens	d7df741671	update dependencies, including removal of some tracy deps as they are get through common/tracy	2021-03-09 20:17:29 +01:00
Marcel	f6028f4ae3	Merge branch 'xMAC94x/metrics_fixes' into 'master' ... get rid of a lazy_static and update agent multithreaded metrics See merge request veloren/veloren!1865	2021-03-09 12:59:00 +00: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
Marcel Märtens	77dea4980c	get rid of a lazy_static and update agent multithreaded metrics	2021-03-09 11:52:57 +01: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
ccgauche	89774980b4	First commit	2021-03-07 22:32:52 +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	db573f6b2d	Turn giant trees into proper sites	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
Marcel	875bdd8d71	Merge branch 'sam/asset-validation-tests' into 'master' ... Added Item Validation Test See merge request veloren/veloren!1849	2021-03-04 15:46:12 +00:00
Joshua Yanovski	2dd7089e52	Bring vek up to date so we can bump rustc (hopefully).	2021-03-04 05:46:59 +01: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
ccgauche	db9991ce6d	Adressed all comments	2021-03-01 22:24:02 +01:00
heydabop	bfc82f7236	Fixes #974 - convert tool/weapon equip time to floating point seconds	2021-03-01 15:06:39 -06:00
ccgauche	9628dfaf99	Fixed comments	2021-03-01 21:29:18 +01: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
Samuel Keiffer	7a62cbbafc	Merge branch 'sam/fix-roll-combo' into 'master' ... Fixes being stuck in roll when interrupting combo melee. See merge request veloren/veloren!1831	2021-02-28 18:02:01 +00: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
Sam	50c47ce84d	Made changes to fix torvus	2021-02-27 22:42:11 -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
Samuel Keiffer	00937a4e8b	Merge branch 'aweinstock/modularforms' into 'master' ... Support modular weapon components made from a tagged material using the material as a multiplier. See merge request veloren/veloren!1815	2021-02-26 00:53:02 +00: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
Marcel	553e8c2195	Merge branch 'sam/torvus-fix-test' into 'master' ... Fix for torvus See merge request veloren/veloren!1816	2021-02-23 20:51:14 +00: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
Sam	3d57db9485	Test fix for torvus	2021-02-23 14:38:58 -05: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	4b1c033f6e	Added scopeguard to protect against unwind	2021-02-23 13:58:13 +01: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	f85e79af07	Fixed turbofish issues	2021-02-23 00:03:29 +01:00
ccgauche	a12e554266	Removed the unwrap to ensure the WASM instance can't crash the host	2021-02-23 00:03:27 +01: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	6c991cc2cd	Changed to less restrictive memory ordering	2021-02-23 00:02:51 +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
ccgauche	1597fcc79e	Fixed the plugin compilation and added comments ... TODO: Remove compilation errors on WASM side (while using common).	2021-02-22 23:59:25 +01:00
ccgauche	8a693d9fde	New cleaner safer version	2021-02-22 23:59:15 +01:00
ccgauche	a067a20b69	added basic retreive	2021-02-22 23:59:11 +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	3f467a32e6	Changed naming from 'immutable data' to 'read data'	2021-02-22 16:02:37 -05:00
Sam	2b5120319d	Character behavior system now uses immutable data struct	2021-02-22 15:30:53 -05:00
Sam	fae1db90d5	Controller system now uses immutable data struct	2021-02-22 14:33:54 -05:00
Sam	dcacd82293	Stats system now uses immutable data struct	2021-02-22 14:27:34 -05:00
Sam	27fe1c20ac	Aura system now uses immutable data struct	2021-02-22 14:14:10 -05:00
Sam	4c0c06ea4c	Buff system now uses immutable data struct	2021-02-22 14:03:18 -05:00
Sam	605513ea56	Beam system now uses immutable data struct	2021-02-22 13:57:56 -05:00
Sam	11a0d67b35	Shockwave system now uses immutable data struct	2021-02-22 13:49:56 -05:00
Sam	b278cad807	Projectile system now uses immutable data struct	2021-02-22 13:37:42 -05:00
Sam	91e982b3ee	Melee system now uses immutable data struct	2021-02-22 13:25:21 -05:00
Marcel Märtens	1a7c179bbb	share tokio Runtime between Client and Server, name rayon Threadpool	2021-02-22 17:35:06 +01: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
Caelan	dda4931f46	Clean and update dependencies ... * Remove tweak feature * Remove const-tweaker * Update tiny_http * Update bitvec to 0.21.0 * Downgrade euc to avoid conflict with vek 0.12.0 * Require exactly vek 0.12.0 * Update all other dependencies automatically based on these changes * Update gilrs to latest at the request of Ada Lovegirls * Update meshing benchmarks to new criterion API	2021-02-17 01:27:06 -08:00
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
Imbris	a5c76a6d36	Merge branch 'trollderim/replace-magic-dr-number' into 'master' ... Replace magic dr constant Closes #915 See merge request veloren/veloren!1756	2021-02-06 20:28:40 +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
James Melkonian	1d8496ea21	Move agent system to server	2021-02-06 06:15:25 +00: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
Blob	5c8fc4f378	Fix projectile explosion being triggered twice.	2021-02-01 15:41:34 +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
Marcel	82147653df	Merge branch 'torvus-quick-fix' into 'master' ... Fix torvus See merge request veloren/veloren!1720	2021-01-23 22:31:15 +00:00
Samuel Keiffer	39d1c9e885	Merge branch 'sam/skill-balancing-1' into 'master' ... Skill balancing See merge request veloren/veloren!1716	2021-01-23 21:12:35 +00:00
Sam	77312ccdd4	Move outcome vec from being defined in frontend and server to common.	2021-01-23 15:17:36 -05:00
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
Samuel Keiffer	27796aac4e	Merge branch 'james/fix-biped-large-roll' into 'master' ... Make only humanoid agents attempt to roll See merge request veloren/veloren!1701	2021-01-19 21:37:48 +00:00
jiminycrick	08922dfc64	Make only humanoid agents attempt to roll	2021-01-19 10:42:46 -08: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	69be3a3d93	Added persistence for skill trees.	2021-01-19 08:07:00 -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
ubruntu	74d17ff4c8	Slightly better bird pathing	2021-01-15 00:42:57 +00:00
Acrimon	ceae51b0b7	fix #925	2021-01-14 13:21:55 +01: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
ccgauche	5ff2f5bc5d	updated to wasmer 1.0.0 ... - Everything seems to be working just fine	2021-01-08 16:33:19 +01:00
Joshua Barretto	1604616768	Merge branch 'ccgauche/new-wasmer-backend' into 'master' ... ccgauche/new wasmer backend See merge request veloren/veloren!1644	2021-01-08 08:48:31 +00:00
ccgauche	06ffe61219	Added feature flag ... changed field name to size	2021-01-08 08:48:30 +00:00
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
Marcel Märtens	c37384979c	switch toolchain to nightly-2021-01-01	2021-01-03 21:31:21 +01:00
Benoît du Garreau	8ced0a3810	Fix i18n::list_localizations	2021-01-03 17:48:23 +01:00
Acrimon	e76474463a	update authc	2020-12-28 16:42:40 +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
Benoît du Garreau	ce9d706ed4	Fix clippy lints	2020-12-17 12:06:28 +01:00
Benoît du Garreau	7b4aa6d4cc	cargo fmt	2020-12-17 12:06:22 +01:00
Benoît du Garreau	d090eefb00	Move the asset module to a single file	2020-12-17 12:06:13 +01:00
Benoît du Garreau	0cf164f33a	Use assets_manager to load assets	2020-12-17 12:06:07 +01:00
jiminycrick	60d5d62eef	Switched to hashbrown everywhere	2020-12-17 10:31:35 +01:00
Marcel Märtens	e8003a44dd	update specs	2020-12-16 14:31:16 +01:00
Marcel Märtens	e3307344ab	get rid of some insecure dependencies	2020-12-16 10:42:36 +01:00
Marcel	24a840bc6b	Merge branch 'xMAC94x/dependencies' into 'master' ... update chrossbeam, tracy, prometheus (and reduce server deps to crossbeam-channel) See merge request veloren/veloren!1641	2020-12-16 09:33:34 +00:00
Justin Shipsey	e7249210f6	accel based run	2020-12-16 08:07:38 +00:00
Marcel Märtens	107fd432f5	update further crates	2020-12-16 08:56:21 +01:00
Marcel Märtens	26918d10c9	update chrossbeam, tracy, prometheus (and reduce server deps to crossbeam-channel)	2020-12-16 00:51:07 +01:00
Joshua Barretto	198b1970a7	Merge branch 'ccgauche/fix-memory-overwrite' into 'master' ... ccgauche/fix memory overwrite See merge request veloren/veloren!1631	2020-12-15 17:09:17 +00:00
ccgauche	2b9dee0727	Updated buffer	2020-12-15 16:04:55 +01:00
Marcel	754b149316	Merge branch 'HiggsTardigradeTau/fix-slow-motion-effect-after-lag' into 'master' ... Fixed slow motion effect after lag See merge request veloren/veloren!1634	2020-12-15 14:31:05 +00:00
Joshua Barretto	494436be01	Hid plugins behind a feature flag to resolve Windows CI issue	2020-12-15 11:14:26 +00:00
Monty	cd1c1ffe9c	hotfix NPC inviting	2020-12-15 01:43:44 +01:00
Owen McCormick	ea28f93dc0	Fixed slow motion effect after lag	2020-12-14 16:05:42 -08:00
Monty	8b9db7b179	cleanup, changelog, small bugfixes ... fmt fix rebase fmt	2020-12-14 21:52:24 +01:00
ccgauche	ea1efd1ce1	Runned FMT	2020-12-14 18:46:04 +01:00
ccgauche	69dba49884	Fixed clippy warnings	2020-12-14 18:31:01 +01:00
ccgauche	d7aa26371c	Fixed memory issue now using alloc	2020-12-14 17:07:05 +01:00
Joshua Barretto	fc96fd780b	Moved plugin API to Uid instead of usize for entity IDs, hello plugin to an example	2020-12-13 23:08:15 +00:00
Joshua Barretto	023888f560	Updated changelog, fmt and clippy fixes	2020-12-13 17:40:15 +00:00
Joshua Barretto	f8c8e342e6	Moved common networking code to common/net, clippy fixes	2020-12-13 17:23:45 +00:00
Joshua Barretto	027842f832	Resolved plugin dependency cycle, allowing more interesting plugin API	2020-12-13 17:15:33 +00:00
Joshua Barretto	8e937a50ca	Better plugin API	2020-12-13 17:15:33 +00:00
ccgauche	b18eda37b5	Added parallelism to event execution using rayon	2020-12-13 17:15:33 +00:00
ccgauche	cae81e625e	Added plugin command support	2020-12-13 17:15:33 +00:00
Joshua Barretto	780f54ac90	Reorganised plugin crates	2020-12-13 17:15:32 +00:00
ccgauche	05aee7df18	Removed unsafe unsage in favour of unwrap_or and get	2020-12-13 17:15:03 +00:00
ccgauche	c95f57cafd	Fixed comments ... - Would be better to remove the iterator and just collect with a loop to avoid extra allocations - tructure - A HashSet is probably better - Usefull -> Useful - I'd have thought plugin-api-derive is a better name	2020-12-13 17:14:39 +00:00
ccgauche	ee7fb990c3	Added plugin system ... Added a plugin system based on wasmer-runtime - Support Action (Print handled) - Support Events (PluginLoadEvent handled)	2020-12-13 17:14:37 +00:00
Joshua Barretto	12b29ea174	Began work on plugin API and plugin loading	2020-12-13 17:13:57 +00:00
Marcel Märtens	eba3532386	move tools and chat-cli in src/bin and examples	2020-12-12 02:12:00 +01:00
Pfauenauge90	6d1bae67d0	adjust mindflayer strength, fix en translation, update es_la translation, fix undead eyes	2020-12-10 18:06:31 +01:00
Monty Marz	f2ba7cc297	add baobabs, fix map difficulty, make mushrooms lootable	2020-12-10 18:06:29 +01:00
Marcel Märtens	ccb01e1898	adjust fmt and clippy after toolchain upgrade	2020-12-10 14:53:01 +01:00
Snowram	6713ac935f	Addressed comments	2020-12-08 23:04:21 +01:00
Snowram	f94a4ec90d	Improves fish_small, new npc	2020-12-08 23:03:39 +01:00
Snowram	72d73ecd38	Initial fish work	2020-12-08 23:03:38 +01:00
Marcel	ed9413e96a	Merge branch 'HiggsTardigradeTau/deltatime-lowest-delta-usage' into 'master' ... Resolve #867 - Make deltatime use the lowest delta of several frames to avoid 'teleport' effect after single-frame lag spike Closes #867 See merge request veloren/veloren!1592	2020-12-08 21:07:15 +00:00
HiggsTardigradeTau	57d3a595ce	Resolve #867 - Make deltatime use the lowest delta of several frames to avoid 'teleport' effect after single-frame lag spike	2020-12-08 21:07:14 +00:00
Sam	490915d384	Modified how most abilites that could scale were scaled.	2020-12-07 22:00:24 -06:00
Joshua Barretto	52f2bccf2f	Fixed incorrect grid check	2020-12-05 18:30:07 +00:00
Joshua Barretto	b37be14b86	Added cave mushrooms	2020-12-05 18:00:29 +00:00
Joshua Barretto	e5ebbd31fa	Began using Grid<T> for LoD data	2020-12-05 11:20:25 +00:00
James Melkonian	71303fecfd	Aura System and Campfire Health Regen	2020-12-04 22:24:56 +00:00
ubruntu	c975f811e7	Chat commands for group manipulation	2020-12-04 02:18:42 +00:00
Marcel Märtens	e398cca53c	move common_state into common_sys	2020-12-01 13:46:28 +01:00
Marcel Märtens	add7922653	Move Systems out of common into common_sys ... This requires to move `State` into a own crate called `common_state` which depends on `common` and `common_sys`	2020-12-01 13:44:07 +01:00
Marcel Märtens	ca1601a980	Change the version number to 0.8	2020-11-28 11:25:58 +01:00
Marcel	a431fe3fad	Merge branch 'sam/dehardcode-energy' into 'master' ... Graying out skills with insufficient energy no longer dependent on hard-coded values Closes #824 See merge request veloren/veloren!1560	2020-11-27 16:27:09 +00:00
Samuel Keiffer	352917d9cb	Graying out skills with insufficient energy no longer dependent on hard-coded values	2020-11-27 16:27:09 +00:00
Sam	332a636647	You can now leap in directions other than forward with repeater ranged again.	2020-11-26 18:23:15 -06:00
Sam	6a6260daa1	Weapon combat fixes: ... - Modified energy and speed scaling of sword, axe, and hammer combo melees. - Nerfed bow basic attack knockback. Buffed bow damage and energy regen. - Corrected xp values for theropods. Removed unnecessary function for xp increase per level. - Guards no longer flee at low health. - Buffed sword spin. - Nerfed axe spin and sword dash moderately. - Dash now takes a little time to reach full speed. Sword M2 and hammer M1 damage values tweaked.	2020-11-26 09:15:45 +01:00
Joshua Barretto	867ca911e5	Parallelised agent code for some sweet performance gains	2020-11-25 22:47:16 +00:00
Monty Marz	e7d27a2c21	fmt ... cleanup	2020-11-25 16:53:48 +00:00
Marcel	5e64dcce02	Merge branch 'yusdacra/fix-improve-nix-build' into 'master' ... Fix and improve Nix build See merge request veloren/veloren!1548	2020-11-25 11:14:57 +00:00
Sam	33e4448542	Replaced every unnecssary powf in the entire codebase with either powi or sqrt.	2020-11-24 18:28:24 -06:00
Sam	5461f002fe	Correct beam offsets used. Fix scaling damage on hammer M1. Add can_strafe function to body.	2020-11-24 17:56:39 -06:00
Sam	8ab2d2524a	Changed default main and secondary tool from Some(empty) to None. ... weapon fixes	2020-11-24 17:49:04 -06:00
jiminycrick	aad9734055	Agent tactic refactoring ... Lower theropods spawns clippy, changelog review response	2020-11-24 17:49:00 -06:00
jiminycrick	1cf0aff5ef	More ai work ... balance Lavadrake AI tweaks feedback tweaks	2020-11-24 17:48:54 -06:00
jshipsey	d10dd83e5f	theropods in world, small tweaks	2020-11-24 17:48:51 -06:00
jshipsey	f411ff7e04	bunch of animations and more attacks	2020-11-24 17:48:51 -06:00
jshipsey	6f72e68ad6	hoof attack, tweaks	2020-11-24 17:48:50 -06:00
jiminycrick	1337fdaa57	Generalize rotation time	2020-11-24 17:48:49 -06:00
jshipsey	a27b086401	placeholder for charge animal, animated leapmelee, small fixes	2020-11-24 17:48:49 -06:00
jiminycrick	a1aa3efd29	Moved hit timer to charged melee and adjusted for tail slap	2020-11-24 17:48:48 -06:00
jshipsey	1f59ef92d8	species specific speeds, more animation	2020-11-24 17:48:48 -06:00
jiminycrick	ee03304a3a	Fix charged melee swing	2020-11-24 17:48:47 -06:00
jiminycrick	6b534729be	Initial AI for quad low	2020-11-24 17:48:47 -06:00
jshipsey	c07d8df58b	assigning weapons, building animations ... ability mapping	2020-11-24 17:48:43 -06:00
jiminycrick	793d6095b3	Maneater AI ... Rebase fixes and maneater AI	2020-11-24 17:48:38 -06:00
jshipsey	e3e513cc11	initial quadlow ranged work	2020-11-24 17:48:27 -06:00
jshipsey	ae06016e9a	Wolf attacks and ai. ... initial wolf dash testing tool.rs Wolf attack AI	2020-11-24 17:48:20 -06:00
Yusuf Bera Ertan	62d34422fe	fix and improve nix build: actually output a proper veloren voxygen package now	2020-11-25 02:00:50 +03:00
Sam	17656c990d	Changed default main and secondary tool from Some(empty) to None.	2020-11-23 21:54:12 -06:00
Samuel Keiffer	7774599a19	Merge branch 'sam/rt-loadout-fix' into 'master' ... Fixes loadout for RT NPCs See merge request veloren/veloren!1545	2020-11-24 01:34:18 +00:00
Sam	0abe02ca13	Restructures loadout builder function to better support weapons being passed in.	2020-11-23 18:22:24 -06:00
Christof Petig	a3db20c9d6	Show caves in map	2020-11-23 19:05:17 +01:00
Joshua Barretto	26fd40c0e3	Fmt, make clippy happy	2020-11-23 15:39:03 +00:00
Joshua Barretto	765a1ca17b	Switched light map iteration order, fire bowls in dungeons	2020-11-23 10:58:21 +00:00
Snowram	b7a33c56cc	Add basic guards to towns	2020-11-23 10:58:21 +00:00
Monty Marz	d069eb9a57	street lamp particles, ground fire bowl, misc fixes	2020-11-23 10:58:21 +00:00
Snowram	8885efd702	Adds (mini)bosses spawns	2020-11-23 10:58:21 +00:00
Joshua Barretto	e461fbd951	Make chimneys glow	2020-11-23 10:58:21 +00:00
Joshua Barretto	b539ecf438	More lights, minimised light and glow map data	2020-11-23 10:58:21 +00:00
Joshua Barretto	54989cf4a6	Switched to pure iterator space search	2020-11-23 10:57:57 +00:00
Snowram	0737c71749	Adds new cultist armors, defines loadouts for dungeons	2020-11-23 10:57:57 +00:00
Joshua Barretto	8fd2e4537d	Addressed review comments	2020-11-23 10:57:57 +00:00
Joshua Barretto	51d1a2ecff	Added glow	2020-11-23 10:57:56 +00:00
Snowram	3bcffe1bf7	Assigns spawned npcs loadout with new method	2020-11-23 10:57:56 +00:00
Sam	0b86943e66	Added LoadoutConfig to better specify loadouts.	2020-11-23 10:57:56 +00:00
Joshua Barretto	7850b0bcaf	Added site names, dungeon difficulty, better explosions	2020-11-23 10:57:55 +00:00
Joshua Barretto	de685b00b2	Improved water pathfinding	2020-11-23 10:45:01 +00:00
Joshua Barretto	71b7e1ef90	Better non-climbing NPC pathfinding in rivers	2020-11-23 10:45:01 +00:00
Joshua Barretto	b352ef5d55	Terrain pop-in, fixed agent pathfinding in water	2020-11-23 10:45:01 +00:00
Joshua Barretto	d4d4f17d3c	Added world map size icons	2020-11-23 10:45:01 +00:00
Joshua Barretto	450bc6c4ae	Prevented rtsim entities always climbing	2020-11-23 10:45:01 +00:00
Joshua Barretto	22fb71905b	Added rtsim entities moving when unloaded, better generation	2020-11-23 10:45:01 +00:00
Joshua Barretto	99a881f349	Added entity simulation to rtsim, reification, assimilation	2020-11-23 10:44:59 +00:00
Joshua Barretto	808d1873bd	Began implementing rtsim	2020-11-23 10:37:59 +00:00
Joshua Barretto	3ee4245652	Added test poles, minor improvements	2020-11-23 10:37:59 +00:00
Joshua Barretto	da9b23d4f6	Merge branch 'knarkzel/fix-npc-spawn' into 'master' ... Fix bug that caused campfires and other stuff to duplicate See merge request veloren/veloren!1543	2020-11-22 21:03:06 +00:00
Odd-Harald Lillestø Myhren	56e37a4846	Fix bug that caused campfires and other stuff to duplicate	2020-11-22 21:03:06 +00:00
Imbris	1355c1e8f5	Move tracy frame markers to proper locations, add a few spans	2020-11-22 14:22:39 -05:00
Joshua Barretto	2ae51de7f0	Added more creature spawns	2020-11-21 14:33:32 +01:00
Imbris	e72c69ca41	Merge branch 'imbris/fix-apple-bug' into 'master' ... Fix issues with not being able to grab highlighted apples by unifying distance checking Closes #820 See merge request veloren/veloren!1532	2020-11-21 02:55:09 +00:00
Imbris	ea275e320f	Rename pos fields of Cube and Cylinder for enhanced clarity and added a few tests to the find_dist module	2020-11-20 20:51:44 -05:00
Sam	c00720fb44	Swapped bool values, only_roll changed to attack_interrupts.	2020-11-20 11:54:56 -06:00
Sam	e62960e75d	Rolling can now interrupt any attack.	2020-11-20 11:30:48 -06:00
Snowram	d98bfa72ad	Improves bipedlarge and theropod anims, balance tweaks	2020-11-19 00:56:50 +01:00
Snowram	b48de84f8c	Adds 3 new npcs	2020-11-19 00:53:17 +01:00
Snowram	44fe398ba3	Adds 2 new npcs, some models tweaks	2020-11-19 00:53:13 +01:00
Snowram	42d2108c39	Adds mindflayer npc	2020-11-19 00:53:09 +01:00
Snowram	9bfccd42d3	Adds new animals	2020-11-19 00:53:02 +01:00
jiminycrick	3b47add55a	Fully move sfx away from ECS event bus	2020-11-18 13:31:13 -08:00
jiminycrick	b3aa454f8e	Initial work to move combat sfx to outcomes	2020-11-18 13:31:12 -08:00
jiminycrick	77d624f640	Made level up sounds use outcomes instead of emitting an event	2020-11-18 13:31:12 -08:00
jiminycrick	a9711eea01	Beginning to address comments	2020-11-18 13:31:12 -08:00
jiminycrick	a684bc90fd	Quadraped footsteps and songs in biomes	2020-11-18 13:31:12 -08:00
jiminycrick	bc1059610b	More clippy fixes	2020-11-18 13:31:12 -08:00
jiminycrick	c2a2361c22	Fix rebase	2020-11-18 13:31:12 -08:00
jiminycrick	ea1bc2941b	Clippy fixes	2020-11-18 13:31:12 -08:00
jiminycrick	695cc7f5cb	Broken wind implementation	2020-11-18 13:31:12 -08:00
jiminycrick	9b759efe41	Snow footsteps	2020-11-18 13:31:12 -08:00
jiminycrick	09a1974974	River water sfx	2020-11-18 13:31:12 -08:00
jiminycrick	c8d79b0b0e	Dungeon and cave specific music	2020-11-18 13:31:12 -08:00
jiminycrick	46d3f6f6d2	Initial biome specific music and ambient sound channel	2020-11-18 13:31:11 -08:00
Imbris	7427367d96	Fix issues with not being able to grab highlighted apples by unifying distance checking	2020-11-17 23:06:02 -05:00
Snowram	950eb1976d	Addressed more comments	2020-11-17 23:54:01 +01:00
Snowram	83b2640e02	Makes basic beam Y offset depend on body scale	2020-11-17 23:27:13 +01:00
Snowram	7af561263d	Addressed comments	2020-11-17 23:27:13 +01:00
Snowram	93642428f2	Move eye sight and scale in body.rs, mounts tweaks	2020-11-17 23:27:13 +01:00
Imbris	cbb701f30d	Temp fix for the home command	2020-11-15 20:40:12 -05:00
Knarkzel	917ae5a0b5	added persist combo counter on roll when mid-combo	2020-11-15 23:08:14 +01:00
Imbris	891e81cf58	Merge branch 'imbris/save-selected-char' into 'master' ... Save the selected character, deselect character when deleting, auto select newly created character See merge request veloren/veloren!1516	2020-11-15 01:40:44 +00:00
Imbris	4f2512f126	Save the selected character, deselect character when deleting, auto select newly created character	2020-11-14 19:17:42 -05:00
Imbris	2072929a5a	Send ability map from the server to the client on connection instead of loading from the assets	2020-11-14 16:07:07 -05:00
Samuel Keiffer	0c7cd3d8fb	Merge branch 'jasonkjl72/axe-spin-adjustment' into 'master' ... Make Axe Spin More Realistic Closes #827 See merge request veloren/veloren!1510	2020-11-14 04:15:50 +00:00
Jason Lee	1d2ccd5762	Make Axe Spin More Realistic	2020-11-13 21:49:12 -05:00
Imbris	1373b752ff	Merge branch 'imbris/fix-5' into 'master' ... Remove randomization of species and body_type with the randomize button in char creation See merge request veloren/veloren!1512	2020-11-14 01:56:28 +00:00
Imbris	51dd5110d0	Merge branch 'imbris/fix-3' into 'master' ... Tweak clock related things and fix voxygen tracy feature See merge request veloren/veloren!1506	2020-11-14 01:39:33 +00:00
Imbris	1952785af2	Remove randomization of species and body_type with the randomize button in char creation	2020-11-13 19:43:32 -05:00
Sam	b5f59f9cf3	Fixed tests. Addressed comments.	2020-11-13 10:41:34 -06:00
Sam	e2fe2fd532	Speed and power on weapons are now able to modify abilities after they are loaded from ron files.	2020-11-12 21:24:36 -06:00
Imbris	37e4ea4669	Remove ability map from top level functions	2020-11-12 21:24:35 -06:00
Sam	9b4fa4e961	Started moving loading of ability manifest to an ecs variable.	2020-11-12 21:24:34 -06:00
Sam	050ad82e55	Abilities are now loaded from .ron files.	2020-11-12 21:24:34 -06:00
Sam	770aaf6b93	Added projectile constructor. Removed a bunch of cloning.	2020-11-12 21:24:32 -06:00
Sam	abf7301a89	Changed how buffs were constructed on projectiles.	2020-11-12 21:24:32 -06:00
Sam	f4244ecbaf	Added ron files for unique and WIP tools.	2020-11-12 21:24:31 -06:00
Imbris	27d4310498	Add more catagories to common deps, store average busy dt as a duration, store frame delta times as seconds instead of milliseconds	2020-11-12 19:18:54 -05:00
Imbris	c0e8298ac3	Display averaged busy dt	2020-11-11 23:26:13 -05:00
Imbris	a97b188bea	Make fps display and specification more precise	2020-11-11 21:47:22 -05:00
Imbris	ba042c76c8	Only limit negative z velocity by gravity instead of total negative z velocity	2020-11-11 20:09:07 -05:00
Snowram	bed3a5c70a	Adds a speed variable to charged states	2020-11-11 22:06:05 +01:00
Snowram	af346806de	Addressed comments	2020-11-11 22:03:54 +01:00
Snowram	fe977f0a6c	Adds a speed stat to weapons	2020-11-11 22:03:53 +01:00
Imbris	cd1a134c26	Fix bug in body.validate(), add sliders to iced char creation screen, make char selection screen more closely resemble the master version in style	2020-11-11 03:02:22 -05:00
James Melkonian	6085edaa34	Improve NPC aiming and humanoid hitboxes	2020-11-11 04:36:40 +00:00
Marcel	696f607a70	Merge branch 'xMAC94x/clock' into 'master' ... massivly switch clock algorithm. See merge request veloren/veloren!1499	2020-11-10 22:12:12 +00:00
Monty Marz	0e072f72cc	frost cleaver ... velorite mage set offsets armor stats	2020-11-10 21:43:45 +00:00
Marcel Märtens	72afd7af6c	switch to spin_sleep	2020-11-10 22:39:10 +01:00
Marcel Märtens	e4e5c6e55b	massivly switch clock algorithm. ... - before we had a Clock that tried to average multiple ticks and predict the next sleep. This system is massivly bugged. a) We know exactly how long the busy time took, so we dont need to predict anything in the first place b) Preduction was totally unrealistic after a single lag spike c) When a very slow tick happens, we dont benefit from 10 fast ticks. - Instead we just try to keep the tick time exact what we expect. If we can't manage a constant tick time because we are to slow, the systems have to "catch" this via the `dt` anyway.	2020-11-10 18:31:42 +01:00
Justin Shipsey	a8ac051f33	Merge branch 'james/axe-hammer-keyframes' into 'master' ... James/axe hammer keyframes See merge request veloren/veloren!1497	2020-11-10 01:03:11 +00:00
jshipsey	cd188fd32b	tweaks	2020-11-09 18:32:23 -05:00
Joshua Barretto	71718d9c98	Better humidity, better snow trees	2020-11-09 15:06:37 +00:00
Sam	9b0e1c8dfc	Slight balance tweaks.	2020-11-08 19:33:24 -06:00
Sam	8fa7e246e9	Minor tweaks.	2020-11-08 18:11:53 -06:00
jshipsey	0618de138e	rebase	2020-11-08 19:02:48 -05:00
jshipsey	20efc692fd	ranged	2020-11-08 18:52:22 -05:00
Sam	edff3a75c3	Made bow stay in BasicRanged state while autofiring.	2020-11-08 18:51:36 -05:00
jshipsey	92aa6a1b12	axe basic	2020-11-08 18:51:35 -05:00
jiminycrick	33e87de17e	Initial combo melee for axe M1	2020-11-08 18:48:48 -05:00
Christof Petig	b56919b123	Make waypoints persistent ... Closes #549	2020-11-08 22:15:47 +01:00
AlKabir	6535deae9c	added two meat assets for mobs to drop	2020-11-07 23:34:20 -06:00
Sam	158fb36420	Other stupid fix.	2020-11-07 21:07:53 -06:00
Imbris	133ba82a9b	Use item_definition_id for weapon asset mapping	2020-11-07 16:44:11 -06:00
Sam	a4046872b2	Yeeted from code files.	2020-11-07 15:53:10 -06:00
AlKabir	77f3c7e3c5	Minor combat fixes (see issue 785)	2020-11-07 18:00:07 +00:00
TheBoredProgrammer64	b2ec207979	Revert "Removed toolCategory" ... This reverts commit 5b0ff408176ff00408cc90f2516a90d5cd303e56.	2020-11-06 15:33:20 +00:00
Marcel Märtens	40f5afc2b0	ci cleanup, dependency update	2020-11-06 14:34:42 +01:00
Samuel Keiffer	44f676d90c	Merge branch 'sam/make-roll-great-again' into 'master' ... Roll overhaul See merge request veloren/veloren!1484	2020-11-06 03:25:18 +00:00
Sam	37ecb165ef	Addressed comments. Roll now only provides i-frames to melee attacks. It also reduces height of hitbox.	2020-11-05 20:40:20 -06:00
Snowram	262ceac060	fmt	2020-11-06 01:08:35 +01:00
Monty Marz	642ad805a1	potion buff	2020-11-06 01:08:34 +01:00
Snowram	4b439e9b58	Adresses comment	2020-11-06 01:08:34 +01:00
Snowram	0d92f02deb	Buff stonegolem, nerf giants, add missing sfxs	2020-11-06 01:08:33 +01:00
Monty Marz	ca932f6c15	easier to get minor potions ... increase cost of a minor potion to 4 apples	2020-11-06 01:08:32 +01:00
Snowram	a52f83e92c	Addresses some comments	2020-11-06 01:08:31 +01:00
Snowram	ce96af4363	Allow for an arbitrary array of effects and buffs for consumables	2020-11-06 01:08:30 +01:00
Sam	4a1a3f3ecc	Roll now gives i-frames.	2020-11-05 16:48:04 -06:00
Sam	860c766d62	Changed roll movement.	2020-11-05 14:22:30 -06:00
Sam	55e75adec0	Created new fields in roll. Centralized generation of abilities. Added builder function for rolls since they are not yet tied to equipment.	2020-11-05 12:28:18 -06:00
Marcel	121364821a	Merge branch 'xMAC94x/FeuerzeugBierflasche' into 'master' ... xMAC94x/feuerzeugBierflasche See merge request veloren/veloren!1478	2020-11-05 09:22:50 +00:00
Marcel Märtens	a7ce3e5a2e	switch back to cylindric entity <-> entity collision check. ... I still doubt why we do cylindric vs cylindric in entity <-> entity check, but box vs box in entity <-> terrain check. Though i did a spheric calculation here. The cylindric one is alot slower though, 500 entities take 1.9s instead of 1.3s	2020-11-05 08:54:10 +01:00
Sam	a0af315930	Addressed comments.	2020-11-04 19:22:08 -06:00
Sam	bda7fefdc0	Removed Damages struct. Added GroupTarget enum. Changed RadiusEffect to use Effect instead of Daamges. Added Damage variant to Effect Eenum.	2020-11-04 19:22:07 -06:00
Sam	d38f1d319c	Energy and health change server events now reference EcsEntity instead of Uid. Added TargetGroup to use to determine targets of effects/damage. Added Entity(TargetGroup, Effect) to RadiusEffect enum.	2020-11-04 19:22:06 -06:00
Sam	87bff41a66	Addressed comments.	2020-11-04 19:22:05 -06:00
Sam	c48c022f7e	Separated out health from stats component.	2020-11-04 19:22:04 -06:00
Sam	b8f722af8d	Removed most hardcoded ability keys.	2020-11-04 19:22:02 -06:00
Sam	f1f5c2b21b	Added energy change server event.	2020-11-04 19:22:01 -06:00
Sam	e0cbbf52ed	Changed explosions to take a vec of RadiusEffects. Changed Damage to a struct of DamageSource and value. Added interpolation function to damage.	2020-11-04 19:22:00 -06:00
Joshua Barretto	87ac4bd998	Merge branch 'christof/home_town' into 'master' ... implement /home to return to home town See merge request veloren/veloren!1481	2020-11-04 15:58:35 +00:00
Marcel Märtens	a7123c6e14	put cache in ECS to get rid of allocations	2020-11-04 14:19:28 +01:00
Marcel Märtens	ce3173ecdf	add metrics for physics sys and implement concurrent physics	2020-11-04 11:53:13 +01:00
Marcel Märtens	bbe6e8be7c	Improve Phyiscs speed of entity handling. ... Before we had accessed velocities in a nested loop O(n²). Now we copy it only once out of the ECS system and store it in a tmp Vec. As we no longer need to hold a mut and imutable reference, we can iter of `&mut velocities` again in the outer loop. Also improved many calculations called in the loop to make the check if 2 entities are to far apart as easy as possible	2020-11-04 11:53:09 +01:00
jshipsey	28cde31bbb	setup for staff, more anim conversions	2020-11-04 01:48:05 +01:00
Christof Petig	ac92c8a6af	implement /home to return to home town	2020-11-04 00:55:15 +01:00
Joshua Barretto	6331ad9455	Implemented Flight	2020-11-03 22:46:07 +00:00
Marcel Märtens	00456c8373	extract a Presence Component, which is server only and has state of Player and Client. Presence is only valid for Clients that are in game	2020-11-03 08:56:02 +01:00
Marcel Märtens	6bb74c9c6f	Fix clients are disconnecting GRACEFULLY by removing the Disconnect Request from a client, a client now sends a TERMINATE message directly	2020-11-03 08:55:54 +01:00
ubruntu	8c1e1fdc5c	Fixed sneak toggle, sneaking no longer has sound, rolling can return to sneaking state, sneaking reduces aggro distance	2020-11-03 04:09:38 +00:00
ubruntu	b11041dfa4	10% of bow hits cause bleed debuff	2020-11-01 18:38:57 +00:00
Sam	4d8a635843	Sceptre fix.	2020-10-31 12:57:51 -05:00
Imbris	64def3cde4	Allow interacting with nearby blocks without pointing at them, unify selection of block/entity interactors so that only one is select at once, rearrange pickup and mount range consts	2020-10-29 18:40:11 -04:00
Imbris	74ef766051	Rename running_tps_average -> running_average_delta	2020-10-29 18:30:19 -04:00
Sam	52c93f613e	Addressed comments.	2020-10-28 22:04:15 -05:00
Sam	1a8cf33a60	Transitioned forced movement to an enum.	2020-10-28 18:15:27 -05:00
Sam	981eee5936	Transitioned knockback to an enum.	2020-10-28 18:15:27 -05:00
Sam	1ccbdec35c	Tweaked dash melee some more.	2020-10-28 18:15:26 -05:00
Sam	a7e3e55a12	Transitioned damage and healing from u32/i32s to enums.	2020-10-28 18:15:25 -05:00
Sam	844e6f2b60	Slightly nerfed sword dash. Reduced particle count on fire aoe by factor of 3.	2020-10-28 18:15:25 -05:00
Sam	15286a094a	Leaps now require a non-negative vertical velocity to use.	2020-10-28 18:15:24 -05:00
Sam	555bc559f5	Axe no longer sets vertical velocity to 0, but instead preserves vertical velocity.	2020-10-28 18:15:24 -05:00
Sam	63011241ea	Added keyframes to all states that were lacking them.	2020-10-28 18:15:23 -05:00
Sam	6559df459e	Addressed comments.	2020-10-26 21:32:01 -05:00
Sam	e8f6338eb0	Admin armor now provides immunity to debuffs.	2020-10-26 19:49:40 -05:00
Sam	5d0fd3d9bc	Addressed more comments. Changed how buffs were sorted so that duration was also taken into account.	2020-10-26 19:30:18 -05:00
Adam Whitehurst	f759895d63	add maxhealthmodifier ... oops variable	2020-10-26 19:30:18 -05:00
Adam Whitehurst	8aad7adab8	add comments	2020-10-26 19:30:17 -05:00
Sam	f60985d733	Transitioned buff storage from a vec to a hashmap. Addressed other comments. Only continuous buff effects are handled right now.	2020-10-26 19:30:17 -05:00
Sam	337cf6e137	Cleaned up UI code. Removed stuff added for testing. Added 10% for melee attacks to inflict a bleeding debuff. Renamed BuffId to BuffKind. Fixed memory leak. Set event emission to false when timer is decremented.	2020-10-26 19:30:10 -05:00
Sam	fdf8decb18	Handled health change over time buff effect better.	2020-10-26 19:28:27 -05:00
Monty Marz	8fa398954d	Initial implementation of buffs UI ... player buffs animation more testing debuffs sorting and display limit fix overhead buffs fix WIP buff removal function fmt Update buffs.rs Now with compiling: WIP group UI buffs positioning Update group.rs Update group.rs Small optimizations. Fixed positioning of buffs in group panel. Broke buff tooltips in group panel. buff frame visuals added setting for displaying buffs at minimap	2020-10-26 19:28:24 -05:00
Sam	007d3c09ac	Buffs now get removed on death by default. Buffs are now required to have either the 'Buff' or 'Debuff' tag. RemoveByCategory function now has support for blacklisting certain categories. Support for UI stuffs.	2020-10-26 19:28:23 -05:00
Samuel Keiffer	60a5346a0b	Addressed comments.	2020-10-26 19:28:22 -05:00
Sam	0df061a38e	Moved duration to inside BuffId enum to future-proof for when buffs are persisted.	2020-10-26 19:28:20 -05:00
Sam	1a1ceb54bc	Server event used to deal damage/heal with buffs. Buff kills now award xp.	2020-10-26 19:28:20 -05:00
Sam	de7191b985	Added functionality to remove buffs by category.	2020-10-26 19:28:19 -05:00
Sam	ccad1fa0b8	Separated buffs into active and inactive buffs. There can only be 1 active buff at a time of a particular buff id. If a new buff is stronger than an active buff, it moves the active buff to inactive buffs. When active buffs are removed, it checks inactive buffs for any buffs of the same id and moves the strongest one to active buffs.	2020-10-26 19:28:18 -05:00
Sam	19c7ed7885	Added builder function for buffs	2020-10-26 19:28:18 -05:00
Sam	b8690473e4	When buffs expire from duration, now only they expire rather than ending all buffs of the same type.	2020-10-26 19:28:17 -05:00
Sam	125de0b46e	Creatures and playrs now have buffs component, buffs that expire now only end their particular buff instead of every buff with the same type.	2020-10-26 19:28:16 -05:00
Sam	c50063ad0c	Move addition/removal of buffs to server event.	2020-10-26 19:28:15 -05:00
BottledByte	7ab99a3bbf	Initial WIP implementation of the Buff system	2020-10-26 19:28:14 -05:00
Marcel Märtens	1b47913835	fix clippy after toolchain update	2020-10-26 22:30:51 +01:00
Marcel Märtens	153c6c3b13	Fixing Tarpaulin isn't easy. ... So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version. Then we had to update several dependencies, which broke: - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23 - update conrod to use modern copypasta 0.7 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project. - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type. It was called `convert_event` - make a `simd` feature which is default and introduce conditional compiling. AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS. - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.	2020-10-26 17:04:20 +01:00
Adam Whitehurst	4dcac28f8a	Ensure leap melee swing animation and hit are sync	2020-10-24 20:15:19 +00:00
jiminycrick	b98e2a924d	Fixed hammer AI and added axe AI	2020-10-19 16:20:59 +02:00
Snowram	34ce8bb042	Addressed comments	2020-10-19 16:20:59 +02:00
jiminycrick	64ef7f39d6	Addressed comments on agent code	2020-10-19 16:20:59 +02:00
jshipsey	64d73abdec	roshwalr fix	2020-10-19 16:20:59 +02:00
jshipsey	caa048b1d5	small fixes	2020-10-19 16:20:59 +02:00
Snowram	7a62ddfd3f	Add BeastClaw npc weapontype	2020-10-19 16:20:59 +02:00
Snowram	f9383e4dd8	Add roshwalr npc	2020-10-19 16:20:59 +02:00
jiminycrick	be1596a703	fixed agent code for staff rework	2020-10-19 16:20:59 +02:00
jshipsey	66b1fe67dc	rebase	2020-10-19 16:20:58 +02:00
Snowram	c9985e14cb	Rename Saurok, various anim fixes	2020-10-19 16:20:58 +02:00
jshipsey	6a86567301	fix agent bug	2020-10-19 16:20:58 +02:00
jshipsey	65df398672	werewolf work	2020-10-19 16:20:58 +02:00
jiminycrick	50aac17d94	Added secondary skills to agent code (except bow)	2020-10-19 16:20:58 +02:00
Snowram	6c54e6d8fe	Add sand, snow and wood raptor npcs	2020-10-19 16:20:58 +02:00
Snowram	588f66a1ee	Add treant npc	2020-10-19 16:20:58 +02:00
unknown	d2f91bc3a0	Assigns a ToolKind to bipedlarge weapons	2020-10-19 16:20:58 +02:00
Snowram	0a9ec848a7	add lizardman npcs	2020-10-19 16:20:58 +02:00
Snowram	204fa50de9	Add werewolf npc	2020-10-19 16:20:57 +02:00
Sam	e6684009c2	Made ability key not hardcoded in tool.rs.	2020-10-15 20:05:58 -05:00
Sam	d869f7e430	Moved explsion struct from within comp to common.	2020-10-14 21:06:55 -05:00
Sam	14e4af7ab6	Addressed playtesting feedback.	2020-10-14 21:06:52 -05:00
jshipsey	6a744eed82	anims	2020-10-14 21:06:32 -05:00
Sam	1ba8a6cfb3	Balance tweaks to staff abilities.	2020-10-14 20:57:01 -05:00
Sam	b5091a5891	Ai for staff-wielding enemies. Keyframes for shockwave state.	2020-10-14 20:56:24 -05:00
Sam	1c21362bc3	Fixed shockwaves hitting entities multiple times. Explosions can now regen energy. Staff M1 now has particles instead of using bomb particles.	2020-10-14 20:56:23 -05:00
Sam	7ef73f5981	Added particles for fire shockwave. Added ability key enum so held abilities could differentiate what button they should check. Modified energy fields on basic beam so it could drain energy every second.	2020-10-14 20:56:22 -05:00
Sam	cbb72363af	Reworked explosions. Tweaked staff fireball.	2020-10-14 20:56:21 -05:00
Sam	04dcd012da	Flamethrower particles.	2020-10-14 20:56:21 -05:00
Sam	c80f16ae74	Started to add particles.	2020-10-14 20:56:20 -05:00
Sam	256846a669	Initial implementation of new staff abilities.	2020-10-14 20:56:16 -05:00
jiminycrick	4de42e36fd	Consolidated recover code in repeater_ranged	2020-10-14 17:10:27 -07:00
jiminycrick	512d881cd2	Fixed clippy errors and added SFX	2020-10-14 15:30:58 -07:00
jiminycrick	95c36cc3fb	Skill icons with proper rotation	2020-10-14 12:50:33 -07:00
jiminycrick	1f3bd0e1d2	Responded to testing feedback	2020-10-14 12:50:33 -07:00
jshipsey	3bb59b36cd	energy values, remove hotload	2020-10-14 12:50:33 -07:00
jshipsey	64f72a73f9	axeleap tweaks	2020-10-14 12:50:33 -07:00
jiminycrick	691acd730d	Smoother leap and recovery leap handling	2020-10-14 12:50:33 -07:00
jshipsey	22d8792c4b	adjustments to chargedmelee, repeater	2020-10-14 12:50:33 -07:00
jshipsey	521ffd64ba	cleanup	2020-10-14 12:50:33 -07:00
jshipsey	28eb58ddfa	anims	2020-10-14 12:50:33 -07:00
Sam	fadba23dde	Slight tweaks to leap	2020-10-14 12:50:33 -07:00
jshipsey	281155186f	hammer leap melee anim	2020-10-14 12:50:33 -07:00
Sam	e1634fa83a	Fixed errors from transitioning some states to keyframes.	2020-10-14 12:50:33 -07:00
Sam	21cf1e2168	Added keyframes to leap melee.	2020-10-14 12:50:33 -07:00
Sam	7e0cc2d8e5	Added keyframes to repeater ranged.	2020-10-14 12:50:33 -07:00
Sam	97f580be2b	Added keyframes to charged melee.	2020-10-14 12:50:32 -07:00
jiminycrick	9ebda3c353	Made bow leap more graceful and set energy costs and removed jitter for no leap	2020-10-14 12:50:32 -07:00
jiminycrick	431f99a791	Reducing the amount of data in character state	2020-10-14 12:50:32 -07:00
jiminycrick	05623eb8bd	Addressed comments	2020-10-14 12:50:32 -07:00
jiminycrick	04175bab09	Add skillbar stuff for 3rd skills	2020-10-14 12:50:32 -07:00
jiminycrick	951acfca21	Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff	2020-10-14 12:50:32 -07:00
Imbris	9e7f521489	Fix system data folder name, panic when outside the project dir and there is no env var set	2020-10-13 02:29:32 -04:00
Marcel Märtens	f1c9b959f4	rename a file, fix error msg, dont spam persistence by default	2020-10-13 00:06:24 +02:00
Marcel Märtens	2a7378b4ae	pack together InGame, CharacterScreen and General variant in a single enum, as requested by zesterer. ... His reason to reqeust that is, that there might not be a perfect disctinction in the future. Now we need to send ServerGeneral over streams and do additional checking at various places to verify that not the wrong variant is send.	2020-10-12 11:27:21 +02:00
Marcel Märtens	ff374eab59	create a ServerMsg and ClientMsg enum and verify the state when in debug mode to benefit from the transition	2020-10-11 22:59:53 +02:00
Marcel Märtens	e8452fafc6	fix naming, replace NotInGame with CharacterScreen	2020-10-11 22:55:38 +02:00
Marcel Märtens	8b40f81ee2	No longer block the main thread for client connections, new clients will be handled by server without waiting. ... - Instread we have a dedicated thread that will async wait for new participants to connect and then notify the main thread - registry no longer sends a view distance with it. - remove ClientMsg::Command again as it's unused	2020-10-11 22:55:02 +02:00
Marcel Märtens	017e004309	Rename enums to allow a super enum in the future, but i am not yet sure if we want to introduce this yet ... ``` //This is a helper structure, containing all possible data send over pub enum ClientMsg { Initial(ClientType), General(ClientGeneralMsg), InGame(ClientInGameMsg), NotInGame(ClientNotInGameMsg), Register(ClientRegisterMsg), Ping(PingMsg) } ```	2020-10-11 22:49:25 +02:00
Marcel Märtens	b1db5ef488	Redo Network Frontend. ... Rather than having a single Stream to handle ALL data, seperate into multiple streams: - Ping Stream, for seperate PINGS - Register Stream, only used till the client is registered, then no longer used! - General Stream, used for msg that can occur always - NotInGame Stream, used for everything NOT ingame, e.g. Character Screen - InGame Stream, used for all GAME data, players, terrain, entities, etc... This version does compile, and gets the client registered (with auth too) but doesnt get to the char screen yet. This fixes also the ignoring messages problem we had, as we are not sending data to the register stream! This fixes also the problem that the server had to sleep for the Stream Creation, as the Server is now creating the streams and client has to sleep.	2020-10-11 22:49:14 +02:00
Monty Marz	e1a77d040d	loot table adjustments ... - decrease blue glider drop rate - decrease cloth scaprs drop rate from villagers - add crafting mats to crates instead	2020-10-11 16:25:35 +00:00
Imbris	71251ca6a6	Change admins from Vec<String> into Hashset<Uuid>, add commands to server-cli-bin for adding and removing admins	2020-10-10 02:10:32 -04:00
Imbris	fb2cf1a292	Fix clippy warnings	2020-10-10 02:10:32 -04:00
Imbris	7c14a3f4a4	New userdata folder that holds voxygen settings and logs and server saves and settings, split up server settings file into parts that are persisted back to their files and parts that are read-only, misc fixes	2020-10-10 02:10:32 -04:00
Imbris	6c43a7cdc5	Change projectiles to not be pushed back by collisions, moved group check into projectile system from physics system	2020-10-10 02:10:31 -04:00
Monty Marz	2b800a2b63	make clippy happy ... Delete glider.ron	2020-10-07 02:23:20 +00:00
Sam	47abf49751	Addressed comments	2020-09-29 20:48:23 -05:00
Sam	5f889773b5	Addressed comments	2020-09-29 19:48:17 -05:00
Sam	51141b2c1a	Changelog line, final balance tweaks.	2020-09-29 19:48:16 -05:00
Sam	0b80257aa3	Add migration	2020-09-29 19:48:15 -05:00
Sam	56d2afc0dc	Added keyframe support to basic beam state. Addressed some comments.	2020-09-29 19:48:15 -05:00
Sam	a8f31cbe6f	Beam tick rate now more responsive when aiming.	2020-09-29 19:48:14 -05:00
Sam	506ad1e80e	Improvements to beam collision.	2020-09-29 19:48:14 -05:00
Sam	ffe456c703	Fixed what broke after rebasing.	2020-09-29 19:48:13 -05:00
Sam	37fcfb8b6f	Created manifest for database to filepath for items.	2020-09-29 19:48:12 -05:00
Sam	3d6c26a3c7	Fully separated sceptres from staves.	2020-09-29 19:48:12 -05:00
Sam	3e2e06f2f8	Projectile effects are now drained, so that the same projectile can't trigger it's effects on multiple enemies.	2020-09-29 19:48:11 -05:00
Sam	67eafdabd0	Separated out energy cost for healing so it's not based off of the energy regen from dealing damage.	2020-09-29 19:48:11 -05:00
Monty Marz	3734fafcd8	doubled energy consumption for M1 healing	2020-09-29 19:48:10 -05:00
Sam	5bd6f0e26f	Addressed feedback in sceptre branch	2020-09-29 19:48:09 -05:00
Sam	de45784596	Addressed round of testing feedback.	2020-09-29 19:48:09 -05:00
Sam	18c2b850d3	Added healing healthsource logic to beam system.	2020-09-29 19:48:08 -05:00
Monty Marz	13d9b814ab	separate sceptres from staffs, show values below 1.0 as decimals in the SCT, add starting sceptre ... remove firebolt from starting sceptre	2020-09-29 19:48:07 -05:00
Sam	7e95a93434	Energy no longer regens when heal target is at full health.	2020-09-29 19:48:07 -05:00
Sam	07fd9ac023	Re-added necessary functionality to beam (heal, lifesteal, energy regen).	2020-09-29 19:48:06 -05:00
Sam	095433abcc	Addressed comments.	2020-09-29 19:48:06 -05:00
Sam	799a6c1d1e	Tweaked beam collision logic to be more accurate.	2020-09-29 19:48:05 -05:00
Sam	a679a34a7b	Reverted changes to melee system that were added to when beam was initially in melee system.	2020-09-29 19:48:04 -05:00
Sam	46563e7008	Added beam system. Added collision code for spherical wedge/cylinder detection.	2020-09-29 19:48:04 -05:00
Sam	03b5cac2f9	Beams now have spherical hit detection.	2020-09-29 19:48:02 -05:00
Sam	6bb680f372	M1 now only regens stamina when healing allies if they are not at full health.	2020-09-29 19:48:02 -05:00
Sam	8f7d45100d	Tick rate now exposed as a variable.	2020-09-29 19:48:01 -05:00
Monty Marz	a2d74b71c4	change tick rate	2020-09-29 19:48:01 -05:00
Monty Marz	2b8d1e6fb9	test values	2020-09-29 19:48:00 -05:00
Sam	bcda944af9	Fixed energy cost for playtesting purposes.	2020-09-29 19:48:00 -05:00
Sam	6b23af6e0b	Tweaked particles. Added skill icons.	2020-09-29 19:47:58 -05:00
Sam	8b9202710f	New sceptre M2 is functional.	2020-09-29 19:47:57 -05:00
Sam	921d224ef6	Lifesteal now works. Added particles to healing beam.	2020-09-29 19:47:57 -05:00
Sam	f20134d7ea	Initial implementation for beam attack.	2020-09-29 19:47:56 -05:00
Joshua Yanovski	69f68ddf29	Reduce chunks / chonk by trimming the ends. ... This improves the defragment operation for chonks by letting them remove chunks at the top that match above, and bottom that match below. This reduces the chunks / chonk from around 5.9 to around 3.4 at origin. From my investigations, adding something for water would probably get us a full 50% reduction, if we could collapse intermediate chunks; block types other than rock / air / water never appear to have full chunks of the same block, so any additional optimization will require changes to the subchunk compression format or changes to the actual chunks we generate.	2020-09-29 19:08:45 +02:00
Forest Anderson	25ab132d73	Merge branch 'xvar/add-clone-on-ref-ptr-clippy-lint' into 'master' ... Added #![deny(clippy::clone_on_ref_ptr)] to all crates and fixed resulting lint errors See merge request veloren/veloren!1411	2020-09-28 19:32:03 +00:00
Joshua Yanovski	7d6aebb316	Fix hacky solution with proper defragmentation. ... After generating a chonk, we now find the highest frequency block (in terms of the number of groups that uniformly consist of that block) and replace the chunk's default with that one. We also resort the data in the process to be in the same order as the original array index. This improves our memory savings from 3x to almost 7x, and brings us within a factor of 3 or so of what I hope a true average will be. The defragmentation is not totally optimal and can probably be improved from a performance perspective, but given how much of a hard bottleneck RAM is this seems worthwhile. Also, this doesn't suffer from the issues the previous solution did.	2020-09-28 16:56:26 +02:00
Joshua Yanovski	b9528da8f6	Improve chunk space consumption by a lot. ... 3x - 5x depending on terrain. We can do a lot better but this is a good start. Also, added chunk group count to metrics. This correlates with memory usage specifically by chunk voxel data in a much more direct way than chonk or chunk count do, so this should provide extra useful information (especially for our average overhead per chonk / chunk).	2020-09-28 13:35:49 +02:00
Joshua Yanovski	443f3287e4	Merge branch 'sharp/remove-spurious-vox' into 'master' ... Remove spurious uses of Vox. See merge request veloren/veloren!1406	2020-09-27 16:41:29 +00:00
Ben Wallis	b3dd8e8a02	Added #![deny(clippy::clone_on_ref_ptr)] to all crates and fixed resulting lint errors	2020-09-27 17:25:33 +01:00
Joshua Yanovski	5af5ceb1f9	Address review comments.	2020-09-27 17:06:46 +02:00
Ben Wallis	11fc74642e	Refactored crafting to use ItemDef instead of Item	2020-09-27 14:55:31 +01:00
Joshua Yanovski	529533466c	Fix collision detection in liquid.	2020-09-26 16:53:49 +02:00
Joshua Yanovski	938039a56e	Remove spurious uses of Vox. ... In the process, also try to address a few edge cases related to block detection, such as adding back previously solid sprites and removing filters that may be vestiges of earlier logic.	2020-09-26 16:30:40 +02:00
Marcel Märtens	b7dc17c11f	switch version to pre-alpha-2020-09-22 vs pre-alpha-v0.7.0	2020-09-22 12:04:07 +02:00
Marcel Märtens	8eec46424f	switching veloren naming scheme, to either one of the following: ... `stable-0.7.0 (<hash>-<datetime>)` for release versions. And `nightly-<date> (<hash>)` for nightly and master versions Reason is, many players only give information that they are running `0.x.0` but are not giving us the information which day, or commit they are running. So we should make master builds less confusing.	2020-09-22 11:47:18 +02:00
Snowram	fa2dd28587	Fixed various issues from better-things branch	2020-09-21 23:57:10 -04:00
Joshua Barretto	2f2e766ebb	Merge branch 'zesterer/better-block-format' into 'master' ... Stopped all blocks being explodable See merge request veloren/veloren!1402	2020-09-22 00:26:06 +00:00
Sam	2ff59c9f60	Addressed comments	2020-09-21 17:55:29 -05:00
Joshua Barretto	becb58e305	Stopped all blocks being explodable	2020-09-21 23:47:33 +01:00
Sam	b4018e7d42	Made 3rd ability interruptible. Final balance tweaks.	2020-09-21 17:40:16 -05:00
jshipsey	8070a38a89	spin anim	2020-09-21 17:38:57 -05:00
Sam	133e79ffd5	Modified how spin melee functions.	2020-09-21 17:38:56 -05:00
jshipsey	e79cef4824	dash animation	2020-09-21 17:38:55 -05:00
Sam	a8e834e754	Initial implementation of spin attack for sword.	2020-09-21 17:38:54 -05:00
Sam	fe70b7fbce	Addressed second round of feedback.	2020-09-21 17:38:53 -05:00
Sam	b06ab250cc	Addressed first round of feedback on sword overhaul.	2020-09-21 17:38:52 -05:00
Sam	c99e4c3c18	Added swing duration to dash melee. Added framework for animation to be added.	2020-09-21 17:38:51 -05:00
Sam	6dede05a0e	Combo now only increases when landing a hit.	2020-09-21 17:38:51 -05:00
Sam	2aac008b90	Attack speed now scales with combo in combo melee.	2020-09-21 17:38:50 -05:00
Sam	e54483d789	Shifted hit attempt to before swing duration, instead of after.	2020-09-21 17:38:49 -05:00
Sam	b79235b890	Dash melee now works as desired.	2020-09-21 17:38:49 -05:00
Sam	744843d03f	Dash now stops when colliding with entity	2020-09-21 17:38:48 -05:00
Sam	04af75bf8d	Initial implementation of new dash melee.	2020-09-21 17:38:48 -05:00
Sam	abcd0af1e3	Removed combo duration of combo melee (combo now activated from recover duration). Allowed for forced forward movement in combo melee, and added it to stages 1 and 3).	2020-09-21 17:38:47 -05:00
jshipsey	a18c23025e	stage 2 and 3 anim	2020-09-21 17:38:46 -05:00
Sam	847bddbd89	Removed swing_frac, added a swing duration instead to allow for more utility in character state. Moved location of stage_section enum to wielding so it could more easily be used by other character states.	2020-09-21 17:38:46 -05:00
Sam	2ba9d1e54f	Added support for different swings in the combo melee having differnt fractions of time buildup duration is split.	2020-09-21 17:38:45 -05:00
jshipsey	2451a64b97	stage 2 animation	2020-09-21 17:38:44 -05:00
Sam	0ba5740265	Added enum for stage section instead of using 4 bools.	2020-09-21 17:38:43 -05:00
Sam	440e45f2bc	Did stuff to support addition of keyframes for combo melee animation.	2020-09-21 17:38:43 -05:00
Sam	aab56ea636	Animation time for combo melee now resets between stages.	2020-09-21 17:38:42 -05:00
Sam	cf573a42bd	Initial implementation of combo melee attack.	2020-09-21 17:38:41 -05:00
Joshua Barretto	0ca42857fa	Addressed review issues	2020-09-21 21:10:32 +01:00
Joshua Barretto	388a899a7f	Added make_sprite command	2020-09-21 16:39:20 +01:00
Joshua Barretto	112b11c951	Fixed broken arrow physics	2020-09-20 11:56:57 +01:00
Joshua Barretto	49d1b3df6d	Improved docs	2020-09-20 11:46:12 +01:00
Joshua Barretto	ece4a01867	Improved representation of Block for better performance, more features, and better backwards-compatibility	2020-09-20 11:46:12 +01:00
Sam	45fef87f32	Addressed comments	2020-09-19 14:40:21 -05:00
Sam	e39770d1d9	Golem now spawns in dungeon.	2020-09-19 14:40:20 -05:00
Sam	99aba78422	Added healing healthsource logic to shockwave system.	2020-09-19 14:40:19 -05:00
Sam	6a1acd47a1	Added maximum vertical angle for shockwave.	2020-09-19 14:40:19 -05:00
Sam	d0f068ba63	Fixed shockwave and melee crit damage bypassing infinite armor. Made knockback not be applied if infinite armor.	2020-09-19 14:40:18 -05:00
Sam	6327dd18b6	Moved knockback to a server event so that it would actually be applied to the player.	2020-09-19 14:40:17 -05:00
Sam	819fb8ee77	Changed boss from cyclops to stone golem. Added ai specific for boss. ... Tweaked shockwave. Fix rebasing errors.	2020-09-19 14:40:16 -05:00
Sam	3e4615daea	Loadouts are now generated with loadout_builder.rs. Creatures spawned naturally and via command are now spawned with the same mechanics.	2020-09-19 14:40:14 -05:00
Sam	f5dad20899	Tweaked shockwave values. Added shockwave damage type. Changed how knockback was handled in shockwaves to make negative knockback work better.	2020-09-19 14:40:13 -05:00
Imbris	829d8a20d1	Add shockwave system to handle shockwaves colliding with other entities	2020-09-19 14:40:10 -05:00
Sam	717142d5ea	Started to implement shockwave system.	2020-09-19 14:29:06 -05:00
Sam	68ecfba291	Projectile speed is no longer hard-coded.	2020-09-19 14:29:05 -05:00
Sam	66b0fee3c7	Separated knockback out from basicmelee. Added weapon for cyclops boss to use, and added 1 ability to it.	2020-09-19 14:29:04 -05:00
Imbris	6cd6a96b64	Fix projectile/water interaction	2020-09-19 13:54:05 -04:00
Imbris	017d4a3c16	Increase entity vs entity repulsion factor, add check to ensure entities don't collide with themselves, fix possession projectiles not working on entities in the same group	2020-09-19 13:54:05 -04:00
scott-c	2686598f1f	Improve first-person projectile aiming	2020-09-19 19:14:23 +08:00
Monty Marz	5fe79e1c6a	new loading screen bgs (part 1) ... Add a basic random feature to char creation loading screen bg (part 2) loading screen changes, random button graphics Random appearance also pick a random npc name	2020-09-18 23:17:47 +00:00
Snowram	f9fada87cf	Addresses comments	2020-09-18 18:45:03 +02:00
jshipsey	8330d087e6	clippy	2020-09-17 22:58:02 -04:00
jshipsey	90e5bbaac0	rebase	2020-09-17 22:41:40 -04:00
jshipsey	5bb45a4861	spawn tweaks, improved odonto	2020-09-17 22:32:11 -04:00
Snowram	fecc40ad8e	Better quadmed legs/feet ratio	2020-09-17 22:32:11 -04:00
Snowram	62f6a5799a	Initial quadmed feed animation	2020-09-17 22:32:10 -04:00
jshipsey	06b39b9072	species specific improvement	2020-09-17 22:32:10 -04:00
jshipsey	b781a1765b	theropod run	2020-09-17 22:32:10 -04:00
Snowram	9308cabeb8	add deer, beaver and porcupine npcs	2020-09-17 22:32:10 -04:00
jshipsey	cd6e1ad45f	haul out the critter skele, add theropod	2020-09-17 22:32:10 -04:00
jshipsey	ecae71c016	gliders as items. anim improvements	2020-09-17 22:32:09 -04:00
jshipsey	412495e5fc	assets/manifests	2020-09-17 22:18:49 -04:00
jshipsey	bd1984bf28	golem addition, fix for axe attack	2020-09-17 22:18:49 -04:00
Ben Wallis	712f2e9c97	* Moved migrations to beginning of server initialisation ... * Added migrations for entity ID changes to existing tables	2020-09-17 23:02:14 +00:00
Marcel Märtens	3c58b64689	add detailed information on state tick timings	2020-09-16 18:24:18 +02:00
Joshua Yanovski	19485b6a00	Add a DisconnectReason enum.	2020-09-14 08:16:09 +02:00
tylerlowrey	2b0c1e89f3	Refactored kicking the player into its own function + ran fmt on project	2020-09-14 07:54:05 +02:00
tylerlowrey	30c3146682	Added main menu kick message with kick reason after player is kicked	2020-09-14 07:52:31 +02:00
tylerlowrey	fee79720ee	Added ban message with reason when banned user attempts to login to server	2020-09-14 07:52:31 +02:00
tylerlowrey	07e33286ad	Changed reason field for kick & ban from Any to Message	2020-09-14 07:52:31 +02:00
tylerlowrey	c55a66d5ba	Added ban, unban, kick usage information and invocation aliases	2020-09-14 07:52:31 +02:00
Imbris	3fbf8d7ca0	Remove chunk from mesh todo if neighbour is deleted, be more careful with z_start and z_end in terrain meshing	2020-09-12 21:02:00 -04:00
Imbris	c3ae641fbb	Merge branch 'imbris/tracy' into 'master' ... Add more tracing instrumentation and tracy support See merge request veloren/veloren!1359	2020-09-10 05:07:51 +00:00
Matthew Martin	57c6160b72	* Set the KillType to Other for HealthSource::Healing ... * Extend logic to projectiles and explosions	2020-09-09 23:34:10 +02:00
Matthew Martin	a9086b27a0	Do not make healing items deal damage	2020-09-09 23:22:49 +02:00
TheThirdSpartan	7fd673ecb2	Added localization config options for new death messages	2020-09-09 20:26:20 +00:00
Imbris	f39d1e9bb5	Use less verbose span names when the tracy feature is off	2020-09-07 00:59:16 -04:00
Imbris	7efbc74551	remove duplicate tracing filter code, fix compiling voxygen with the ... tracy feature	2020-09-06 22:28:14 -04:00
Imbris	0683a40741	Use finish_continuous_frame directly	2020-09-06 22:28:14 -04:00
Imbris	63d60c212c	Add spans to server systems	2020-09-06 22:28:14 -04:00
Imbris	4f68a6df27	Update tracy crates, reduce overhead of timing, add more misc instrumentation	2020-09-06 22:28:14 -04:00
Imbris	e37a01be9d	Sprinkle instrumentation in common crate,in particular in the ecs systems	2020-09-06 22:28:14 -04:00
Imbris	50ceb1c93e	Add workaround for spans with winit loop, configure filtering when the tracy feature is on, spinkle some spans in the codebase	2020-09-06 22:28:14 -04:00
Imbris	d95e539495	Intial setup of tracy	2020-09-06 22:28:14 -04:00
Marcel Märtens	961b8a4d7c	Implement the Player Timeout as config	2020-09-06 23:34:57 +02:00
TheThirdSpartan	6dbd1bc132	adding feature requested in issue #153 - displaying your alias in game as 'you'	2020-09-06 19:42:32 +00:00
Joshua Barretto	49c713a071	Merge branch 'zesterer/rtsim' into 'master' ... Beehives, Fireflies, and minor worldsim/lighting adjustments See merge request veloren/veloren!1357	2020-09-05 17:16:08 +00:00
Monty Marz	a70567b644	make dummy cmd an admin cmd to avoid exp cheesing and entity spamming	2020-09-05 16:12:35 +02:00
Imbris	fb33a5e519	Merge branch 'termac/inventory_collect_when_full_fix' into 'master' ... Fix bug collecting items into full inventory See merge request veloren/veloren!1333	2020-09-05 06:51:22 +00:00
Joshua Yanovski	66f49d5386	Merge branch 'sharp/default-shadows' into 'master' ... Create (segment, offset) just once per figure. See merge request veloren/veloren!1360	2020-09-04 15:54:55 +00:00
Joshua Barretto	0c0f150140	fmt	2020-09-04 11:48:57 +01:00
Joshua Barretto	afe42e0b86	Fixed projectiles reorienting once stickied	2020-09-04 11:48:56 +01:00
Joshua Barretto	032ec9ef41	Added bee hives	2020-09-04 11:48:56 +01:00
Joshua Barretto	88add8456f	Added fireflies, reeds near rivers	2020-09-04 11:48:56 +01:00
Joshua Barretto	4405227ffb	Made light attenuation nicer, fixed campfire light offset	2020-09-04 11:48:54 +01:00
Monty Marz	821c7e5881	made npcs decline invites until we have a better recruitment system	2020-09-04 00:46:32 +02:00
termac	f05c120fab	Fix bug collecting items into full inventory ... When the inventory is full and a player tries to reclaim an item from a block, collecting always failed. If the item is stackable and already present inside the inventory it should be collected though. The collect case now behaves more like the pickup case, using inventory's 'push' method to add the item and implicitly check for available space.	2020-09-02 12:47:56 +02:00
Joshua Yanovski	4eeb131f4b	Create (segment, offset) just once per figure.	2020-09-01 11:23:19 +02:00
Joshua Yanovski	7e6975d881	Merge branch 'sharp/typed-body' into 'master' ... Further generalize the typed module. See merge request veloren/veloren!1346	2020-09-01 06:29:35 +00:00
Songtronix	11730f2136	change(common): remove find_folder	2020-08-31 16:43:16 +02:00
Songtronix	abaf6ee53e	fix: locate assets in almost all cases	2020-08-31 10:25:45 +02:00
Joshua Yanovski	6f3d5da6f3	Further generalize the typed module. ... This enables us to automatically create configuration formats from enums or structs. For enums, we create a structure with a field for each case, representing a pattern match; the configuration format can then enter a different expression for each case. For structs, we create an enum with a variant for each field, representing projecting by that field; the configuration format selects the field to project from, and then can write a further expression on that field (for instance, it can perform another pattern match). So far we don't actually have anything that *uses* this functionality; I decided to finish it for the purpose of specifying a default lantern offset, only to discover that we already return a lantern offset from the animation crate. So I fixed it there instead.	2020-08-31 05:59:44 +02:00
Joshua Yanovski	8be3648a4d	Move sprite data to a config file.	2020-08-28 09:23:43 +02:00
Joshua Yanovski	3a96b73b2c	Move figure meshing to a background thread.	2020-08-28 05:25:31 +02:00
Imbris	4790373ab3	Add State::read_component_copied	2020-08-26 20:47:41 -04:00
Monty Marz	6946de2682	fixed nametag height ... fmt fmt	2020-08-25 21:54:47 +02:00
Joshua Barretto	bf7afcf5c9	Merge branch 'zesterer/small-fixes' into 'master' ... Better world colours, better projectiles, better aiming, many other small improvements See merge request veloren/veloren!1332	2020-08-25 15:59:05 +00:00
notoria	2be4202d01	Corrected some spelling errors	2020-08-25 12:21:25 +00:00
Joshua Barretto	24780e4f58	Handled 3d/2d sanity check bug	2020-08-25 12:54:30 +01:00
Joshua Barretto	37b45ba5f4	Addressed review issues	2020-08-25 11:01:17 +01:00
Joshua Barretto	12ea028a3d	Improved single-tick projectile wall/entity collision bug	2020-08-25 00:04:04 +01:00
Joshua Barretto	9b812b0d8b	Allowed small animals to block-hop again	2020-08-24 21:53:17 +01:00
Joshua Barretto	e4de32ac25	Fixed quadruped hitboxes	2020-08-24 21:46:08 +01:00
Joshua Barretto	2b9d5ee4a2	Fixed bad hitbox radii and adjusted field colour	2020-08-24 20:52:18 +01:00
Joshua Barretto	7e571c10cf	Corrected hitbox mistake	2020-08-24 18:29:59 +01:00
Joshua Barretto	6a4c5a05d0	Fixed projectile collisions, hitboxes, better aiming	2020-08-24 18:24:44 +01:00
Joshua Barretto	7af1b45d5f	Better pet pathfinding	2020-08-24 12:36:27 +01:00
Monty Marz	abeba460be	fix filepath	2020-08-23 13:36:11 +02:00
Monty Marz	c9438c0947	Fixes ... Fix Cave NPCs only spawning very deep inside caves Increase twig density Adjust armour values and ingredients for starter sword fix healing rod using the wrong model Hung up the lianas again	2020-08-22 23:37:45 +00:00
Monty Marz	ce929d2924	Address comments, clippy and minor adjustments ... first bunch of comments addressed change order or scatter, paths and caves being applied in worldgen to avoid floating scatter objects campfire adjustments, reduced grass density due to FPS issues readded item descriptions to the crafting window, item desc for craftable armour address comments happy clippy, happy life clippy clippy more clippy fmt revert cargo.toml formatting remove "allow unreachable pattern" fmt	2020-08-21 22:37:08 +02:00
Monty Marz	e3eb34085f	craftable starting set ... velorite staff update ore_nature_longbow model fix humanoid colours Update agent.rs improve rng (according to zesterer) slower fleeing More adjustments fix cult leader name more loot tables all kinds of adjustments smöl adjustments	2020-08-21 19:36:21 +02:00
Sam	9d2fe79a78	Changes to how critical hits function for melee attacks. Removed ability for explosions to crit. Velorite sceptre now functions as healing staff.	2020-08-21 19:36:20 +02:00
Monty Marz	55d126861f	fix tooltips in char selection, more balancing ... fix talking animals fix critter exp, stronger villagers biped large balancing more villager balancing, mushroom spawning rate more balancing fix rebase multiple loottables Add tarasque and bonerattler armour Added loot tables for different groups of weapons and armor based off relative strength. Added loot table for cultist boss. Added loot tables for consumables and food. Trimmed down default loot table. remove male and female sign from char creation chest loot tables fix loot tables lootable crates lantern keybinding display more loot tables loot table changes fixed loot tables fix typo more grass rebase fix, better lantern re-add sprite rotation for grass crafting window alignment fix, new streetlamps, new shopsigns, new healing staff height change	2020-08-21 19:36:19 +02:00
Sam	924d09e46c	balancing ... more specific stats Update body.rs more balancing non hostile catoblepas and mouflons quad low more adjustments Animals with enemy alignment now deal correct damage. Made health scaling species-specific.	2020-08-21 19:36:17 +02:00
Monty Marz	7ab80ef367	sprite spawning rules	2020-08-21 19:36:16 +02:00
Monty Marz	b930c34d89	agent changes, sprite spawning changes, alignment changes	2020-08-21 19:36:16 +02:00
Forest Anderson	a68fc077ce	Merge branch 'songtronix/fixes' into 'master' ... Fix: Various fixes Closes #726 See merge request veloren/veloren!1306	2020-08-20 23:25:13 +00:00
Forest Anderson	69463ab912	Merge branch 'T-Dark-invuln-armor-makes-you-invuln' into 'master' ... Fixed debug armor letting some damage through Closes #703 See merge request veloren/veloren!1309	2020-08-20 23:22:50 +00:00
Joshua Yanovski	2dfd3b13d1	(See sharp/lod-history) LOD, shadows, greedy meshing, new lighting, perf ... --- Pretty much a Veloren fork at this point. Here's a high level overview of the changes (will be added to CHANGELOG just before merge). At a high level this MR incorporates roughly two groups of changes. The first group consists of new game features: more flexible map sizes, level of detail terrain, shadow maps, and a new lighting engine. This is "feature work" that (mostly) only adds new things to Veloren, and mostly shouldn't affect old stuff. The second big group of changes are those addressing the fallout from all the new features. These include performance fixes of various sorts: the addition of multiple graphics options and optimization of the cheap ones to avoid work, switching all voxel models to use some variant of greedy meshing, switching over much of our CPU-side vector math to exploit SIMD instructions (coinciding with a fork of `vek`), and a rewrite of how the UI handles text rendering (coinciding with updates to our fork of `conrod`). Making Veloren's hardcoded colors appear correct under the new lighting engine also required considerably changes (TODO: Fill in this section when it's complete). The second category of changes often heavily touches code owned by other people, including frequently modified code "owned" by a handful of people, so I recommend that this code be reviewed particularly carefully. --- At a high level (each will be described in more detail below): - The world map has been refactored. - The world size is no longer hardcoded (@zesterer). - The map generation code was made generic to allow using it outside of the `world` crate (@zesterer). - On world creation, we now compute *horizon maps* (@zesterer). - The way we pass the world from the server to the client has been updated (@xMAC94x). - Artifacts related to image rotation were fixed (@imbris). - Multiflow rivers were enabled (@zesterer). - In the process of making changes related to the world map, various incidental fixes and optimizations were required. - The new *level of detail* feature was added (@zesterer wrote part of this and has checked out the rest). - A new LOD terrain rendering step was added to the pipeline. - The LOD terrain quality was made configurable via a graphics setting. - Horizon maps were used to cast shadows from LOD chunks on both LOD and non-LOD terrain. - A "voxelization" effect was incorporated into rendered LOD terrain to make it blend better into the world. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Veloren's lighting has been completely overhauled (@zesterer has already checked most of this out). - A semi-accurate index of refraction was assigned to our materials. - A new, more realistic, physically based approach to lighting was used using the *Ashikhmin Shirley* BRDF. - We emulate *atmospheric scattering* using equations designed for measuring solar panel light exposure. - We attempt to compute *realistic light attenuation* in water using its real material properties. - In the process of making changes related to LOD, various incidental fixes and optimizations were required. - Point and directional lights now cast realistic shadows, using *shadow mapping.* (@imbris, @zesterer, @Treeco, @YuriMomo) - Point light shadow maps were added to the rendering pipeline, using geometry shaders and *seamless cube maps*. - Directional light shadows were added to the rendering pipeline, using LISPSM together with disabling *depth clamping*. - "Shadow-only" chunks and NPCs were added to prevent shadows from models behind you from disappearing. - In the process of making changes related to shadow maps, various incidental fixes and optimizations were required. The addition of shadow maps, LOD terrain, and the new lighting all led to significant performance degradation, on top of other changes happening in master. Therefore, a large number of performance improvements were also needed: - The graphics options were made much more flexible and configurable, and shaders were optimize. - New options were provided for how to render lights and shadows (@Pfauenauge, @zesterer). - Graphic setting storage and configuration were overhauled to make adding new features easier (@Pfauenauge, @imbris). - Shaders were rewritten to utilize GLSL's preprocessor to avoid overhead (@zesterer, @YuriMomo). - In the process of making changes related to providing additional rendering options, various incidental fixes and optimizations were required. - Voxel model creation was switched to use *greedy meshing.* - A new voxel meshing method, greedy meshing, was added (@imbris). - Uses of the older meshing methods were migrated to use greedy meshing (@imbris, @jshipsey, @Pfauenauge). - New restrictions were added to terrain, figure, and sprites to future proof them for further optimizations (@jshipsey, @Pfauenauge, @zesterer). - Most positions are now relative to either chunk or player position for better precision (@imbris, @zesterer, @scottc). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - Animation and terrain math were switched to use SIMD where possible. - Fixes were made to vek to make its SIMD feature usable for us (@zesterer, @imbris). - The interface and types used in bone animation were changed in various ways (@jshipsey, @Snowram, @Pfauenauge). - Redundant code generation for body animation is now partly taken care of by a macro (@jshipsey, @Snowram, @Pfauenauge). - Animation code was modified to to use vek's SIMD representation where possible (@jshipsey, @Snowram, @Pfauenauge). - Terrain meshing code and shadow map math were also modified to use vek's SIMD representation (@imbris). - SIMD instruction generation was enabled (@YuriMomo, @jshipsey, @Snowram, @imbris, @Angelonfira, @xMAC94x). - In the process of making changes related to greedy meshing, various incidental fixes and optimizations were required. - The way we cache glyphs was completely refactored, fixed, and optimized. - Our fork of `conrod` was optimized in various ways (@imbris). - Our fork of `conrod` now exposes whether a widget was updated during the current frame (@imbris). - Our use of the glyph cache was rewritten for correctness (@imbris). - A *text cache* was introduced that lets us skip remeshing glyphs that have not changed (@imbris). - Various changes were made to reduce pressure on the glyph cache, with more planned (@imbris, @Pfauenauge). - In the process of making changes related to the glyph cache, various incidental fixes and optimizations were required. - Colors were changed to keep Veloren's look consistent with master. - Some older tree models were brought back (@Pfauenauge). - TODO(@Sharp): All hardcoded colors were extracted and made hotloadable. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Hardcoded colors were fixed to conform to Veloren's style. - TODO(@Treeco, @Pfauenauge, @imbris, @jshipsey): Color models were fixed to conform to Veloren's style. A detailed description of the involved changes follows. --- - The world size is no longer hardcoded. All functions dependent on world size now take a `WorldSizeLg`, which holds the base 2 logarithm of each actual world dimension and is guaranteed to maintain certain properties (outlined in `common/src/terrain/map.rs`). Additionally, many utility functions that utilize the world size were moved into `common` as well (mostly `common/src/terrain/mod.rs`). Finally, the world map format was updated in order to store its size explicitly, with a migration path from the old format that should work whenever the old formatted map was a square (practically always). See `world/src/sim/mod.rs` for these changes. - The map generation code was made generic to allow using it outside of the `world` crate. The parts of the map generating code that do not need to query the world were moved over to `common/src/terrain/map.rs`, allowing them to be used from the client without creating a dependency on `world`. The rest of it was turned into helper functions in `world/src/sim/map.rs`, which can be passed as closures to the generic map generation code to complete its construction. This also means that colors are now passed in separately to the map generation function. See <https://veloren.net/devblog-78/> for more details. - On world creation, we now compute *horizon maps*. See the function in `world/src/sim/util.rs`. Given a height map and a plane intersecting that height map, our horizon maps allow us to encode enough information to reconstruct shadows for each point on the height map using only the *horizon angle* (the angle at which the sun starts to become visible). As Veloren's sun only covers one plane, this is sufficient for encoding sun shadows for LOD terrain, by encoding two angles per chunk (one for each 90 degrees the sun covers). We can also use this for the moon, if we want, since the moon follows the same path. Additionally, we store the *height* of the furthest occluder, to try to make the shadows volumetric; so this means 4 bytes in total for each chunk. Support for horizon maps has been merged into the map functionality in common as well. - The way we pass the world from the server to the client has been updated. Rather than passing the prerendered map, we instead pass three maps with values for each chunk; one with the color information, a second with altitude information, and a third with horizon map information. We then reconstruct the map on the client, together with some additional information we send from the server (like the sea level and maximum height). See `common/src/msg/server.rs` for a detailed description of the format of `WorldMapMsg`, and `server/src/libr.rs` and `client/src/lib.rs` for details of the map construction and parsing. - Artifacts related to image rotation were fixed. See the commit message for commit SHA `cf74d55f2e3d2ae7d25fd68d5c73b01a6afde86e` for a detailed explanation. This involved changes to shaders, the addition of a new type of graphic (also reflected in the graphic cache) that allows specifying a border color (which automatically makes the associated texture immutable), and some related fixes. I reproduce the first two paragraphs of the MR description as well: ``` Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). ``` - Multiflow rivers were enabled. This does not really need to be part of this MR, and would be easy to revert, but since it seemed to provide a nice improvement it's currently packaged with it. We already computed multiple outflows from each chunk for erosion purposes long before this MR. However, we never modified river rendering to be able to handle this case (just a single downhill river flow is complex enough!) so this was not exposed when deciding which chunks were rivers. Now that - In the process of making changes related to the world map, various incidental fixes and optimizations were required. Some examples of fixes include making sure terrain is never lowered to below sea level (to make the shadow maps report correct values), fixing map altitudes and colors to understand things like cliffs and "block level" coloring (that doesn'te xist on the column level), and fixing a crashbug when rendering images for the UI where source pixels are strongly rectangular. Some examples of related performance fixes include avoiding allocating a fresh vector for all the maps (i.e. copying it over to change the format from `[u32; n]` to `DynamicImage` and then copying again to convert to `RgbaImage`), and instead using the `gfx::memory::slice` function to accomplish the same thing. These sorts of changes are spread all arond the code. This includes the additon of a new scene, `voxygen/src/scene/lod.rs`, a new pipeline `voxygen/src/render/pipeline/lod_terrain.rs`, and new shaders `assets/vxygen/shaders/lod-terrain-vert.glsl` and `assets/vxygen/shaders/lod-terrain-frag.glsl`, as well as associated changes to the renderer in `voxygen/src/render/renderer.rs`. The main idea behind our initial approach to LOD was to take the world data we now get from the server (altitude, color, and horizon mapping). - Some previously computed values were turned into shader uniforms for better prediction on weak processors. (@zesterer) - Calls to power or trig functions were removed or replaced with multiplications, where possible. - After some deliberation - To properly handle sprite "waving" for nearby sprites, We explicitly designed the greedy meshing system with figures and sprites in mind. In both cases, we want to be able to *efficiently* pack many different models into the same texture, especially in cases where we know we will either not be removing any of the grouped-together from the models from the texture, or will remove all of them at once (so they can be packed into some specific subtexture). For sprites, since we know every model in advance and never intend to deallocate them, we currently pack them all as efficiently as possible into one giant tetxure atlas. However, in the future we might opt to pack them slightly less efficiently in exchange for shrinking the sprite vertex size. For figures, we pack all the textures for each *model* into the same atlas. is a global texture atlas used for every sprite, and for figures which is why we have the ability to mesh multiple models to the same texture area (using the simple texture atlas allocator) without requiring intermediate vector allocations. This is accomplished by delaying the time when we actually write the color and light data to the texture until *after* all the model vertices have been meshed; then, we can just allocate the whole color/light array at once, making the atlas we use an exact fit. In computer science-y terms, we accomplish this delay by, after we perform the initial greedy meshing (without texture information), not continuing to create the texture data, but instead constructing a *continuation*--that is, a function that, when called, will execute the rest of the computation. We push this continuation (which in Rust terms is a `FnOnce` closure that takes the `ColLightsInfo` that it is supposed to write to as context) onto a onto a vector resizing. To allow for suspended writes to texture data, Rust pointed out to me that the continuation that would eventually write the color and light data to the texture atlas (the one that is shared by all models sharing the same greedy mesher) would have to *own* whatever data it mshed. Because we often generate the model data to mesh as a temporary in `voxygen/src/load.rs`, the - Matrix multiplications in the shader were reduced for figure data (@zesterer). - Vertex "waves" for fluid data were removed. - Terrain "bending" near edges was removed. - Scaling was fixed to make sure empty space was not introduced in a space previously occupied by a block. It was also changed to take ownership of its voxel data, rather than sharing it, to let it be used with meshing. - Rust's nightly version was bumped in order to use the `array_map` function, which lets us reuse more code between the simple map and `FigureModelCache`. - PositionedGlyph::standalone. --- I tried to cite sources in many cases[^realtime],[^lloyd],[^lispsm],[^pbrt],[^greedy],[^tjunctions] where I needed features from elsewhere but I am particularly grateful for the following resources, esepcially where they have accompanying source code. I linked all of them that are accessible to the public (those that are not were obtained through legal means). [^realtime]: Eisemann, Elmar, Michael Schwarz, Ulf Assarsson, Michael Wimmer. Real-Time Shadows. A K Peters/CRC Press (T&F), 20160419. [^lloyd]: Lloyd,B. 2007. [Logarithmic perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). PhD thesis, University of North Carolina. [^lispsm]: Wimmer, M., Scherzer, D., and Purgathofer, W. 2004. [Light space perspective shadow maps](http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf). In Proceedings of Eurographics Symposium on Rendering 2004, pp. 143– 152. [^pbrt]: Pharr, Matt, et al. [http://gamma.cs.unc.edu/papers/documents/dissertations/lloyd07.pdf](Physically Based Rendering: From Theory to Implementation). Third edition, Morgan Kaufmann Publishers/Elsevier, 2017. [^greedy]: mikolalysenko. “Meshing in a Minecraft Game.” 0 FPS, 30 June 2012, <https://0fps.net/2012/06/30/meshing-in-a-minecraft-game/>. [^tjunctions]: blackflux. “Meshing in Voxel Engines – Part 1.” Blackflux.Com, 23 Feb. 2014, <https://blackflux.wordpress.com/2014/02/23/meshing-in-voxel-engines-part-1/>. I am also especially grateful to Khronos, Wikiepdia, and stackoverflow for answering many of my specific questions while writing the MR. --- Squashed commit of the following: commit 300505e730 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 18:46:25 2020 +0200 Fixing cargo doc and typo in CHANGELOG. commit ec0aeb18e8 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 15:38:50 2020 +0200 Hopefully final commit for the LOD branch. commit 5e8ea0b1ea Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 10:14:26 2020 +0200 Falling back to power as stopgap. commit e44a1cbf46 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 09:25:41 2020 +0200 Address imbris feedback. Temporarily disables shiny water, lowers max VD. These restrictions will be lifted soon after merging. commit 561e25778a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 08:31:13 2020 +0200 Tweaking shaders a bit. commit 7d19259078 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:59:43 2020 +0200 Fix view example as well. commit 051cd4934e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 07:29:06 2020 +0200 Fix meshing benchmark. commit c95e07db3b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 05:46:22 2020 +0200 Address MR feedback, fix scene clouds. commit 1bfb816cab Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:39:36 2020 +0200 Incorporating Pfau's figure color changes. New eyes and new humanoid colors. commit 3f9b89a3ac Merge: e2f5162e4 62c53963a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:29:41 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit e2f5162e4f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 20 04:28:38 2020 +0200 World colors are all hotloadable. They live in assets/world/style/colors.ron. Only a small handful of hardcoed colors remain in World; they are either part of the map, or difficult to disentangle from the rest of the computation. Comments are made where appropriate. commit 62c53963ab Author: Marcel Märtens <marcel.cochem@googlemail.com> Date: Wed Aug 19 15:59:00 2020 +0200 replace pretty_env_logger with tracing commit 5b1625f99d Merge: d71003acd 4942b5b39 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:15:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit d71003acda Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 19 05:14:34 2020 +0200 Hotloading colors, part 1: colors in common. Currently, this just entails humanoid colors. There are only three colors not handled; the light emitter colors in common/src/comp/inventory/item/tool.rs. These don't seem important enough to me to warrant making hotloadable, at least not right now, but if it's needed later we can always add them to the file. commit 63b5e0e553 Merge: c32b337a4 6d2c4b9c1 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 13:05:37 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c32b337a46 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:52:04 2020 +0200 Fixing LOD grid, for real. commit a166ae0360 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 17 05:28:05 2020 +0200 Addressing imbris's initial feedback. Fixes two minor bugs: explosion particles were no longer spawning randomly, and LOD grids were not perfectly even. commit 4cbad004f4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:27:58 2020 +0200 Bumping nightly per request. commit 548680276a Merge: acc098604 8f8b20c91 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 16 19:26:06 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit acc0986040 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:28:32 2020 +0200 Lower resolution due to lying drivers. commit d3b878de2a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 22:15:38 2020 +0200 Fix issues msh encountered with Intel 4600. commit 10245e0c1b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 15 21:15:02 2020 +0200 Merge more models into one mesh than we did previously. commit 3155c31e66 Merge: 7204cc8a7 3c199280e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:35:22 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7204cc8a7a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 22:34:43 2020 +0200 Fix not yet done NPC animations. This forces them all to be the idle animation if not specified. This fixes issues where you'd have giant NPCs in water. commit bc83360f2a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 19:36:37 2020 +0200 Try to fix some bugs: - Z fighting with LOD terrain and water. - Audio SFX not playing. commit 1fd104aa60 Merge: 862df3c99 7c2c392a3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 12:02:31 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 862df3c997 Merge: 0a4218ed9 75c1d4401 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 13 05:52:56 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0a4218ed9d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 22:27:14 2020 +0200 Fix particle depth. commit f51dfdeb44 Merge: c6251a956 5e6dc0471 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:19:04 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit c6251a956a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 20:15:46 2020 +0200 Cache figures more intelligently. Cache figures for longer, and don't cache character states for the player except where they actually affect the rendered model. commit 0ed801d540 Merge: c11b9bdf0 eea64f78f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 16:32:24 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit c11b9bdf0a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Aug 12 11:47:15 2020 +0200 Remove unneeded Clippy annotation. commit 16aa9ef40a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Aug 8 00:53:02 2020 +0200 Fix hotloading and Clippy. commit 3dc973e0be Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 23:50:27 2020 +0200 Major speedups with SIMD. commit fba64a7d93 Merge: 76429d00e d1e10b178 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:19 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 76429d00ee Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 13:23:10 2020 +0200 Add clippy.toml. commit c79f512f84 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 11:55:20 2020 +0200 Fix all clippy issues, clean up Rust code. commit 6f90e010b3 Merge: 77a8c7c26 5929cfa5c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:30 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 77a8c7c267 Merge: b44e44232 44febaabd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Aug 7 06:47:10 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 5929cfa5c7 Author: jshipsey <jshipsey18@gmail.com> Date: Thu Aug 6 20:47:27 2020 -0400 fixed in-hand arrow bug commit b44e442325 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Aug 6 13:40:35 2020 +0200 Miscellaneous performance improvements. commit be37acf287 Merge: 125d7fc6c c11876547 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 05:49:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 125d7fc6c4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Aug 3 04:55:31 2020 +0200 Abstract over simd vs. repr_c vectors. Also some minor improvements to Event size. commit d4d4956e92 Merge: 5f3b7294a aced5f979 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:56:54 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 5f3b7294af Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:43:52 2020 +0200 Fix formatting issues I missed before. commit a428a3ebba Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Aug 2 20:41:51 2020 +0200 Fix clippy warnings, part 1. There aer still a bunch of type too complex and function takes too many arguments warnings that I'll fix later (or ignore, since in the one case I did fix a function takes too many arguments warning I think it made the code *less* readable). commit ba54307540 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 30 13:22:42 2020 +0200 Fix light animations so they are removed when the light turns off. commit 7e0f4bcbf0 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 21:10:20 2020 +0200 Fix crash in edge case for pixel art. commit 56da06f7a3 Merge: cf74d55f2 9f53a4a19 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:56:52 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit cf74d55f2e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 29 18:29:52 2020 +0200 Fix map image artifacts and remove unneeded allocations. Specifically, we address three concerns (the image stretching during rotation, artifacts around the image due to clamping to the nearest border color when the image is drawn to a larger space than the image itself takes up, and potential artifacts around a rotated image which accidentally ended up in an atlas and didn't have enough extra space to guarantee the rotation would work). The first concern was addressed by fixing the dimensions of the map images drawn from the UI (so that we always use a square source rectangle, rather than a rectangular one according to the dimensions of the map). We also fixed the way rotation was done in the fragment shader for north-facing sources to make it properly handle aspect ratio (this was already done for north-facing targets). Together, these fix rendering issues peculiar to rectangular maps. The second and third concerns were jointly addressed by adding an optional border color to every 2D image drawn by the UI. This turns out not to waste extra space even though we hold a full f32 color (to avoid an extra dependency on gfx's PackedColor), since voxel images already take up more space than Optiion<[f32; 4]> requires. This is then implemented automatically using the "border color" wrapping method in the attached sampler. Since this is implemented in graphics hardware, it only works (at least naively) if the actual image bounds match the texture bounds. Therefore, we altered the way the graphics cache stores images with a border color to guarantee that they are always in their own texture, whose size exactly matches their extent. Since the easiest currently exposed way to set a border color is to do so for an immutable texture, we went a bit further and added a new "immutable" texture storage type used for these cases; currently, it is always and automatically used only when there is a specified border color, but in theory there's no reason we couldn't provide immutable-only images that use the default wrapping mdoe (though clamp to border is admittedly not a great default). To fix the maps case specifically, we set the border color to a translucent version of the ocean border color. This may need tweaking going forward, which shouldn't be hard. As part of this process, we had to modify graphics replacement to make sure immutable images are *removed* when invalidated, rather than just having a validity flag unset (this is normally done by the UI to try to reuse allocations in place if images are updated in benign ways, since the texture atlases used for Ui do not support deallocation; currently this is only used for item images, so there should be no overlap with immutable image replacement, so this was purely precautionary). Since we were already touching the relevant code, we also updated the image dependency to a newer version that provides more ways to avoid allocations, and made a few other changes that should hopefully eliminate redundant most of the intermediate buffer allocations we were performing for what should be zero-cost conversions. This may slightly improve performance in some cases. commit ad18ce9399 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 13:21:09 2020 +0200 Fix continent scale hack. commit 36b1cb074f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 12:11:40 2020 +0200 Enable loading different sized maps without a recompile. We may want to tweak the effects of the continent_scale_hack. commit 13b6d4d534 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 28 10:55:48 2020 +0200 Removing WORLD_SIZE, part 1. Erased almost every instance of WORLD_SIZE and replaced it with a local power of two, map_size_lg (which respects certain invariants; see common/src/terrain/map.rs for more details about MapSizeLg). This also means we can avoid a dependency on the world crate from client, as desired. Now that the rest of the code is not expecting a fixed WORLD_SIZE, the next step is to arrange for maps to store their world size, and to use that world size as a basis prior to loading the map (as well, probably, as prior to configuring some of the noise functions). commit 30b1d2c642 Merge: 7d56ba31b 1377b369f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:58 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 7d56ba31b4 Merge: 2101113b4 598f14b25 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Jul 27 13:16:27 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 1377b369f6 Author: Monty Marz <m.marzouq@gmx.de> Date: Sun Jul 19 23:25:38 2020 +0200 more saturated pumpkins commit ae8d50527f Author: Monty Marz <m.marzouq@gmx.de> Date: Sat Jul 18 20:29:56 2020 +0200 acacia models commit 2101113b46 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 18 18:55:25 2020 +0200 Higher detail LOD. commit add2cfae04 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 16 01:57:39 2020 +0200 Revert some irrelevant stuff. commit 2e2ab3dc1e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 15 13:30:49 2020 +0200 Fixing various things about shadows. * Correcting optimal LISPSM parameter. * Figure shadows are cast when they're not visible. * Chunk shadows stay cast until you look away. * Seamless cubemaps for point lights. * Etc. commit 6c31e6b562 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 19:50:26 2020 +0200 Fix shadow creation. commit 6332cbe006 Merge: be438657c 930e0028b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:47:00 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit be438657c3 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Jul 12 18:28:08 2020 +0200 Tweaks to shadows. Added shadow map resolution configuration, added seamless cubemaps, documented all existing rendering options, and fixed a few Clippy errors. commit 23b4058906 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 10:11:19 2020 +0200 Fix moon, use nonlinear noise for terrain. Note that the latter has a bit of performance cost. commit 7fbe5cbfbb Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:23:02 2020 +0200 Address lies about max texture size. commit bcfc62b5e1 Merge: 75e3626a7 18a08e8fe Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:22:08 2020 +0200 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes commit 75e3626a78 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Jul 8 02:21:52 2020 +0200 OpenGL 3.3 minimum. commit 18a08e8fe2 Author: Monty Marz <m.marzouq@gmx.de> Date: Tue Jul 7 23:57:52 2020 +0200 settings localization commit 90c5d1ca36 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 21:11:48 2020 +0200 Lower near distance. commit 0e66f02b25 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 20:09:01 2020 +0200 All sprites sway in the wind now. commit db1401a691 Merge: 69e508d8c e8b4b29d7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 19:34:17 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 69e508d8c9 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Jul 7 18:41:37 2020 +0200 Make it easy to switch to SIMD for math. commit ffe0f5928c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 21:21:12 2020 +0200 Fix some issues with underwater rendering. commit bfda6da42f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 19:17:59 2020 +0200 Fix some minor display issues. commit 0ed752e087 Merge: ccc6a06a8 518edcb85 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:14:21 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit ccc6a06a8d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 18:04:34 2020 +0200 Some minor changes. commit 4e02024670 Merge: 50a64d927 e05c9267a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 16:17:40 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 50a64d927e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Jul 4 13:07:03 2020 +0200 Fix far plane. commit 7dd06da34c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:25:35 2020 +0200 Add shadows.glsl. commit 618a18c998 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Jul 2 22:10:22 2020 +0200 Adding shadows, greedy meshing, and more. commit eaea83fe6a Merge: 267018495 2f89b863e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 22:47:07 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 2670184954 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 21:20:01 2020 +0200 Make civsim and sites deterministic. For anything in worldgen where you use a HashMap, *please* think carefully about which hasher you are going to use! This is especially true if (for some reason) you are depending on hashmap iteration order remaining stable for some aspect of worldgen. commit f8376fd5dc Merge: 654f7e049 cdee191dd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu May 21 17:53:57 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 654f7e0492 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed May 20 21:22:30 2020 +0200 Correct backface culling. commit 560501df05 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue May 19 17:22:06 2020 +0200 Greedy messhing for shadows. commit a4d87e1875 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun May 17 05:59:00 2020 +0200 Shadow maps work for lantern. commit 243d0837b8 Merge: 04382dc28 71dd520cd Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:53:13 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 04382dc286 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 15 14:22:17 2020 +0200 WIP: better graphics config, better LOD, shadow maps. commit 22ddbad3eb Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 18:54:09 2020 +0200 Minor shader fixes. commit 746a10e8d0 Merge: 0f4a0e763 40ab94673 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat May 2 04:02:09 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 0f4a0e763d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 23:03:24 2020 +0200 Switch back to pop-in terrain. commit dd74fa7e4a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri May 1 22:58:55 2020 +0200 LOD shading closer to voxel shading. commit ef67bd58ba Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 28 20:49:03 2020 +0200 Experimental underwater lighting. commit 2c5ad9d076 Merge: 748279835 303967a6f Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 22:35:24 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 7482798354 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 21:59:55 2020 +0200 Replace discard in figure-frag. commit d83b4ae69b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:45:57 2020 +0200 Fix sprite lighting, HDR from focus_pos. commit 0594238004 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 18:14:10 2020 +0200 Proper HDR from point lights. commit 48c93d2b41 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 14:01:43 2020 +0200 Brighter ambiance, darker LOD shadows. commit e0452e895c Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 13:13:23 2020 +0200 More proper HDR. commit 4c6da3ed16 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 27 00:13:10 2020 +0200 Trying LOD noise. commit 682a3d74c8 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 23:11:08 2020 +0200 Fix LOD heights in towns. commit cc39e5734e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sun Apr 26 21:01:23 2020 +0200 More LOD fixes. commit 8116b21c2e Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:54:43 2020 +0200 I like this coloring. commit bc2560ea90 Merge: 14effdd5d e690efe71 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 23:48:33 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit 14effdd5db Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:24:35 2020 +0200 Re-saturate. commit 48a643955d Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 22:23:57 2020 +0200 Various fixes. commit f7b497a0c2 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 03:22:49 2020 +0200 Render figures again. commit 44e4aad48d Merge: e6f0a5a98 9ec319a18 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 25 02:01:04 2020 +0200 Merge remote-tracking branch 'origin/master' into sharp/small-fixes commit e6f0a5a981 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 24 16:12:20 2020 +0200 Add atmospheric scattering. commit f2953087f6 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 23 00:01:20 2020 +0200 Fix shadowing for specular reflections. commit ddd4a67a97 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Wed Apr 22 22:56:12 2020 +0200 HDR fixes. commit 1015e60dee Author: Joshua Yanovski <pythonesque@gmail.com> Date: Tue Apr 21 18:25:19 2020 +0200 More lighting changes. commit 80c264abd1 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Mon Apr 13 00:29:59 2020 +0200 Lighting experiments. commit 8414987e58 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 9 02:38:40 2020 +0200 WIP -- lighting changes and soft shadows. commit 9cd2b3fb0d Merge: c7ea687eb 8b149ad11 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:29 2020 +0200 Merge branch 'sharp/new-lighting' into sharp/small-fixes commit c7ea687ebb Merge: 476441531 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:33:02 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes commit 8b149ad11a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Sat Apr 4 02:32:39 2020 +0200 Trying out a new lighting model. commit b0ac9f36f7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 07:56:11 2020 +0200 Use bicubic interpolation for terrain. commit f6fc9307a1 Merge: 33140a295 22f3319b4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 05:01:41 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 4764415312 Merge: ed2d0111d 13388ee6a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Apr 3 04:54:48 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 13388ee6a4 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 20:30:08 2020 +0200 Various fixes (to coloring and to soft shadows). commit fbd084a94a Merge: 5a089863b 4fdf6896a Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 18:50:38 2020 +0200 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/map-colors commit ed2d0111d9 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 06:49:27 2020 +0200 Combining colors and LOD. commit 88342640c6 Merge: 33140a295 5a089863b Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:49:20 2020 +0200 Merge branch 'sharp/map-colors' into sharp/small-fixes commit 33140a2951 Merge: 4c65a5aed f34d4b379 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 04:36:21 2020 +0200 Merge remote-tracking branch 'origin/master' into zesterer/lod commit 5a089863be Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 03:17:49 2020 +0200 Making maps brighter. This is probably not the right way to do it, but oh well! commit 32b2c99109 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Thu Apr 2 02:46:36 2020 +0200 Horizon mapping and "layered" map generation. Horizon mapping is a method of shadow mapping specific to height maps. It can handle any angle between 0 and 90 degrees from the ground, as long as know the horizontal direction in advance, by remembering only a single angle (the "horizon angle" of the shadow map). More is explained in common/src/msg/server.rs. We also remember the approximate height of the largest occluder, to try to be able to generate soft shadows and create a vertical position where the shadows can't go higher. Additionally, map generation has been reworked. Instead of computing everything from explicit samples, we pass in sampling functions that return exactly what the map generator needs. This allows us to cleanly separate the way we sample things like altitudes and colors from the map generation process. We exploit this to generate maps *partially* on the server (with colors and rivers, but not shading). We can then send the partially completed map to the client, which can combine it with shadow information to generate the final map. This is useful for two reasons: first, it makes sure the client can apply shadow information by itself, and second, it lets us pass the unshaded map for use with level of detail functionality. For similar reasons, river generation is split out into its own layer, but for now we opt to still generate rivers on the server (since the river wire format is more complicated to compress and may require some extra work to make sure we have enough precision to draw rivers well enough for LoD). Finally, the mostly ad-hoc lighting we were performing has been (mostly) replaced with explicit Phong reflection shading (including specular highlights). Regularizing this seems useful and helps clarify the "meaning" of the various light intensities, and helps us keep a more physically plausible basis. However, its interaction with soft shadows is still imperfect, and it's not yet clear to me what we need to do to turn this into something useful for LoD. commit f8926a5737 Merge: a1aee931e 875ae6ced Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Mar 13 13:32:42 2020 +0100 Merge remote-tracking branch 'origin/master' into sharp/map-colors commit 4c65a5aed3 Author: Treeco <5021038-Treeco@users.noreply.gitlab.com> Date: Mon Feb 24 16:48:05 2020 +0000 Made LOD setting slider exponential commit 2fa7b2d20d Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 17:49:53 2020 +0000 Added mist to LoD commit aab059a450 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 15:14:06 2020 +0000 Added LoD slider commit 779c36b538 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:54:55 2020 +0000 Reduced cost of vertex pushing commit 9fea150473 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 12:38:53 2020 +0000 Fixed maths, improved LoD resolution commit 5481df38fe Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Feb 24 11:22:50 2020 +0000 Dynamically relocate LoD vertices to enhance details commit a3e36a50ab Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 18:13:51 2020 +0000 Simpler terrain spiral rendering commit 255f450ae9 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:53:17 2020 +0000 Better LoD precision commit 3d027aebe8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 16:04:03 2020 +0000 Better falloff commit be775c9484 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Feb 23 15:30:45 2020 +0000 Applied good ideas from experimental branch commit 58587b6854 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 16:15:13 2020 +0000 Minor fixes to LoD merging commit 7b42aebd70 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 15:04:44 2020 +0000 Capped LoD dragging commit 8aafc559f8 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:54:37 2020 +0000 Better blending between LoD and terrain border commit edd3455d51 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:40:19 2020 +0000 Fixed LoD z depth, added sea level offset commit b9b0674462 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 14:27:43 2020 +0000 Better LoD smoothing commit a1aee931e7 Author: Joshua Yanovski <pythonesque@gmail.com> Date: Fri Feb 21 14:52:17 2020 +0100 Adding shadows. commit 2400786c13 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Feb 21 13:48:40 2020 +0000 Use world map as LoD source commit dbf650f504 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Mon Jan 20 00:48:14 2020 +0000 Better clouds at distance commit 5e6f81b86c Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Sun Jan 19 23:59:02 2020 +0000 sync commit 745e7540dd Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 12:40:48 2019 +0000 Improved cloud falloff mist, faster noise sampling commit f6a200d0cb Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Fri Nov 22 10:09:00 2019 +0000 Improved long-range depth precision, removed unnecessary LoD polygons commit 63d1b2bb22 Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 20:57:46 2019 +0000 Working LoD shader commit f13d98ee3e Author: Joshua Barretto <joshua.s.barretto@gmail.com> Date: Thu Nov 21 11:03:40 2019 +0000 LoD first attempt (stack overflow issue)	2020-08-20 20:34:59 +02:00
Songtronix	74557bd79d	fix: match alias validation to auth	2020-08-19 14:00:18 +02:00
Songtronix	1067e679ee	fix: locate assets more reliably	2020-08-19 14:00:10 +02:00
Songtronix	e09c1a87aa	change: log where we locate assets for debugging	2020-08-19 13:59:25 +02:00
T-Dark	0a1e715fa4	Fixed debug armor letting some damage through	2020-08-18 17:31:28 +02:00
Marcel Märtens	8687740265	fix clippy warnings in new version	2020-08-17 11:10:18 +02:00
Marcel Märtens	ed68bff135	Change the version number to 0.7	2020-08-15 11:53:59 +02:00
Imbris	a763bbe73c	Improve the perf of the physics system using par_join as well as removing the trait object closure to allow for the compiler to perform more optimizations	2020-08-13 04:32:05 -04:00
Joshua Barretto	75c1d44010	Merge branch 'zesterer/worldsim' into 'master' ... World simulation, generation, and pathfinding improvements (including castles and caves) See merge request veloren/veloren!1282	2020-08-12 21:40:56 +00:00
Joshua Barretto	e3cab272c3	Fixed floating sprites in towns, clippy fixes	2020-08-12 21:16:14 +01:00
Joshua Barretto	50a85853e3	Fmt and clippy lints fixes	2020-08-12 21:16:14 +01:00
Joshua Barretto	85ed5ad356	Updated changelog, cleaned up warnings, minor fixes	2020-08-12 21:16:11 +01:00
Joshua Barretto	15b1717295	Added decals to towns	2020-08-12 21:15:53 +01:00
Joshua Barretto	6992194ad4	Better surface swimming, no underwater sprites	2020-08-12 21:15:53 +01:00
Monty Marz	c1b07465cf	added grass sprites	2020-08-12 21:15:53 +01:00
Joshua Barretto	9329b4ce55	Added monsters to caves	2020-08-12 21:15:53 +01:00
Joshua Barretto	d7ccb28ea7	Pathfinding improvements	2020-08-12 21:15:53 +01:00
Joshua Barretto	d48ed42fda	Prevented NPCs running gleefully off cliffs without a second thought	2020-08-12 21:15:53 +01:00
Pfauenauge	ee83479748	drop gate parts	2020-08-12 21:15:53 +01:00
Joshua Barretto	dfecf0dad6	Massively improved pathfinding reliability	2020-08-12 21:15:53 +01:00
Joshua Barretto	9bb10a6d00	Various improvements to castles, dungeons and more	2020-08-12 21:15:53 +01:00
Joshua Barretto	0bad704719	Made agents flee	2020-08-12 21:15:53 +01:00
Joshua Barretto	41229b4665	Added large caves, cave scatter, removed old caves	2020-08-12 21:15:53 +01:00
Joshua Barretto	a9126f7e25	Simulation improvements, removed block glows	2020-08-12 21:15:52 +01:00
Joshua Barretto	bdb39b8e7f	Better castle variation, improved paths, multi-storey houses	2020-08-12 21:15:52 +01:00
Joshua Barretto	41916d4594	Better castles, initial light prop for lit objects	2020-08-12 21:15:52 +01:00
WelshPixie	568a3e375e	fixed sprite rotations	2020-08-12 21:15:52 +01:00
Joshua Barretto	d6cdb0c433	Began adding castles	2020-08-12 21:15:52 +01:00
Joshua Barretto	1f4cec773b	Added make_block command	2020-08-12 21:15:52 +01:00
Joshua Barretto	f21a50e393	Added forts to towns, began better economy sim	2020-08-12 21:15:52 +01:00
Monty Marz	fcdd875bff	UI fixes, assets update	2020-08-12 18:10:18 +00:00
Monty Marz	6789b7ae27	Add firework hues	2020-08-12 22:29:06 +08:00
scott-c	9aab296264	Add firework item	2020-08-12 22:25:28 +08:00
Imbris	893da3622a	Merge branch 'scott-c/particles' into 'master' ... Particles See merge request veloren/veloren!1156	2020-08-09 17:09:43 +00:00
jshipsey	45971fa403	state corrections	2020-08-08 17:05:48 -04:00
jshipsey	9ff5c23cf0	readd sneak	2020-08-08 13:47:32 -04:00
scott-c	a0107d5cda	fix rebase	2020-08-08 19:26:52 +08:00
scott-c	cc36e9c300	fix rebase	2020-08-08 19:26:52 +08:00
scott-c	bb8ba75287	cleanup redundant function	2020-08-08 19:26:52 +08:00
Joshua Barretto	7c31baef6f	Added outcome system, sound effects	2020-08-08 19:26:48 +08:00
scott-c	1a263834e7	Add campfire command	2020-08-08 19:25:33 +08:00
scott-c	bb2a5c885b	Add fireball and bomb particle effects	2020-08-08 19:25:00 +08:00
scott-c	4bc373a832	remove particle emitter component	2020-08-08 19:25:00 +08:00
scott-c	3139e85dff	allow for col particles	2020-08-08 19:25:00 +08:00
scott-c	803677f0fb	Add particle velocity and ability particle emitter	2020-08-08 19:25:00 +08:00
scott-c	da5f4828a5	Add particle lifespan	2020-08-08 19:25:00 +08:00
scott-c	39b676cd8f	Add ParticleMgr	2020-08-08 19:24:55 +08:00
scott-c	42a10a6059	Add ParticleEmitter Component	2020-08-08 19:24:22 +08:00
Monty Marz	142b386628	address comments	2020-08-08 00:13:00 -04:00
Imbris	a7df000a6f	Fireballs no longer damage group members	2020-08-08 01:16:35 +02:00
Imbris	af8560ea36	Remove pets from the group exp division calculation but still give them exp, fix bug with group code when pets are deleted	2020-08-08 01:16:35 +02:00
Imbris	390d289d35	Add timeout's to group invites, and configurable limit to group size ... Fix a few group bugs, enable invite timeout and group limits in ui	2020-08-08 01:16:35 +02:00
Monty Marz	28a8f847cc	timeout visuals, various small fixes and two new items	2020-08-08 01:15:58 +02:00
Imbris	543d971a19	Projectiles ignore entities in the same group, pets no longer follow group leader	2020-08-08 01:15:58 +02:00
Monty Marz	1eb671e1a6	Update CHANGELOG.md, german locale	2020-08-08 01:15:58 +02:00
Imbris	3a22b3694d	New group UI functions	2020-08-08 01:14:19 +02:00
Imbris	d856c20225	Integrate groups with chat groups	2020-08-08 01:12:35 +02:00
Imbris	0a8f148559	Fixes and tweaks for groups	2020-08-08 01:12:35 +02:00
Monty Marz	d9e3937a82	Basic UI ... Basic ui for groups and group window	2020-08-08 01:12:35 +02:00
Imbris	10c3d01466	Add basic group functionality (no voxygen wiring yet)	2020-08-08 01:09:01 +02:00
nepo	cb65070aba	nepo/dullahan	2020-08-07 03:56:59 +00:00
Sam	3b1163fa50	Removed commented code	2020-08-06 10:15:24 -05:00
Sam	83a6e08c7a	Removed energy refund on M2 attacks. Re-added custom heights on creatures. Tweaked movement on triple strike.	2020-08-06 09:43:50 -05:00
Silentium2318	1c40218de9	More weapon and hit box tweaks	2020-08-06 09:43:47 -05:00
Silentium2318	1de40154c7	Weapon balancing	2020-08-06 09:39:49 -05:00
Silentium2318	a59438e3e4	Dis some distance and attack arc tweaking	2020-08-06 09:39:09 -05:00
Silentium2318	b0f55b3f79	Weapon balancing	2020-08-06 09:38:22 -05:00
Imbris	c2f3e1b47f	Revert "Merge branch 'BottledByte/ability_design' into 'master'" ... This reverts merge request !1264	2020-08-06 08:04:03 +00:00
Imbris	a0b1259b7e	Merge branch 'BottledByte/ability_design' into 'master' ... Add ability IDs and use them in GUI See merge request veloren/veloren!1264	2020-08-06 04:44:51 +00:00
BottledByte	34c87d7a86	Add ability IDs and use them in GUI	2020-08-05 23:00:43 +02:00
BottledByte	ab1c43be84	Dehardcoded LanternKind, Consumable and Ingredient, fixed Sceptre hotbar ... Also fixed two wrong asset references and did some .ron formatting	2020-08-05 01:21:42 +02:00
BottledByte	a167ee98ee	De-enumerized armor variants	2020-08-03 03:41:32 +00:00
BottledByte	dc91209a7b	Removed fine-grained Item enums and replaced them with Strings ... This change allows to introduce new weapons and pair them with graphical assets without need to recompile.	2020-08-02 01:21:32 +00:00
Samuel Keiffer	f930f52df5	Allows for weapons to have different stats. Seperates healing staff out from staffs into its own weapon type: sceptre. Splits bow weapon type into shortbow and longbow.	2020-08-01 20:08:30 +00:00
Snowram	1421517f84	Add frog npc, tweak pig model	2020-08-01 02:19:45 -04:00
jshipsey	487131efb8	cyclops run anim	2020-08-01 02:19:45 -04:00
jshipsey	5d2be2240e	maneater and feed anim	2020-08-01 02:19:45 -04:00
Snowram	90d7485c38	Add troll, truffler and wendigo npcs	2020-08-01 02:19:45 -04:00
jshipsey	8991b60929	catoblepas, bonerattler, rabbit, improved anims	2020-08-01 02:19:44 -04:00
jshipsey	baf67f303e	new models, anim tweaks	2020-08-01 02:19:44 -04:00
Marcel Märtens	7f97baca70	switch to auth that doesn't use agent	2020-07-31 01:05:01 +02:00
Marcel Märtens	0d5e61c4b6	update auth to newest version	2020-07-29 19:28:22 +02:00
Marcel Märtens	96cde882ef	update auth to the newest version and remove useless dep	2020-07-29 00:05:23 +02:00
Samuel Keiffer	827b91d691	Bow charged shot attack	2020-07-26 03:06:53 +00:00
Samuel Keiffer	527e7a329e	Armor fixes	2020-07-25 23:57:04 +00:00
Monty Marz	31cfc05123	lots of things ... animation fixes by slipped new cultist item settings option for loading screen tips loot table adjustments	2020-07-23 12:10:13 +00:00
jshipsey	5b76ed23f4	small fixes	2020-07-20 21:37:13 -04:00
Imbris	3c954534ed	Merge branch 'treeco/fix-spawn-damage' into 'master' ... Reset rather than accumulate velocity when stuck or in unloaded chunks See merge request veloren/veloren!1185	2020-07-18 19:08:40 +00:00
Imbris	c7e8a6bfae	Remove gravity rather than reset velocity in unloaded chunks	2020-07-18 07:13:30 -04:00
Imbris	23e1378c78	Merge branch 'zesterer/winit-20' into 'master' ... Upgrade winit to 0.22.2 See merge request veloren/veloren!788	2020-07-18 03:26:59 +00:00
Imbris	db36578f83	Merge branch 'Menko/utility_items_fix_issue_612' into 'master' ... #612 Fixed utility items not being removed from inventory/hotbar See merge request veloren/veloren!1123	2020-07-18 02:41:45 +00:00
Nemanja	5caa6a07b0	#612 Fixed utility items not being removed from inventory/hotbar	2020-07-18 02:41:45 +00:00
Imbris	db91ebe9b5	fix a few minor bugs	2020-07-17 21:24:28 -04:00
Imbris	d1b635efa4	Rearrange PlayState system to work without loop control	2020-07-17 21:24:28 -04:00
Samuel Keiffer	6cce09be85	Added protection stat to admin armor hidden in debug folder. Removed blue cultist armor set from drop table as it is an admin set.	2020-07-18 00:05:28 +00:00
lausek	a3326b5744	fix #611; add distance check when mounting pet	2020-07-15 14:54:53 +02:00
Joshua Barretto	8d6b442193	Crafting	2020-07-14 20:11:39 +00:00
Joshua Barretto	446923f7d8	Merge branch 'zesterer/small-fixes' into 'master' ... Zesterer/small fixes See merge request veloren/veloren!1190	2020-07-14 09:54:17 +00:00
Joshua Barretto	3e5c3de2ac	Neater compass	2020-07-13 23:23:44 +01:00
Joshua Barretto	cf69d0c5d8	Added minimap compass	2020-07-10 15:00:20 +01:00
Joshua Barretto	951a977b2f	Improved hill path following	2020-07-10 00:43:11 +01:00
Songtronix	5b57072064	fix: use correct specs(-idvs) versions ... related to torvus	2020-07-09 19:46:30 +02:00
Joshua Barretto	ac30fcbd0e	Commented unused but potentially useful code	2020-07-09 16:54:10 +01:00
Joshua Barretto	47e413c530	Improved pathfinding tolerance and reliability	2020-07-09 16:54:10 +01:00
Treeco	1f1d9c5625	Reset rather than accumulate velocity when stuck or in unloaded chunks	2020-07-09 15:58:07 +01:00
Samuel Keiffer	25c28f26d6	Different body types now have different health values and gain different amounts of healths on leveling.	2020-07-09 00:04:25 +00:00
Samuel Keiffer	fe47a14ba5	Spin attack for axe	2020-07-08 19:58:41 +00:00
Ben Frankel	823141f825	Maintain character state when inventory is modified ... If the mainhand slot is swapped out or dropped while the character is wielding, the character will be set to idle (same behavior). However, if an item is picked up or used; or a non-mainhand item is dropped; or two non-mainhand items are swapped; the character state will not be set to idle (new behavior). Rationale for keeping the same behavior: Swapping a weapon out while in a wielding state can put the player in a barehanded wielding state, which would be inconsistent with the fact that that state can't be entered by toggling wield while barehanded. Rationale for setting the new behavior: Setting character state to idle was originally added because "Interact" was mapped to right mouse button, so picking up an item with RMB would also activate secondary attack if the player was wielding during the interaction. Now the default keybinding for "Interact" is E, so this isn't a problem unless the player changes their keybinding to RMB. In addition, setting character state to idle for any inventory manipulation may cause players to fall out of glider unexpectedly.	2020-07-07 09:43:48 -07:00
Marcel Märtens	85a3f8637d	fix specs	2020-07-07 14:28:00 +02:00
Marcel Märtens	c212de00c2	updated dependencies and fixed stuff ... - replace serde_derive by feature of serde incl. source code modifications to compile - reduce futures-timer to "2.0" to be same as async_std - update notify - removed mio, bincode and lz4 compress in common as networking is now in own crate btw there is a better lz4 compress crate, which is newer than 2017 - update prometheus to 0.9 - can't update uvth yet due to usues - hashbrown to 7.2 to only need a single version - libsqlite3 update - image didn't change as there is a problem with `image 0.23` - switch old directories with newer directories-next - no num upgrade as we still depend on num 0.2 anyways - rodio and cpal upgrade - const-tewaker update - dispatch (untested) update - git2 update - iterations update	2020-07-07 09:43:49 +02:00
Joshua Barretto	3cfd8bdd3c	Fixed animal loadouts and /spawn	2020-07-07 02:21:14 +01:00
Joshua Barretto	d1cdb6ea55	Updated changelog	2020-07-07 01:11:37 +01:00
Joshua Barretto	e626f6255f	Prevented pet damage	2020-07-07 01:01:39 +01:00
Joshua Barretto	f77d2f06c6	Fixed staff RMB, bug in ranged weapon code	2020-07-06 23:37:44 +01:00
Joshua Barretto	99a526f702	Made pets healable	2020-07-06 21:18:30 +01:00
Joshua Barretto	55852f9bc7	Made fireballs brighter, animals slightly more effective at combat	2020-07-06 21:02:16 +01:00
Joshua Barretto	64dc339f13	Reduced acceleration in air	2020-07-06 20:51:57 +01:00
Joshua Barretto	d943bb4537	Made pets regulate their speed	2020-07-06 20:51:23 +01:00
Imbris	8d39f27458	Upgrade hashbrown	2020-07-06 03:15:06 -04:00
Imbris	c2d6d00b00	point to github specs to access PairedStorage type, fix Loadout sync spam	2020-07-06 01:56:02 -04:00
Piotr Korgól	713d0c5e8a	Add a test for the loot table's validity	2020-07-05 18:52:36 +02:00
Joshua Barretto	43f75f2f54	Removed bomb timeout	2020-07-05 16:15:51 +01:00
Joshua Barretto	fd39ee97bc	Added training dummies	2020-07-05 16:15:51 +01:00
Joshua Barretto	2f6a618d5a	Added bombs, throwable items, more block kinds, weaker explosions	2020-07-05 16:15:48 +01:00
jshipsey	50fcd6c6a3	remove slowmo test mode	2020-07-05 10:00:44 -04:00
jshipsey	2c14b2f891	clippy fixes	2020-07-05 09:39:56 -04:00
Joshua Barretto	8508b5177b	Velocity-corrected bezier pathfinding control, swimming control	2020-07-05 09:38:15 -04:00
jshipsey	ca9ae13527	more latitude tilt, better attack anims, addressed aesthetic concerns, deleted dead assets	2020-07-05 09:38:15 -04:00
Joshua Barretto	8a0b7fd173	Smoother pathfinding for fast animals	2020-07-05 09:38:14 -04:00
jshipsey	014cab0257	remove warnings, rebase fix	2020-07-05 09:38:14 -04:00
Joshua Barretto	177bd7a128	More tolerant pathfinding	2020-07-05 09:38:14 -04:00
Joshua Barretto	db26c10299	Run tilting, per-species running speed	2020-07-05 09:38:14 -04:00
jshipsey	94ab3665d5	pangolin and special pangolin variable	2020-07-05 09:38:14 -04:00
jshipsey	c5f7a60f3b	more run animation work, adjusting pivots	2020-07-05 09:38:14 -04:00
Snowram	648e140be3	Add wolf, frostfang and mouflon npcs	2020-07-05 09:38:14 -04:00
Snowram	c22d543dd2	Add rock snapper mob	2020-07-05 09:38:13 -04:00
Snowram	1be42a8f85	Add tortoise mob	2020-07-05 09:38:13 -04:00
unknown	4b493b196c	Add asp mob	2020-07-05 09:38:13 -04:00
Snowram	9fec5f3d14	Add tiger mob	2020-07-05 09:38:12 -04:00
Snowram	c527484597	Add alligator, salamander and monitor npcs	2020-07-05 09:38:12 -04:00
Snowram	00b3301d6a	Remove quad_low mobs from quad_medium	2020-07-05 09:38:12 -04:00
Snowram	72eb03ceb5	Add quadruped_low skeleton	2020-07-05 09:38:11 -04:00
Forest Anderson	7ac5876743	Merge branch 'xvar/skills' into 'master' ... Initial implementation of skills and skill groups See merge request veloren/veloren!1135	2020-07-05 00:33:11 +00:00
Forest Anderson	3e830aa0ca	Merge branch 'angel/add-spawn-training-dummy' into 'master' ... Added spawning test dummy See merge request veloren/veloren!1142	2020-07-04 19:24:02 +00:00
Forest Anderson	2d12f7c45d	Added tests and documentation to skills.rs	2020-07-04 14:32:24 -04:00
Piotr Korgól	27440e16c4	Correctly load the loot table	2020-07-04 18:40:23 +02:00
Ben Wallis	538598eb08	Refactored Skills/SkillGroups structure and implemented JSON persistence	2020-07-04 15:25:21 +01:00
Ben Wallis	60871461ea	Moved skills stuff to new skills.rs file	2020-07-04 15:25:20 +01:00
Ben Wallis	4b0e2e45ab	Added Skills and Skill Groups for characters	2020-07-04 15:25:04 +01:00
Piotr Korgól	aefa7e2f11	Make chests and enemies use the basic loot table	2020-07-04 14:07:10 +02:00
Piotr Korgól	d101d7f132	Implemented a lottery system	2020-07-04 12:40:27 +02:00
Forest Anderson	954a4857c4	Added proper training dummy model	2020-07-03 16:53:04 -04:00
Forest Anderson	e73ec7a4d2	Added spawning test dummy	2020-07-03 16:53:04 -04:00
Marcel	1f05446ce6	Merge branch 'xMAC94x/network-switch' into 'master' ... xmac94x/network switch See merge request veloren/veloren!1139	2020-07-03 17:13:58 +00:00
Samuel Keiffer	85d1d4b3ff	Leap now actually works. In addition, leaping while next to an entity no longer interrupts the leap.	2020-07-03 15:40:12 +00:00
Marcel Märtens	15ff58cd6a	simple fmt in order to make the replacement commit as simple as possible	2020-07-03 13:11:44 +02:00
Marcel Märtens	77c90b2c7c	doing a simple 1:1 swap out network coding ... this is the part which prob has less Merge conflics and is easy to rebase the next commit will have prob alot of merge conflics followed by a fmt commit	2020-07-03 13:11:31 +02:00
Monty Marz	89400264dc	Loot ChatType, Update german translation, map zooming	2020-07-01 19:05:44 +00:00
Marcel	f9a7dbaa77	Merge branch 'scott-c/daggers' into 'master' ... Scott-c/1h-wielding #185 See merge request veloren/veloren!1095	2020-07-01 12:07:35 +00:00
scott-c	d53b51954b	Added ability to use 2 x 1h weapons or shields	2020-07-01 17:51:06 +08:00
Marcel Märtens	e1b27c51f5	fix clippy issues in tests and add it to CI	2020-07-01 00:37:15 +02:00
Marcel Märtens	6535fa5744	fix various clippy issues	2020-07-01 00:37:06 +02:00
Samuel Keiffer	44203ab817	Adds a command that allows a username to be added or removed from the whitelist	2020-06-30 12:21:36 +00:00
Forest Anderson	635c0d06f0	Merge branch 'xvar/move-sfx-from-common-to-voxygen' into 'master' ... Moved sfx from common to voxygen See merge request veloren/veloren!1125	2020-06-28 18:38:25 +00:00
Forest Anderson	a3eafe9b70	Merge branch 'yusdacra/crate2nix' into 'master' ... nix: Switch to crate2nix for building, and niv for dependency management See merge request veloren/veloren!1090	2020-06-28 18:28:29 +00:00
Ben Wallis	dc1844b489	Moved sfx from common to voxygen	2020-06-28 18:16:22 +01:00
Forest Anderson	201f513737	Fixed meta chattype error on master	2020-06-28 17:10:01 +00:00
Forest Anderson	9246e34c1b	Merge branch 'CapsizeGlimmer/chat_modes' into 'master' ... Capsize glimmer/chat modes Closes #217 See merge request veloren/veloren!1043	2020-06-28 14:35:39 +00:00
Joshua Barretto	1d06df9d79	Merge branch 'xvar/loot-pickup-msgs' into 'master' ... Implemented loot pickup chat messages (#616) and the option for playing different sounds for picked up items See merge request veloren/veloren!1118	2020-06-28 12:34:58 +00:00
Ben Wallis	a9d3f984f0	Implemented loot pickup chat messages and the option for playing different sounds for picked up items ... * Added chat message when an item is picked up * Changed InventoryUpdateEvent::Collected to InventoryUpdateEvent::Collected(Item) to facilitate the client being aware of what was picked up * Added SfxInventoryEvent enum to allow different sounds to be used based on the item type. The RON mapping/de-serialization doesn't support matching on structs so we have to give it fixed enum values which are determined in TryFrom<&InventoryUpdateEvent> for SfxEvent * Refactored InventoryManip::Pickup arm of match in inventory_manip::handle_inventory for clarity/better warning messages * Fixed a bug that prevented the CollectFailed event from being raised when a player's inventory is full * Added a panic for the situation where an item is pushed into the players inventory and then the deletion of the entity fails as this would indicate an item dupe bug - this could potentially be reworked to pull the item back from the player's inventory but this seems like there's be a more correct transactional way to do this. * Added two temporary sounds to prove the per-item sound functionality (pickup sounds for Swords and Staffs)	2020-06-28 13:05:28 +01:00
Forest Anderson	2665159790	Fixing errors after rebase	2020-06-27 19:12:12 -04:00
CapsizeGlimmer	3d29c3254a	Add setting for displaying character names in chat. Placate cargo clippy.	2020-06-27 17:43:46 -04:00
CapsizeGlimmer	59db2fcd3b	Admin status added when registering; cargo fmt	2020-06-27 17:43:45 -04:00
CapsizeGlimmer	b04810cae5	misc chat mode changes	2020-06-27 17:40:03 -04:00
CapsizeGlimmer	5ad212b7ed	Add chat types for offline, online. Implement Pfau's fixes	2020-06-27 17:40:03 -04:00
Pfauenauge90	a497fb92d3	icons	2020-06-27 17:20:26 -04:00
Pfauenauge90	f83c58498f	bubble colors	2020-06-27 17:20:26 -04:00
CapsizeGlimmer	b7d7696d89	Implement MR!1043 changes suggested by Imbris	2020-06-27 17:20:26 -04:00
CapsizeGlimmer	34acc4ddf3	Players are removed from social menu when logged out.	2020-06-27 17:20:26 -04:00
CapsizeGlimmer	aabf9d7b21	fix chat-cli name formatting.	2020-06-27 17:20:26 -04:00
Delyth Williams	6644375764	Fix sprites w/o models	2020-06-27 21:08:21 +00:00
CapsizeGlimmer	2a0f0053d4	Added chat mode icons to speech bubbles	2020-06-27 17:03:30 -04:00
CapsizeGlimmer	35ed03aa18	Implement chat mode icons in chat window	2020-06-27 17:03:30 -04:00
CapsizeGlimmer	22315a6e1d	Added shortcut for chat commands /g=>/group, /s=>/say, /w=>/world, etc.	2020-06-27 17:03:30 -04:00
CapsizeGlimmer	c984bdcdf1	Implement chat filtering for /say /region /group etc.	2020-06-27 17:03:30 -04:00
CapsizeGlimmer	5cbecb29e6	Implement /join_group and /join_faction commands	2020-06-27 16:42:26 -04:00
CapsizeGlimmer	289ef5d6b2	Move message processing and chat bubbles to the client	2020-06-27 16:42:26 -04:00
CapsizeGlimmer	0b2a3ebe8b	Re-implement names in chat. It is done client-side now and /alias changes are retroactive.	2020-06-27 16:42:25 -04:00
CapsizeGlimmer	b08d717eac	Rework chat processing	2020-06-27 16:29:03 -04:00
CapsizeGlimmer	702a21302c	Base implementation of /group /faction /say /region	2020-06-27 16:26:02 -04:00
Delyth Williams	94164b7839	Welsh pixie/armour	2020-06-26 16:26:00 +00:00
Monty Marz	58bfa4f0ef	Merge branch 'WelshPixie/FluffyBunnySlippers' into 'master' ... Added fluffy jackalope slippers See merge request veloren/veloren!1114	2020-06-25 22:07:47 +00:00
Monty Marz	c025b93501	Merge branch 'WelshPixie/grassets' into 'master' ... Welsh pixie/grassets See merge request veloren/veloren!1106	2020-06-25 21:12:31 +00:00
Delyth Williams	9a79101f57	Welsh pixie/grassets	2020-06-25 21:12:31 +00:00
Monty Marz	7d9ef93140	Merge branch 'WelshPixie/spaulders' into 'master' ... added seven new shoulder armour types See merge request veloren/veloren!1115	2020-06-25 20:50:06 +00:00
WelshPixie	2825b08bee	Added fluffy jackalope slippers	2020-06-25 22:47:17 +02:00
Joshua Barretto	1cca7bf4a8	Fmt, fixed chat-cli problem	2020-06-25 19:50:04 +01:00
Joshua Barretto	d9cd37056d	Added settings editing, set_motd command	2020-06-25 18:57:29 +01:00
Joshua Barretto	83a96c24ec	Added MOTD on login, MOTD editing	2020-06-25 18:57:26 +01:00
Joshua Barretto	b46e080ade	Added server-side maximum view distance setting	2020-06-25 18:46:04 +01:00
WelshPixie	9887e5d45d	added seven new shoulder armour types	2020-06-25 18:36:24 +02:00
Imbris	6501611372	Merge branch 'shandley/character-loading' into 'master' ... Move character DB ops off the main thread See merge request veloren/veloren!1075	2020-06-25 16:16:15 +00:00
Songtronix	f44df23935	feat: add server whitelist	2020-06-24 17:36:19 +02:00
Shane Handley	255ad97289	- Move the remaining character data loading to the message/thread formatharacter list actions ... - Handle/notify the client of errors during character load by returning to character select with the error, clean up client and server states - Add player_uuid check when loading character data.	2020-06-24 11:47:41 +10:00
Yusuf Bera Ertan	6cfa48e82e	nix: Switch to crate2nix, and niv for dependency management	2020-06-23 20:51:32 +03:00
Shane Handley	304e06cbce	Fix clippy warnings after toolchain update	2020-06-23 16:52:04 +10:00
Marcel Märtens	15fc5787e4	switch log behavior for env variable and removed gfx spam by default	2020-06-22 16:49:40 +02:00
Marcel Märtens	9485b45e70	switch to tracing stlye and enhance logs with usefull information ... - Updated CHANGELOG - reduce dependencies - found out that we have alot of duplicate coding... alot...	2020-06-22 09:53:15 +02:00
Kevin Glasson	589254e4ab	Convert all other veloren crates to use tracing ... - Completely removed both `log` and `pretty_env_logger` and replaced with `tracing` and `tracing_subscriber` where necessary. - Converted all `log::info!(...)` et al. statements to just use the shorthand macro i.e. `info!`. This was mostly to make renaming easier.	2020-06-21 23:19:41 +08:00
Forest Anderson	38af64df51	Expand on documentation	2020-06-19 21:13:00 -04:00
Marcel	babf452686	Merge branch 'xvar/fix-server-crash-on-high-char-lvl-login' into 'master' ... Server: Fixed panic on extremely high level character login due to exp overflow (#597) See merge request veloren/veloren!1091	2020-06-18 20:24:49 +00:00
Ben Wallis	54de646bb3	Server: Fixed panic on extremely high level character login due to exp overflow (#597)	2020-06-18 20:45:37 +01:00
scott-c	88d68df2c0	Remove wield requirement to swap loadout	2020-06-17 21:34:58 +08:00
Justin Shipsey	2f896849d4	Wield glider instead of weapon when attempting glide wield, change behavior when running into walls to not drop out of gliding	2020-06-16 21:32:39 +00:00
Imbris	c22f9530e4	Merge branch 'scott-c/wield-changes' into 'master' ... Scott c/wield changes See merge request veloren/veloren!1072	2020-06-15 20:51:35 +00:00
Delyth Williams	b73da5507e	added new flora	2020-06-15 16:39:21 +00:00
scott-c	b2cbf3ee8f	Adjust character state's energy regen	2020-06-15 18:13:47 +08:00
scott-c	f2f79a1b3c	reset energy regen on ability use instead of wield	2020-06-15 18:12:30 +08:00
scott-c	8bcafa6f19	automatically wield on secondary or ability3	2020-06-15 18:12:30 +08:00
Forest Anderson	361952077e	Added loadout replace test and documentation ... Finished documenting	2020-06-14 16:16:53 -04:00
Forest Anderson	c2beeef600	Added equip documentation and test	2020-06-14 13:56:17 -04:00
Forest Anderson	1649eadcdd	Add unequip tests	2020-06-14 13:56:17 -04:00
Imbris	26e53409d8	Merge branch 'xvar/clippy-globally-suppress-option_map_unit_fn' into 'master' ... Globally suppressed clippy lint option_map_unit_fn for #587 See merge request veloren/veloren!1071	2020-06-14 16:48:07 +00:00
Ben Wallis	c1c968f479	Globally suppressed clippy lint option_map_unit_fn for #587	2020-06-14 16:48:07 +00:00
Imbris	fb47115695	Merge branch 'xvar/clippy-fixes-redundant_closure_found' into 'master' ... Fixed suppressed clippy warnings for #587 - redundant_closure See merge request veloren/veloren!1065	2020-06-14 16:33:04 +00:00
Justin Shipsey	688f917308	asset ... missing fix	2020-06-14 09:22:21 +00:00
Ben Wallis	4d6c553b1b	Fixed suppressed clippy warnings for #587 - redundant_closure	2020-06-12 20:47:22 +01:00
Marcel Märtens	0e59ee901e	dependency reduction: ... - authc no longer uses reqwest - image only supports PNG - replace routille with tiny_http - several other dependencies - cargo upgrade - following improvement was measured on R7 1700X: before: - cargo build: 3076.73s user / 4:45 total / 589 dependencies - cargo test: 6118.38s user / 7:30 total / 959 dependencies after: - cargo build: 2680.54s user / 4:05 total / 480 dependencies - cargo test: 5351.81s user / 7:04 total / 791 dependencies - added xMAC94x to CODEOWNERS for Cargo.toml, he will protect them from now on and hit people with evil looks ;)	2020-06-11 20:55:34 +02:00
Ben Wallis	950c62efc6	Suppressed all existing clippy warnings in preparation for fixes as part of #587	2020-06-10 22:01:42 +01:00
Ben Wallis	de37de7f45	Initial clippy fixes as discussed in #587	2020-06-08 21:27:51 +01:00
Shane Handley	467c154582	Post-rebase fix.	2020-06-08 10:19:42 +10:00
Shane Handley	fc8bb427fb	Handle TripleStrike stages individually.	2020-06-08 10:19:42 +10:00
Shane Handley	faf04bb4f3	Fix some updated weapon references and an incomplete match after rebasing.	2020-06-08 10:19:42 +10:00
Shane Handley	987a025d36	Introduce a ToolCategory so we can ignore the specific type of weapon ... when deciding on the SFX to play when wielding/attacking.	2020-06-08 10:19:42 +10:00
Shane Handley	802bce1698	Target the specific attack types, to handle TripeStrike etc... ... Removed the Axe sfx until the animations show the swing	2020-06-08 10:19:41 +10:00
Shane Handley	d5cc5c8537	Add initial attack sfx code with bow shot sounds.	2020-06-08 10:19:41 +10:00
S Handley	e0633a238e	Update CHANGELOG and a TODO, fix safer deserialisation for inventory ... data.	2020-06-04 11:44:33 +00:00
Monty Marz	b34da9b07b	More item drops	2020-06-03 17:59:09 +00:00
Joshua Barretto	475f62b57f	Merge branch 'zesterer/small-fixes' into 'master' ... Better physics comments, removed camera snapping See merge request veloren/veloren!1034	2020-06-01 20:50:24 +00:00
Joshua Barretto	9a069c93dc	Better physics comments, removed camera snapping	2020-06-01 21:33:20 +01:00
scott-c	7eb1b2c263	Add level up network event	2020-06-01 22:04:44 +08:00
scott-c	136bf271b8	Fix social list having incorrect player count	2020-06-01 22:04:44 +08:00
scott-c	c23183b1ca	Add character name and level to social window	2020-06-01 22:04:44 +08:00
Monty Marz	f7d6f76a04	Added 36 Swords ... I added 36 sword models to the code.	2020-05-29 18:23:00 +00:00
Monty Marz	6d1ec73b47	Merge branch '561-info-popup-for-saved-waypoints-only-appear-for-the-second-time-you-visit-one' into 'master' ... Resolve "Info popup for saved waypoints only appear for the second time you visit one" Closes #561 See merge request veloren/veloren!1014	2020-05-29 11:39:12 +00:00
CapsizeGlimmer	78a06550d0	Only NPCs speak when hit. Farm animal alignment changed from NPC to Tame	2020-05-27 13:49:18 +02:00
CapsizeGlimmer	3cea76b82f	NPCs now call for help when you hit them. Redraw speech bubble dark mode.	2020-05-27 13:49:18 +02:00
CapsizeGlimmer	3c07d02218	Add a dark mode to speech bubbles; consistantly use 'speech bubble' instead of 'chat bubble'	2020-05-27 13:49:17 +02:00
CapsizeGlimmer	c65967ccdb	Chatting now creates speech bubbles	2020-05-27 13:49:14 +02:00
Justin Shipsey	ea07d744a7	orientation animation	2020-05-27 06:41:55 +00:00
CapsizeGlimmer	2a83e91242	Waypoint notifications have a 10 second cooldown	2020-05-25 02:56:31 -04:00
Joshua Yanovski	34427373ef	Make civsim and sites deterministic. ... For anything in worldgen where you use a HashMap, *please* think carefully about which hasher you are going to use! This is especially true if (for some reason) you are depending on hashmap iteration order remaining stable for some aspect of worldgen.	2020-05-21 21:43:54 +02:00
Joshua Barretto	012aebbfd6	Merge branch 'zesterer/small-fixes' into 'master' ... Camera tweaks See merge request veloren/veloren!1004	2020-05-19 17:35:43 +00:00
Forest Anderson	db302b8525	Merge branch 'jbeich/veloren-freebsd' into 'master' ... Enable system assets on more Unices See merge request veloren/veloren!1005	2020-05-19 00:20:07 +00:00
Joshua Barretto	f1b166d15d	Innumerable camera improvements	2020-05-18 23:40:28 +01:00
Jan Beich	886cad9103	Enable system assets on more Unices	2020-05-18 15:53:50 +00:00
Justin Shipsey	9e5c0ce601	Merge branch 'silentium/arms-and-armor' into 'master' ... Added 2 sets of armour. See merge request veloren/veloren!951	2020-05-17 19:03:00 +00:00
Silentium	1673a25e8b	Added 2 sets of armour.	2020-05-17 19:02:59 +00:00
Monty Marz	ecb7963730	Pfau/0.6 bg	2020-05-16 12:48:29 +00:00
Marcel Märtens	ec03c4518a	Change the version number to 0.6	2020-05-16 00:50:40 +02:00
Joshua Barretto	db59a3ca3d	Merge branch 'small-fixes' into 'master' ... Dungeon Bosses See merge request veloren/veloren!994	2020-05-15 19:07:11 +00:00
Joshua Barretto	aac28d04d5	Added dungeon bosses, boss loot, boss arenas	2020-05-15 16:05:50 +01:00
Songtronix	c3e1fd8664	Merge branch 'mockersf/fix-doc-generation' into 'master' ... fix doc generation See merge request veloren/veloren!993	2020-05-15 14:18:15 +00:00
Shane Handley	a41576e767	Correctly set the exp target for the next level when spawning a character. ... Removed the unwrap_or from the update method for stats persistence, and have a dedicated method for updating single rows with a new connection.	2020-05-15 13:27:26 +10:00
François Mockers	ae712f77a2	fix iterator type	2020-05-14 22:13:08 +02:00
CapsizeGlimmer	0a723614f9	Popup message when setting waypoint	2020-05-14 16:56:10 +00:00
Forest Anderson	acab072a63	Merge branch 'shandley/persistence-stats' into 'master' ... Stats Persistence See merge request veloren/veloren!970	2020-05-13 13:43:22 +00:00
Imbris	8f857e6e11	Fill in entity_count in metrics	2020-05-12 19:44:27 -04:00
Shane Handley	e852e0cfab	- Update the stats of characters individually, reverting the change with ... big combined updates. - Add a timer to the stats persistence system and change the frequency that it runs to 10s - Seperate the loading of character data for the character list during selection, and the full data we will grab during state creation. Ideally additional persisted bits can get returned at the same point and added to the ecs within the same block.	2020-05-13 09:14:09 +10:00
Shane Handley	7c6c9f4302	Stats persistence ... - Update client code to use persisted stats - Add a system for stats persistence - Add a basic scheduler to control duration between execution of persistence systems	2020-05-13 09:14:08 +10:00
Shane Handley	e5853dbdd4	Initial models, migration and client code for stats persistence.	2020-05-13 09:14:08 +10:00
jshipsey	ef70949d5d	cyclops	2020-05-11 21:44:21 -04:00
Imbris	7233dbee3e	Merge branch 'CapsizeGlimmer/tab_completion' into 'master' ... Tab completion code review suggestions Closes #553 See merge request veloren/veloren!979	2020-05-11 23:56:48 +00:00
CapsizeGlimmer	49d1225823	Tab completion code review suggestions	2020-05-11 18:02:21 -04:00
Forest Anderson	28402e2bc1	Merge branch 'CapsizeGlimmer/tab_completion' into 'master' ... Capsize glimmer/tab completion See merge request veloren/veloren!972	2020-05-11 17:49:26 +00:00
Imbris	81227b917f	fix leaning	2020-05-11 00:53:37 -04:00
Imbris	48a5001392	Show component in error message when sync modification fails because it does not exist	2020-05-11 00:09:17 -04:00
Imbris	8aa88b22a5	Fix panic with dragging into the same loadout slot	2020-05-11 00:08:43 -04:00
CapsizeGlimmer	3f76d1d702	Rework tp command - "/sudo player /tp" is short for "/sudo player /tp sudoer"	2020-05-10 19:17:34 -04:00
CapsizeGlimmer	9d118b55a0	Fixed player list tab completion	2020-05-10 19:17:17 -04:00
CapsizeGlimmer	b486de28ac	Implement tab completion of enums (/object /time /spawn) and numbers	2020-05-10 19:16:34 -04:00
CapsizeGlimmer	28e94afd3f	Finish tab completion implementation	2020-05-10 19:16:15 -04:00
CapsizeGlimmer	b0f0d716be	Tab completion returns real results	2020-05-10 19:16:15 -04:00
CapsizeGlimmer	7ecea34f85	Server server::cmd depends on common::cmd	2020-05-09 21:50:51 -04:00
CapsizeGlimmer	307e478671	Groundwork for tab completion of player names and command arguments	2020-05-09 21:24:33 -04:00
jshipsey	cf392b5a66	fmt	2020-05-09 18:11:25 -04:00
jshipsey	62bd79dba7	dragon and general animation cleanup	2020-05-09 18:10:24 -04:00
Snowram	5b77c74497	Add cockatrice	2020-05-09 18:09:27 -04:00
Robin Gilh	40360ff149	Dragon work	2020-05-09 18:07:31 -04:00
S Handley	5a13b54cbf	- Load characters after login. ... - Make the character screen load with an empty character list from the server, send event to the server for character creation with data, but not yet saving them to the DB. - Working but messy character saving to DB - Add the character_data to the client, rather than keep it in the GLobalState.	2020-05-09 15:41:25 +00:00
CapsizeGlimmer	63826d1a50	Add optional argument to /get_items	2020-05-07 18:39:48 +00:00
Monty Marz	b589c3fc71	Fix animals not attacking	2020-05-04 16:59:32 +00:00
CapsizeGlimmer	4e7f8c686a	Equipped lanterns now provide an illumination effect.	2020-05-04 15:15:31 +00:00
Monty Marz	f5c2341167	Shoulder offsets, meta.ron versioning	2020-05-01 21:27:12 +00:00
Monty Marz	c792cc05a9	Villagers and Cultists	2020-04-30 20:43:24 +00:00
Joshua Barretto	d0b1c9eb6f	Added dungeon entrances	2020-04-29 17:01:34 +02:00
Justin Shipsey	171e865f57	new animals	2020-04-28 03:13:23 +00:00
Joshua Barretto	bd58be9f58	fmt	2020-04-26 17:56:09 +01:00
Joshua Barretto	bd2093c819	Fixed projectile solid collisions	2020-04-26 17:56:09 +01:00
Joshua Barretto	58b30c4518	Stopped velocity when point particles hit walls	2020-04-26 17:56:09 +01:00
Joshua Barretto	b750b2b00c	Fixed logic issue with sticky objects	2020-04-26 17:56:09 +01:00
Joshua Barretto	8e0f40c71e	Added on_ceiling check for sticky entities	2020-04-26 17:56:09 +01:00
Joshua Barretto	eb23b0b2bd	Added Colliders, made projectiles point particles	2020-04-26 17:56:09 +01:00
Justin Shipsey	6fa13bcb7e	body/anim tweaks	2020-04-26 01:09:03 +00:00
Joshua Barretto	d2ab29b8bd	Clean up reexport	2020-04-25 21:44:23 +01:00
Joshua Barretto	90de779559	Better LoD variable names	2020-04-25 21:44:23 +01:00
Joshua Barretto	8871cb2d29	Better scaled rounding	2020-04-25 21:44:23 +01:00
Joshua Barretto	f34175a5a8	Reduced scaling size inflation	2020-04-25 21:44:23 +01:00
Joshua Barretto	3e62f7edc3	Better LoD distance scaling	2020-04-25 21:44:23 +01:00
Joshua Barretto	1d75f4815b	Massively reduced 'popping' of LoD terrain sprites	2020-04-25 21:44:23 +01:00
Joshua Barretto	e498d78b6c	Fixed boundary meshing issue for scaled terrain sprites	2020-04-25 21:44:23 +01:00
Joshua Barretto	59f4161f5c	Properly fixed all gaps on positive bound for scaled volumes	2020-04-25 21:44:23 +01:00
Joshua Barretto	e84c2aa1db	Fixed gaps in LoD sprites	2020-04-25 21:44:23 +01:00
Joshua Barretto	b2c8dc0806	Added terrain sprite LoD	2020-04-25 21:44:23 +01:00
Joshua Barretto	2a6a19f7ef	fmt	2020-04-23 18:19:42 +01:00
Joshua Barretto	444f2ecb45	Made /waypoint admin-only, MR cleanup	2020-04-23 18:19:41 +01:00
Joshua Barretto	a7b5d6b270	Fix minor bugs with NPCs	2020-04-23 18:19:41 +01:00
Joshua Barretto	60bf396e4f	Added doors to houses	2020-04-23 18:19:41 +01:00
Joshua Barretto	68732bebde	Fixed block snapping for bizarre block heights	2020-04-23 18:19:41 +01:00
Monty Marz	44c5002db3	Pfau/crops	2020-04-23 18:19:41 +01:00
Joshua Barretto	431b2ae07b	Fixed window mask layering, fmt	2020-04-23 18:19:41 +01:00
Joshua Barretto	781a3e1377	Patched but not fixed pathfinding for variable-sized blocks	2020-04-23 18:19:41 +01:00
Joshua Barretto	77d0292e91	Added windows to buildings and scarecrows	2020-04-23 18:19:41 +01:00
Joshua Barretto	0329b355ef	Made civsim paths visible in-game	2020-04-23 18:19:41 +01:00
Pfauenauge90	db5311189d	scarecrow	2020-04-23 18:19:41 +01:00
Pfauenauge90	43b4ae6e47	Update block.rs	2020-04-23 18:19:41 +01:00
jshipsey	a89b28e117	adjusted run animation to allow villager walking	2020-04-23 18:19:41 +01:00
Pfauenauge90	98704a4753	turnip and window blocks	2020-04-23 18:19:41 +01:00
Joshua Barretto	708f15915a	Agent adjustments, better dungeon stairwells	2020-04-23 18:19:41 +01:00
Joshua Barretto	d28f5f24fb	Made agents cleverer	2020-04-23 18:19:41 +01:00
Joshua Barretto	8af3187df4	Made tomatoes taller	2020-04-23 18:19:41 +01:00
Joshua Barretto	6448c17110	Fixed sprite AO, overhauled entity spawning, better enemy spawning in dungeons, made agents more skilled at combat	2020-04-23 18:19:41 +01:00
Monty Marz	0fb3a115da	Add more crops	2020-04-23 18:19:41 +01:00
Joshua Barretto	e3ebdc56b3	Fixed figure AO (still need to do sprite AO), added more control over NPC spawning, loot in dungeons	2020-04-23 18:19:41 +01:00
Joshua Barretto	866fd1992e	Fixed bad AO quad flipping in dark places, bosses spawning in dungeon walls, large creatues being uncompromisingly pedantic when trying to path towards targets	2020-04-23 18:19:41 +01:00
Joshua Barretto	fd14223c33	Basic boss spawning in dungeons, better AO	2020-04-23 18:19:41 +01:00
Joshua Barretto	f999edffaa	Fixed crop crash issues	2020-04-23 18:19:41 +01:00
Pfauenauge90	4b72a07e22	sprites	2020-04-23 18:19:41 +01:00
Pfauenauge90	fd3ffdf28b	pizza sprite	2020-04-23 18:19:40 +01:00
Pfauenauge	67f27ef970	ember sprite	2020-04-23 18:19:40 +01:00
Joshua Barretto	dde0319293	Lighting improvements, fixed NaN issue for agents	2020-04-23 18:19:40 +01:00
Joshua Barretto	cee1b1f962	Basic trading simulation	2020-04-23 18:19:40 +01:00
Joshua Barretto	46190aa634	Began work on basic economic simulation	2020-04-23 18:19:40 +01:00
Joshua Barretto	348003fc1a	Better track routing for civsim	2020-04-23 18:19:40 +01:00
Joshua Barretto	fe4418bc0d	Added store	2020-04-23 18:19:40 +01:00
Joshua Barretto	41b77a9b10	Removed old settlement code, removed zcache from dependency of site generators for forward compatibility	2020-04-23 18:19:40 +01:00
Joshua Barretto	d91d66027a	Fixed cloud bugs, made pets run into you less	2020-04-23 18:19:40 +01:00
Joshua Barretto	944a37b848	Initial settlement generation work	2020-04-23 18:19:40 +01:00
Songtronix	866cfa3a8f	Merge branch 'ElXreno/proper-assets-path-finding' into 'master' ... Find assets by using other environment variables See merge request veloren/veloren!912	2020-04-15 10:38:00 +00:00
Imbris	9ff816f006	Clarify todo comment	2020-04-12 15:35:43 -04:00
ElXreno	4cdc1300a1	Find assets by using other environment variables ... By using HOME, XDG_DATA_HOME and XDG_DATA_DIRS we can build potentially proper paths for finding assets folder.	2020-04-12 20:25:29 +03:00
Imbris	f52d66d721	Fix selecting and remove amount text when dragging	2020-04-12 18:41:06 +02:00
Imbris	c1c09dce1b	Enable unequipping as well as equipping to specific slots	2020-04-12 18:41:06 +02:00
Pfauenauge90	eb7ded989f	7 dwarf accessories	2020-04-12 18:41:03 +02:00
Pfauenauge90	2263b9be95	starter chest, removed unused key commands	2020-04-12 18:41:02 +02:00
Pfauenauge90	85f9f80024	starter equip	2020-04-12 18:41:00 +02:00
Pfauenauge90	ca667fd02b	tooltips	2020-04-12 18:40:58 +02:00
Pfauenauge90	156b554023	item types	2020-04-12 18:40:57 +02:00
Pfauenauge90	f5a768dccf	more armour types	2020-04-12 18:40:56 +02:00
Pfauenauge90	7f97fbac0b	cape item	2020-04-12 18:40:56 +02:00
Pfauenauge90	771baaaae5	cape item	2020-04-12 18:40:55 +02:00
Imbris	0b932ae99a	Use new slot widget for armor slots	2020-04-12 18:40:53 +02:00
Piotr Korgól	84b1abdfcb	Prevent projectiles from hitting their owners	2020-04-06 23:08:54 +02:00
Imbris	4652ae2f03	Show errors loading individual files during glob asset loading	2020-04-01 20:37:23 -04:00
Imbris	831d7c77a6	Make Asset impls avoid panics when parsing fails	2020-04-01 20:06:15 -04:00
Imbris	97148cb6bb	Merge branch 'master' into 'combat' ... # Conflicts: # CHANGELOG.md	2020-04-01 20:42:27 +00:00
Imbris	83c7a944da	fmt	2020-04-01 11:52:44 -04:00
AdamWhitehurst	1ea2abd247	better timing const name, ... timing_delay 400 -> 350	2020-04-01 08:40:25 -07:00
AdamWhitehurst	2b10797db1	refactor transition logic (thx imbris)	2020-04-01 08:39:18 -07:00
Imbris	a73d010f7b	Point to newly released vek, add todo to reconsider empty item, remove uneeded ori slerp, remove agent from character behavior, add todos to combat sys, check if entities still exist before possessing & if possessed entity has a loadout move the active item into the second item space	2020-04-01 11:15:14 -04:00
AdamWhitehurst	9ad9a24e22	Remove unused KnockUp LocalEvent (use ApplyForce)	2020-04-01 07:30:06 -07:00
AdamWhitehurst	0c4d428298	remove unnecessary line	2020-04-01 07:10:35 -07:00
AdamWhitehurst	e04fdd715e	expose and use blocking consts	2020-04-01 07:07:10 -07:00
AdamWhitehurst	237393993f	triple_strike combo timing window 600 -> 400	2020-04-01 06:43:28 -07:00
AdamWhitehurst	95bc486f7c	Roll move_dir handling 1.5 -> 0.25	2020-04-01 06:42:56 -07:00
AdamWhitehurst	56fab6db09	Roll duration 500 -> 700ms	2020-04-01 06:24:02 -07:00
AdamWhitehurst	89f441ae2c	Roll speed 15.0 -> 25.0	2020-04-01 06:23:26 -07:00
Imbris	b3791a2b4e	Upgrade vek version so that it actually uses the patch	2020-03-30 19:44:51 -04:00
AdamWhitehurst	dcc9d44b1c	remove unused timed_combo	2020-03-29 13:40:03 -07:00
AdamWhitehurst	86b0b8f644	triple_strike orientation	2020-03-28 13:50:42 -07:00
Imbris	d3b5b1e637	Remove None variant fromm armor types	2020-03-28 03:51:24 -04:00
Imbris	f551c4a2c5	Move armor types to a new location, use a const for the moving cutoff in voxygen anims	2020-03-28 01:52:12 -04:00
Imbris	ce0f54e9d6	Combine dir and force in KnockUp and ApplyForce events	2020-03-27 22:19:23 -04:00
Imbris	ba3fa16c33	Create Dir type for better enforcement of non NaN, normalized representations of directions	2020-03-27 22:02:07 -04:00
Imbris	df5a7ef0e3	split toggle events	2020-03-27 21:32:30 -04:00
AdamWhitehurst	1d51f8fc0f	prevent transition if pressing too early & timed	2020-03-27 11:17:34 -07:00
AdamWhitehurst	e4f2bf7ebf	prevent holding to time combo	2020-03-27 11:08:10 -07:00
AdamWhitehurst	02b29efbfc	Undo mistake, axe ability corrected. ... Axe m2 cost 0 -> 100 Axe m2 dmg 8 -> 12	2020-03-27 11:07:21 -07:00
AdamWhitehurst	233595737e	Axe m2 dmg 10 -> 15 ... Axe m2 cost 0 -> 50	2020-03-27 11:03:07 -07:00
AdamWhitehurst	d774091fa4	Add triple_strike anims for axe and hammer	2020-03-27 11:00:58 -07:00
AdamWhitehurst	8eb233bdbc	Add timing window duration to triple strike	2020-03-27 10:43:18 -07:00
AdamWhitehurst	01264ce167	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-27 10:40:19 -07:00
AdamWhitehurst	2ffac59aa3	add triple strike timing	2020-03-27 10:40:15 -07:00
timokoesters	c6e635c511	Increase movement speed, make npcs slower than players	2020-03-27 18:39:26 +01:00
Pfauenauge90	0b3fb2dd3c	fire bolt visuals	2020-03-27 18:31:45 +01:00
timokoesters	6fe5c5724c	Fix char selection not showing tools	2020-03-27 18:17:41 +01:00
timokoesters	ad0314b4f5	Projectile hits regenerate energy	2020-03-27 17:07:19 +01:00
AdamWhitehurst	4bfc934772	triples strike knockback 15.0 -> 16.0	2020-03-27 08:26:53 -07:00
AdamWhitehurst	31760d220a	triple_strike knockback 20.0 -> 15.0	2020-03-27 08:17:17 -07:00
AdamWhitehurst	c1647e93f1	make triple strike continue without hits again	2020-03-27 07:03:26 -07:00
Marli Frost	3c36862f42	fix: connect to LOCALHOST address in tests ... Windows doesn't allow us to connect to the Any (0.0.0.0) address, instead returning the WSAEADDRNOTAVAIL error code. https://docs.microsoft.com/en-us/windows/win32/winsock/windows-sockets-error-codes-2	2020-03-27 10:50:45 +00:00
Shane Handley	362771be4b	SFX and unit test fixes.	2020-03-27 12:06:25 +11:00
timokoesters	7a9c7628db	Fix triplestrike bug	2020-03-26 23:29:12 +01:00
timokoesters	2b68adff51	Balancing, make fireball not holdable, arrow knockback	2020-03-26 22:56:33 +01:00
timokoesters	8010e5afb4	Better equip durations, fix roll bug, slow down while attacking, smoother gliding, stronger npcs, giants	2020-03-26 22:56:33 +01:00
timokoesters	e573fbbce5	Better glider physics	2020-03-26 22:56:33 +01:00
timokoesters	b9c85b9beb	Balancing	2020-03-26 22:56:33 +01:00
AdamWhitehurst	8d1f93a2d1	ore responsive oreintating	2020-03-26 14:48:51 -07:00
AdamWhitehurst	7f1a90ae27	Prevent transition if failed hit	2020-03-26 14:44:39 -07:00
Shane Handley	0446a56f00	Regen energy when sitting.	2020-03-26 18:23:57 +11:00
Imbris	e6f50b4032	Replace uses of normalized() to avoid setting ori to NaN values, tweak triple strike code	2020-03-25 18:49:15 -04:00
timokoesters	ae0a3076e3	Allow holding ability keys again	2020-03-25 23:10:50 +01:00
timokoesters	74eacbe27c	fix "Npcs can't be healed anymore"	2020-03-25 22:57:14 +01:00
Pfauenauge90	8b05dda1d9	assset cleanup, transparency, new icons	2020-03-25 16:47:48 +01:00
AdamWhitehurst	964256541e	batter loadout swap logic	2020-03-25 07:58:26 -07:00
AdamWhitehurst	857652ee23	Update triple_strike: ... * add knockback * prevent infinite repeat * more dashes	2020-03-25 07:24:55 -07:00
Imbris	3889ec7292	climbing tweaks, fix triple strike overflow, fix Last<CharacterState> ... not registered	2020-03-25 02:05:28 -04:00
Imbris	6ba158b7e1	Input handling changes	2020-03-25 01:38:37 -04:00
Adam Whitehurst	37ec191021	update controller tick fn	2020-03-25 01:38:25 -04:00
Imbris	2897e898c2	move character state component to section reflecting its current sync strategy	2020-03-25 01:37:56 -04:00
timokoesters	7f02f5e7d2	Npcs can't be healed anymore	2020-03-24 23:03:57 +01:00
timokoesters	2117bb05d0	Healing staff	2020-03-24 22:03:11 +01:00
timokoesters	f0ce088810	Add lights and gravity again	2020-03-24 20:31:54 +01:00
timokoesters	58585e0810	Better climbing, fireball impl	2020-03-24 20:09:23 +01:00
timokoesters	ea2500e7ab	Add minimum prepare duration to fireball and bow	2020-03-24 14:42:31 +01:00
timokoesters	99e7e1f785	Split staff into 3 abilities	2020-03-24 14:00:22 +01:00
Pfauenauge90	060ebbc861	healing sceptre	2020-03-24 01:11:14 +01:00
timokoesters	43d4e8aad2	Better inventory counter	2020-03-24 00:38:00 +01:00
timokoesters	1c145e8d3a	Add inventory counter	2020-03-24 00:23:21 +01:00
timokoesters	fbb24e7c8a	Even better fireballs	2020-03-23 22:52:35 +01:00
timokoesters	0eebf945fe	Glowing fireballs, no gravity	2020-03-23 13:55:52 +01:00
timokoesters	5194cef03a	Easier swimming, better damage calculation for explosions	2020-03-23 12:50:08 +01:00
timokoesters	fb16106960	Merge remote-tracking branch 'origin/master' into combat	2020-03-23 11:30:47 +01:00
Adam Whitehurst	68e3e36c6a	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-22 12:50:55 -07:00
Adam Whitehurst	a510283277	update triple_strike	2020-03-22 12:50:52 -07:00
timokoesters	f3ca06aa71	feat: fireball explosions	2020-03-22 20:40:16 +01:00
timokoesters	0456d3cbed	Better staff M1, random +1 damage, better attackrange,angle impl	2020-03-22 16:26:32 +01:00
Pfauenauge90	387ab4a57e	added new stuff to chests	2020-03-22 16:19:30 +01:00
Pfauenauge90	662f5b1037	removed warnings and item test values	2020-03-22 14:55:08 +01:00
Pfauenauge90	61e2a986f2	item images	2020-03-22 14:38:21 +01:00
Adam Whitehurst	5016b8da3a	consistent naming	2020-03-22 05:49:48 -07:00
Adam Whitehurst	db8d89a4d9	* rename CharacterState equals() -> same_variant()	2020-03-22 05:46:09 -07:00
Adam Whitehurst	afa6e43dd5	* remove Component Trait from CharacterAbility	2020-03-22 05:45:39 -07:00
Imbris	41c424ac13	Optimized uses of emitters, cleanup	2020-03-22 00:49:46 -04:00
Pfauenauge	f6731dc770	cloth armor	2020-03-22 00:21:11 +01:00
Adam Whitehurst	366978f16e	remove CharacterAbility ecs component sync	2020-03-21 16:04:45 -07:00
Adam Whitehurst	68ae715a9e	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-21 15:55:23 -07:00
Adam Whitehurst	862efb147c	clean up based on pr review comment	2020-03-21 15:55:20 -07:00
Imbris	f399085974	Flip models for hands, shoulders, and feet of humanoids	2020-03-21 18:48:21 -04:00
Adam Whitehurst	b96d71a8c7	Reset vel on triple_strike	2020-03-21 15:06:42 -07:00
Adam Whitehurst	c5378b7065	Better triple_strike handling	2020-03-21 14:55:04 -07:00
Adam Whitehurst	819c2767bc	* move swap loadout to handle_swap_loadout util fn ... * impl From<JoinData> for StateUpdate	2020-03-21 14:16:26 -07:00
timokoesters	5361705ca7	fix sfx	2020-03-21 21:01:50 +01:00
Adam Whitehurst	3ae2b8de2e	Remove excess code	2020-03-21 10:32:32 -07:00
Adam Whitehurst	180ec89060	add SwapLoadout	2020-03-21 10:26:38 -07:00
Adam Whitehurst	7eaf6f664b	Fix water swimming jump velocity	2020-03-21 09:45:26 -07:00
Adam Whitehurst	79de60d791	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-21 07:08:14 -07:00
Adam Whitehurst	cb04df7736	swim now uses handle_orientation fn	2020-03-21 07:06:35 -07:00
Imbris	08db424169	Add safe_slerp function that ensures that slerping returns non-NaN normalized values	2020-03-21 00:53:41 -04:00
Adam Whitehurst	ae175e57f3	Tweaking consts	2020-03-20 15:20:14 -07:00
Adam Whitehurst	0cdb80427d	better triple_strike	2020-03-20 15:03:29 -07:00
timokoesters	44ec09a8e7	Go to idle state when picking items up	2020-03-20 20:23:04 +01:00
timokoesters	df858cb370	Remove all warnings	2020-03-20 15:45:36 +01:00
timokoesters	3ec2cc08b3	Experimental tweeks to triplestrike	2020-03-20 15:06:33 +01:00
timokoesters	c630df7f9a	Ranged weapons now give xp on kill and also make enemies angry	2020-03-20 14:26:18 +01:00
timokoesters	835f3f5fe3	Arrows shouldn't turn into loot, staff shoots fireballs again	2020-03-20 11:25:53 +01:00
Pfauenauge90	6094e4b017	added chest drops	2020-03-20 01:11:02 +01:00
Adam Whitehurst	bb76cc37bd	Oops	2020-03-19 16:14:04 -07:00
Adam Whitehurst	0b7a572178	update triple_strike	2020-03-19 15:40:03 -07:00
Pfauenauge90	3a55ae5848	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-19 22:36:45 +01:00
Pfauenauge90	3145b26cd6	item images	2020-03-19 22:36:40 +01:00
timokoesters	208245e82e	Make orientation not dependend on camera dir while wielded	2020-03-19 22:03:17 +01:00
Pfauenauge90	ce5eb2e2ab	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-19 19:34:05 +01:00
Pfauenauge90	3c0e070ed0	stack numbers	2020-03-19 19:33:59 +01:00
timokoesters	83be1226ef	Set dash direction based on look_dir	2020-03-19 18:33:10 +01:00
timokoesters	bb1b3ceabc	Fix syncing amount	2020-03-19 17:44:32 +01:00
timokoesters	22652cfa37	Restore old boost stick behavior	2020-03-19 17:01:58 +01:00
timokoesters	449ae22730	Add inventory stacking	2020-03-19 14:32:17 +01:00
Pfauenauge90	d863e12235	swift leather armour parts	2020-03-19 14:17:53 +01:00
Pfauenauge90	509615c15b	npc armour	2020-03-18 23:09:58 +01:00
Imbris	1a484410ca	Delete Vel and Ori on the client when they are removed on the server	2020-03-18 17:01:51 -04:00
Pfauenauge90	4d9327cef5	2 weapons	2020-03-18 21:05:20 +01:00
timokoesters	4741e41230	Add support for different models per weapon type	2020-03-17 18:28:07 +01:00
Joshua Barretto	95eeb7e145	Omitted unnecessary test	2020-03-17 16:37:39 +00:00
Pfauenauge90	40910b28e4	unclothed parts	2020-03-17 15:39:29 +01:00
Joshua Barretto	4580752e78	Fixed remaining pathfinding issues	2020-03-17 14:14:20 +00:00
timokoesters	19a09782a0	Add ability requirements system	2020-03-17 15:01:41 +01:00
timokoesters	f32eb1db75	fix dash attack angles, arrow damage and readd possession stick impl	2020-03-17 14:15:39 +01:00
timokoesters	b040e18246	Fix body parts not changing	2020-03-16 22:06:23 +01:00
timokoesters	b3057add42	Smaller damage and health numbers	2020-03-16 19:55:12 +01:00
timokoesters	d5db1f6ca0	Add dash ability to sword M2	2020-03-16 16:34:53 +01:00
timokoesters	81591fcaf7	Make npcs attack again	2020-03-16 14:27:52 +01:00
timokoesters	1279f70184	Add shield item	2020-03-16 13:40:14 +01:00
timokoesters	4195273cf9	Adjust first person camera and underwater wield orientation	2020-03-16 13:19:51 +01:00
timokoesters	87acc01d48	Readd ranged and debug boost. Add bouncing while running in first person	2020-03-16 12:32:57 +01:00
timokoesters	1f78344d6f	Move equipment from loadout into body	2020-03-15 19:44:47 +01:00
Pfauenauge90	bf1c46d596	item images	2020-03-15 16:42:09 +01:00
Pfauenauge90	913393963a	plate armour	2020-03-15 16:42:09 +01:00
Joshua Barretto	e20feeeb0c	Added armour items and equipping of armour	2020-03-15 16:42:09 +01:00
Pfauenauge90	e80750bc53	plate chest armour	2020-03-15 15:53:51 +01:00
Pfauenauge90	5a962771d9	assassin armour	2020-03-15 15:53:51 +01:00
timokoesters	4e281e22b7	Merge branch 'clientstates' of gitlab.com:veloren/veloren into clientstates	2020-03-15 15:43:52 +01:00
timokoesters	aa963b7686	Merge remote-tracking branch 'origin/master' into clientstates	2020-03-15 15:27:06 +01:00
AdamWhitehurst	6078b9a468	Merge branch 'clientstates' of https://gitlab.com/veloren/veloren into clientstates	2020-03-15 08:24:40 -06:00
timokoesters	447617dc69	Make durations and damage depend on weapon type	2020-03-15 14:34:17 +01:00
AdamWhitehurst	7520798567	Damage increase, remove lines	2020-03-15 07:26:42 -06:00
AdamWhitehurst	52059d83d3	add knockback localevent	2020-03-15 07:20:42 -06:00
Songtronix	e72f0c6d12	fix: do not depend on hash file during runtime	2020-03-15 09:02:56 +01:00
timokoesters	598a4c6cbb	Add loadout struct for info on weapon configurations	2020-03-14 22:33:20 +01:00
AdamWhitehurst	7dfe00b674	Finish state struct data refactor	2020-03-14 15:17:27 -06:00
AdamWhitehurst	ee706fa32a	Tweaking timed_combo	2020-03-14 13:04:04 -06:00
AdamWhitehurst	6fc94c22ba	Update timed combo, add CharacerBehavior trait	2020-03-14 12:50:07 -06:00
timokoesters	fe19698d52	Make abilities depend on weapon	2020-03-14 16:40:29 +01:00
Adam Whitehurst	ac1c279a9b	Begin TripleStrike Logic	2020-03-12 08:22:42 -07:00
Adam Whitehurst	00e4ad61f7	add ToolData::get_primary_abilities()	2020-03-12 07:47:27 -07:00
Adam Whitehurst	68dd8c578f	Add some ability costs	2020-03-12 07:36:02 -07:00
Adam Whitehurst	990ea5c5a2	Add triple_strike behavior to cs behavior sys	2020-03-12 07:34:24 -07:00
Adam Whitehurst	772f7ff92d	Remove can_transition and begin triple_strike	2020-03-12 07:33:19 -07:00
Adam Whitehurst	3cb288bc8c	Add TripleStrike	2020-03-12 07:25:06 -07:00
Adam Whitehurst	a64bf1ac60	TripleAttack -> TimedCombo ... (it wasnt the right logic for the tiple attack)	2020-03-12 05:16:40 -07:00
S Handley	bc692c0101	Add audio and chat message feedback when the player attempts to collect something while thier inventory is full.	2020-03-11 10:30:59 +00:00
Imbris	a4eaeb1da6	Merge branch 'imbris/se-latency' into 'master' ... Rearrange some operations in the server tick to reduce clientside latency of ServerEvent mediated effects See merge request veloren/veloren!840	2020-03-10 23:21:57 +00:00
Acrimon	406767ae31	Merge branch 'capucho/voxygen-logout-timeout' into 'master' ... FIX #513 logout timeout See merge request veloren/veloren!837	2020-03-10 22:12:29 +00:00
S Handley	b2312a0487	Check that a targeted collectible is within a certain pickup range of the character before highlighting it	2020-03-10 20:50:04 +00:00
Capucho	5fe9521233	Fix the spam on disconnect	2020-03-10 20:34:50 +00:00
Capucho	9d805a745e	Proper fix to the logout timeout problem using Disconnect ACK	2020-03-10 20:34:50 +00:00
Capucho	d8ba63ffdc	Janky fix of the logout timeout problem	2020-03-10 20:34:50 +00:00
timokoesters	a3fc3c3122	exit basic_attack when no weapon is equipped	2020-03-10 20:40:54 +01:00
timokoesters	841a2bbd6d	clean up old states, lower gravity	2020-03-10 19:12:16 +01:00
timokoesters	0ce451a8b1	fix: deny gliding/jumping/rolling under water	2020-03-10 19:00:49 +01:00
timokoesters	70027da9aa	feat: hitting enemies with basic_attack gives energy	2020-03-10 18:54:59 +01:00
timokoesters	c88c4687f3	fix: stop switching quickly between climbing and idle at low energy	2020-03-10 17:33:36 +01:00
Imbris	7132ef4136	Rearrange some operations in the server tick to reduce clientside latency of ServerEvent mediated effects	2020-03-09 22:31:24 -04:00
Adam Whitehurst	344bb955a2	rename get_tool_data to unwrap_tool_data	2020-03-08 21:28:45 -07:00
Acrimon	bc39b78173	Rebased.	2020-03-08 23:02:15 +01:00
Imbris	a04c1b1d1d	Add uid to Player component ... fix: world examples	2020-03-08 22:58:38 +01:00
Imbris	6cc07270ac	improve(login): more precise error handling during login	2020-03-08 22:56:59 +01:00
Acrimon	08b4cc5fc3	Update auth to use new hashing scheme.	2020-03-08 22:56:34 +01:00
Acrimon	7db0ff0b8c	Update chat-cli to work properly. ... Update reqwest to 0.10.0	2020-03-08 22:54:15 +01:00
Imbris	8ef1251dc2	Add warning prompt for untrusted auth servers, move some auth code into	2020-03-08 22:51:37 +01:00
Acrimon	403deecc6d	Server auth handling improvements.	2020-03-08 22:49:47 +01:00
Songtronix	50b845d1c3	:/ and reactivated the password field	2020-03-08 22:34:06 +01:00
jshipsey	bce9d4c24f	animation corrections	2020-03-08 17:02:25 -04:00
Adam Whitehurst	5f8751e2d3	Begin implementing triple attack	2020-03-08 12:37:17 -07:00
Adam Whitehurst	fe1feebeb2	Renaming fn's	2020-03-08 10:38:40 -07:00
Adam Whitehurst	698fe9f451	More util fn's, add comments	2020-03-08 10:38:18 -07:00
Adam Whitehurst	f769c74bf4	Add charging back	2020-03-08 10:04:26 -07:00
Adam Whitehurst	adf34d4f0f	User constants, faster characters	2020-03-08 08:38:53 -07:00
Adam Whitehurst	5a9a8323f2	Update utils/handle_move fn's	2020-03-07 15:45:10 -08:00
Adam Whitehurst	49c7143144	Clean up warnings	2020-03-07 13:03:10 -08:00
Adam Whitehurst	54a7112ad9	resolve conflicts merging master -> clientstates	2020-03-07 12:49:48 -08:00
Adam Whitehurst	096d3b691e	Merge master	2020-03-07 12:49:15 -08:00
Adam Whitehurst	c678ca9540	Re-add blocking	2020-03-07 11:55:15 -08:00
Adam Whitehurst	cb9e3859da	Rename character behavior sys	2020-03-07 11:02:54 -08:00
jshipsey	d4332c3138	eagle adjustments	2020-03-07 13:26:46 -05:00
Adam Whitehurst	b1d1299fe6	Clean up character states	2020-03-07 10:15:02 -08:00
S Handley	b0ca85069b	Piggyback on the InventoryUpdate events and attach some additional event info so that we can detect why the inventory update was triggered, and emit an associated sfx event that matches it.	2020-03-04 10:09:48 +00:00
Caleb Cochran	219f9fa3be	Added missed comma	2020-02-25 22:01:51 -06:00
Caleb Cochran	8479230e66	Replaced commas (fmt issue)	2020-02-25 21:59:08 -06:00
Caleb Cochran	9f7aa61fbd	Fixing #504 - Enemies stop attacking after combat	2020-02-25 20:48:09 -06:00
Shane Handley	0d2b26a3b8	SFX Fixes - Reinstate run, uncomment tests and make them pass, adjust ... config.	2020-02-25 22:03:29 +09:00
timokoesters	4cc998f92b	fix: non-humanoid npcs can attack again	2020-02-24 22:20:50 +01:00
timokoesters	d0439fdd84	Merge remote-tracking branch 'origin/master' into clientstates	2020-02-24 21:34:17 +01:00
timokoesters	ac611f4618	fix: sync characterstates, better energy management	2020-02-24 20:57:33 +01:00
timokoesters	31f3aae75c	fix: make climbing cost stamina	2020-02-24 19:18:06 +01:00
timokoesters	2fa902270e	fix: block	2020-02-24 18:10:42 +01:00
timokoesters	1f4065ae32	fix: attacking	2020-02-24 14:32:12 +01:00
S Handley	d87061fe14	Add a volume option to SfxEvents, and use this to dispatch movement sfx for quadripeds at a volume proportionate to their size.	2020-02-23 01:26:51 +00:00
S Handley	9ab2833056	Add weapon wield/unwield sfx support	2020-02-21 02:56:54 +00:00
Monty Marz	2180040f70	Orc hairstyles, several tiny UI fixes, fixed beard warnings	2020-02-20 10:32:03 +00:00
Joshua Yanovski	8a9d4012fa	Allow spawning individual species with /spawn. ... To get the old behavior, you now need to refer to the internal keywords (like "bird_medium" or "quadruped_small") rather than the old friendly names (like "duck" or "pig"), as the latter generate single species now.	2020-02-14 03:12:37 +01:00
Ben Simpson	636bf7d343	Merge branch 'expandedreality/energy-regen' into 'master' ... Energy now does not regen when climbing,gliding,and swimming Closes #483 See merge request veloren/veloren!800	2020-02-14 01:15:47 +00:00
Ben Simpson	c427f2298e	Energy now does not regen when climbing,gliding,and swimming	2020-02-13 18:46:01 -06:00
Ben Simpson	3343f8e5c0	Update common/src/sys/controller.rs, common/src/sys/movement.rs, common/src/comp/energy.rs files	2020-02-13 08:36:29 +00:00
Ben Simpson	bfd2f345b1	Update common/src/sys/movement.rs	2020-02-13 08:19:36 +00:00
Ben Simpson	0cd8150e98	Update common/src/sys/movement.rs	2020-02-13 08:13:36 +00:00
Ben Simpson	a49482503d	Update common/src/sys/controller.rs, common/src/sys/movement.rs files ... Deleted energy.rs, movement.rs files	2020-02-13 07:59:54 +00:00
Ben Simpson	1aa98dbb62	Update common/src/comp/energy.rs, energy.rs, common/src/sys/controller.rs, common/src/sys/movement.rs, movement.rs files	2020-02-13 07:30:32 +00:00
Adam Whitehurst	d383abf950	Re add combat	2020-02-11 07:42:17 -08:00
Marcel Märtens	8f5e409ac4	update toolchain to	2020-02-09 22:58:01 +01:00
Marcel	9f0307b926	Merge branch 'reactivate-ci' into 'master' ... Reactivate Failure is allowed for benchmark and coverity See merge request veloren/veloren!790	2020-02-09 19:31:37 +00:00
Marcel Märtens	90bcd87007	Reactivate Failure is allowed for benchmark and coverity	2020-02-09 20:01:44 +01:00
Songtronix	b8e12811bf	fix(version): more robust version detection ... Fixes #350	2020-02-09 18:11:40 +01:00
Imbris	fb7edd2404	Make nametag positioning slightly better	2020-02-06 17:10:52 -05:00
timokoesters	0bc07a0835	Merge remote-tracking branch 'origin/master' into clientstates	2020-02-03 22:02:32 +01:00
timokoesters	aeb37a1f33	improvement: char speed	2020-02-03 20:43:36 +01:00
timokoesters	aa52c6fd4f	fix: jumping and attacking	2020-02-03 17:03:52 +01:00
Marcel Märtens	dae31ae5b6	apply new rustfmt - touching alot of files	2020-02-01 21:39:39 +01:00
Marcel Märtens	dd21235ff8	Apply prefixes to veloren source, espacially comments, so that reformating wont make it unreadable, ... especially enumerations and other source code in errosions file	2020-02-01 21:37:36 +01:00
Marcel Märtens	e960c2233b	Change the version number to 0.5	2020-01-31 17:26:45 +01:00
Joshua Barretto	faa86226c7	Collars	2020-01-29 12:01:28 +00:00
Joshua Yanovski	3fa21b3dc7	Per-speces NPC names! ... Is also able to refactor some of the uglier code and introduces a framework that (suitably extended) could be useful in removing boilerplate elsewhere.	2020-01-29 04:41:32 +01:00
Joshua Barretto	116bc0d0b2	Fixed logic derp	2020-01-28 01:12:17 +00:00
Joshua Barretto	d87fc37aa2	Fixed watch compilation issue	2020-01-27 23:59:59 +00:00
Joshua Barretto	e391d6e4fd	Added no-assets feature to common	2020-01-27 22:41:30 +00:00
Joshua Barretto	344eb9d45d	Added intermittent rolling to NPCs during a chase	2020-01-27 16:18:36 +00:00
Joshua Barretto	de96551f65	Resolved pet alignment issues, added ranged aggro	2020-01-27 15:51:07 +00:00
Joshua Barretto	09f0a5744f	Improved NPC spawning and names, made idle NPCs stop before hitting things	2020-01-27 10:58:33 +00:00
Monty Marz	981b55837a	fix typo in en.ron, fixed unfinished weapons dropping from chests	2020-01-26 22:57:06 +00:00
Joshua Barretto	631124f3fc	Switched to _squared(), added comments, parallelised waypoint gen	2020-01-26 12:52:32 +00:00
Joshua Barretto	7404800999	Added neutral NPC spawning	2020-01-26 12:52:32 +00:00
Joshua Barretto	723b578378	Improved pet aggression system, made waypoints rarer	2020-01-26 12:52:32 +00:00
Joshua Barretto	c9138d913c	Fixed pathfinding limit bug, improvements to idle AI	2020-01-26 12:52:32 +00:00
Joshua Barretto	7437c18b99	Various bug fixes	2020-01-26 12:52:32 +00:00
Joshua Barretto	8c7e96e313	Improved waypoint spawn locations, scaled down pathfinding cost	2020-01-26 12:52:32 +00:00
Joshua Barretto	b22ee24362	Cleanup	2020-01-26 12:52:32 +00:00
Joshua Barretto	feeccc2ff3	Improved patrol idling	2020-01-26 12:52:32 +00:00
Joshua Barretto	d04a595b3f	Made waypoints work, added waypoint spawning	2020-01-26 12:52:28 +00:00
Joshua Barretto	11193a692a	Better neutral AI, initial waypoint objects	2020-01-26 12:52:28 +00:00
Joshua Barretto	290cb52d0d	I don't know how much I put in this commit, but it's some stuff	2020-01-26 12:52:28 +00:00
Joshua Barretto	353a0f67be	Better pathfinding iteration cap	2020-01-26 12:52:28 +00:00
Joshua Barretto	7167320c92	Fixed shadows, better pathfinding cap	2020-01-26 12:52:28 +00:00
Joshua Barretto	f92371101c	Added pauseable pathfinding, improved Chaser heuristics, etc.	2020-01-26 12:52:07 +00:00
Joshua Barretto	f14037e4a3	Occasional path recalculate, stopped pathfinder thrashing	2020-01-26 12:52:07 +00:00
Joshua Barretto	2d9aa21eef	Added test world, friendly NPC pathfinding	2020-01-26 12:52:07 +00:00
Justin Shipsey	64690279af	new mobs ... alligators	2020-01-26 00:22:48 +00:00
Monty Marz	b583f60326	35 new ground sprites, UI fixes	2020-01-25 11:14:02 +00:00
timokoesters	6515daddce	fixes	2020-01-24 16:57:24 +01:00
Imbris	b6235d51cf	fix: overflow in VolGrid3d	2020-01-24 00:11:22 -05:00
Joshua Yanovski	3383e991e7	Erosion cleanup, part 1. ... Covers all files touched by MR that are not in world/src/sim.	2020-01-23 18:18:17 +01:00
Joshua Yanovski	ccd85e8907	Fixes to enable loading (relatively) large maps. ... With these changes, we can successfully open, map, and play maps thare are 16x the size of a standard (1024 x 1024 chunk) map, 4x larger in each direction.	2020-01-23 18:18:16 +01:00
Joshua Yanovski	1358f1dffa	Changes to worldgen, adding more sedmient etc.	2020-01-23 18:18:14 +01:00
Joshua Yanovski	e91578ffdb	Cargo fmt most things (except erosion.rs).	2020-01-23 18:18:12 +01:00
Joshua Yanovski	2b38927345	Fixes for nonstandard chunk and map sizes. ... Also fixes a longstanding map rendering issue.	2020-01-23 18:18:11 +01:00
Joshua Yanovski	9520ef4f6d	Implement sending world map across the network.	2020-01-23 18:18:11 +01:00
timokoesters	7b558b4542	refactor: combine actionstate and movestate	2020-01-21 23:54:59 +01:00
timokoesters	28fe73825d	feat: fitness stat effects movement speed	2020-01-21 19:24:09 +01:00
Gilbert Röhrbein	4f90e6325e	feat: add endurance fitness willpower to stats	2020-01-21 18:49:17 +01:00
timokoesters	2e8bf9d212	improvement: enemy balance	2020-01-20 19:15:12 +01:00
Joshua Barretto	8f86e45a72	Enumerated Body type	2020-01-20 14:21:06 +00:00
Pfauenauge90	8a0efd3654	added TODO for energy numbers	2020-01-19 22:39:20 +01:00
Joseph Gerardot	454aa82669	Fixup energy regen math to properly account for acceleration at any ... framerate.	2020-01-19 22:39:20 +01:00
timokoesters	6e651eb659	fix: make fall damage behave correctly again after changing gravity	2020-01-19 22:39:20 +01:00
timokoesters	65d0a1c4f4	refactor: use restrict_mut	2020-01-19 22:39:20 +01:00
timokoesters	8afe5fd1dd	improvement: reset character state and energy on death	2020-01-19 22:39:19 +01:00
timokoesters	8064b51ee2	improvement: better movement	2020-01-19 22:39:18 +01:00
Joseph Gerardot	c10c31043c	Make charging take a discrete amount of energy and change energy ... regeneration to use floats so it is smoother and tickrate-independent.	2020-01-19 22:39:17 +01:00
Joseph Gerardot	b4337e57aa	Add energy comsumption on rolling and charging, and accelerating ... regeneration when idle.	2020-01-19 22:39:17 +01:00
Imbris	4b01c1b082	add: capability to disable blending for particular BlockKinds	2020-01-19 16:03:27 -05:00
Adam Whitehurst	7353ab3432	Undo sfx changes	2020-01-18 05:13:25 -08:00
AdamWhitehurst	976eface66	Update from MR comments	2020-01-17 08:39:21 -08:00
Adam Whitehurst	5959d2a5c7	Fix SFX and Assets	2020-01-16 05:28:45 -08:00
Adam Whitehurst	d82e93b39f	Merge master and build	2020-01-16 05:27:30 -08:00
Imbris	d36b263627	Branch on lower color values for more accurate speedy color conversion, add simple color conversion benchmarks	2020-01-13 23:39:22 -05:00
Acrimon	71bd7f15ee	Even better conversion impl.	2020-01-13 20:54:56 +01:00
Acrimon	af8468315d	Made color conversion way more accurate.	2020-01-13 16:38:10 +01:00
AdamWhitehurst	71a39c3677	Update update return statements	2020-01-12 15:14:08 -08:00
AdamWhitehurst	1816d4b805	Move states/ to common/src/	2020-01-12 15:06:52 -08:00
Gilbert Röhrbein	28060e7b6e	fixing #405 - Energy as its own component	2020-01-12 22:25:04 +01:00
Piotr Korgól	e1adf40856	Improvement: Replace all '..=b' with '..b + 1'	2020-01-12 15:46:53 +01:00
Shane Handley	c6f64564a8	Remove emission of an audio event from stats sys ... This was accidentally left in by me during some testing of server emission of SFX events to all clients. There was no effect on gameplay since we dont emit a sound for this event yet, but it should not be here. The audio event is correctly handled elsewhere by each client.	2020-01-11 13:08:33 +09:00
Monty Marz	851d7858e6	Scrolling Combat Text (SCT)	2020-01-10 00:33:38 +00:00
AdamWhitehurst	563e50b67d	Move utils file	2020-01-09 08:23:20 -08:00
AdamWhitehurst	de36e75264	Fix imports, update matches	2020-01-08 11:31:42 -08:00
AdamWhitehurst	5527d83a0e	Update mod imports	2020-01-08 08:56:36 -08:00
Adam Whitehurst	8cdf06e3e2	Swim pulsing	2020-01-08 05:17:36 -08:00
Adam Whitehurst	8648641362	Grooming	2020-01-07 07:49:08 -08:00
Adam Whitehurst	dc33f6ad6a	Ruin them again (the comments)	2020-01-05 15:28:20 -08:00
Adam Whitehurst	4e18ffe6c2	RUIN the comments	2020-01-05 15:26:04 -08:00
Adam Whitehurst	5bba0a96fc	Fix refs	2020-01-05 15:21:37 -08:00
Adam Whitehurst	542f06eef4	Add new() to states	2020-01-05 15:17:22 -08:00
Adam Whitehurst	4e5cf63452	Clean Up Systems	2020-01-05 14:55:27 -08:00
Adam Whitehurst	8bf35a197b	Update weapon .ron	2020-01-05 11:26:22 -08:00
Adam Whitehurst	8fe5cec947	Clean up, make state handlers options	2020-01-05 10:19:09 -08:00
Adam Whitehurst	2f3ccbc5d6	Update Comments	2020-01-03 12:46:41 -08:00
Imbris	4fa05150a2	Merge branch 'imbris/char-screen-transition' into 'master' ... Fix issues regarding going back to the character selection screen Closes #386 See merge request veloren/veloren!700	2020-01-02 19:40:21 +00:00
Joshua Barretto	423e741cb6	Merge branch 'zesterer/better-rollin' into 'master' ... Made rolling less slippy, added tilt See merge request veloren/veloren!699	2020-01-02 18:35:27 +00:00
Imbris	f52aef224e	Fix typos, don't insert Controller if it doesn't already exist in the ... mount system so that Controller components are not added to entities client side	2020-01-02 05:34:27 -05:00
Adam Whitehurst	2635c405fe	Ability comps and sys	2020-01-01 09:16:29 -08:00
S Handley	2644e29484	Refactor and Rename for clarity ... Implements a potential structure for splitting the SFX event mapping into smaller individual files for maintainability. - Remove inventory events for now: For a later commit. - No longer panic when there is a failure parsing the sfx file: log the error and not play sfx.	2020-01-01 02:55:48 +00:00
Imbris	1acf08390a	Fix issue where controller events aren't processed while mounted. Fix non humanoids being able to climb and glide.	2019-12-31 16:41:45 -05:00
Imbris	ede05c47b0	fix(char screen induced ghosts): ... Adds removing extra components and deleting entities clientside when going back to the character screen. Also, simplifies ClientState by removing the Dead variant and removing ClientMsg::StateRequest in favor of more specific ClientMsg variants.	2019-12-31 16:38:13 -05:00
AdamWhitehurst	b67a4835f4	Update disabled state flags	2019-12-31 05:19:23 -08:00
Joshua Barretto	cfbf69ae89	Made rolling less slippy, added tilt	2019-12-30 15:16:21 +00:00
AdamWhitehurst	ba7ca785f6	Successful build	2019-12-30 05:56:42 -08:00
Monty Marz	8aff5faa83	assets update ... acacia trees updated help.png bigger map zone name npc levels from 0-10 boss levels from 20-50	2019-12-30 12:16:35 +00:00
Imbris	ec3e075020	fix(player list): Show players not in range on the player list ... fix(overflow): Stops including block updates that fail (since chunks don't exist on the client) in `TerrainUpdates` (which would trigger meshing of those nonexistent chunks). Furthermore, removes remeshing of chunks with block updates if those chunks don't have all their neighbours (since those wouldn't be meshed in the first place).	2019-12-29 20:51:05 -05:00
AdamWhitehurst	9c6ce9babd	Begin implementing combat actions	2019-12-29 15:47:42 -08:00
Dylan Kile	badd3113d5	hierarchical pathfinding	2019-12-29 20:58:21 +00:00
AdamWhitehurst	7a4cdfb7a4	Documentation comments	2019-12-29 08:36:59 -08:00
AdamWhitehurst	ca44497258	Add movement_utils	2019-12-28 08:10:39 -08:00
AdamWhitehurst	06053faed0	Add state disables, cleanup imports	2019-12-26 10:01:19 -08:00
AdamWhitehurst	8e0317e03d	refactor states to handle update logic	2019-12-26 06:43:59 -08:00
AdamWhitehurst	c2ceabea0e	finish movment states handle() fn logic	2019-12-22 08:08:48 -08:00
AdamWhitehurst	1ab09220b0	Rudimentary Stand State handle() move	2019-12-21 07:57:15 -08:00
Imbris	6524ea31d1	Fix flight turning	2019-12-20 22:51:35 -05:00
Imbris	934c5d6846	Various tweaks: moved radius determination to function on , comments, simplified server Destroy event code, debug assert modified components aren't removed in change tracking, etc	2019-12-20 22:51:35 -05:00
Imbris	b2752d2419	Cutout unnecessary Resource syncing machinery and Tracker trait	2019-12-20 22:51:35 -05:00
Imbris	5813f626d1	cleanup	2019-12-20 22:48:14 -05:00
Imbris	bfaa18e010	Fix NaN in agent sys, stop pushback from turning player around, account for Scale in melee attack hit detection	2019-12-20 22:48:14 -05:00
Imbris	8f7323f41b	Stop syncing health change timer updates	2019-12-20 22:48:14 -05:00
Imbris	d341073a44	Upgrade to specs 0.15.1	2019-12-20 22:48:14 -05:00
Imbris	c3ac251fa8	Stop syncing Projectile component to the client	2019-12-20 22:48:14 -05:00
Imbris	e49cafafbf	Actually send deletion messages	2019-12-20 22:48:14 -05:00
Imbris	71cce03f29	Move sync code into common submodule	2019-12-20 22:37:12 -05:00
Imbris	609e0f23bf	Stop global syncing of entity creation	2019-12-20 22:37:12 -05:00
Adam Whitehurst	e40eb2ba20	Finish Stand handle() (untested)	2019-12-20 08:50:54 -08:00
Adam Whitehurst	e074c7ce1d	begin impl state handle traits	2019-12-20 05:30:37 -08:00
Adam Whitehurst	4ead941c82	Fix fall->climb, tweak jump and glide	2019-12-15 17:44:19 +00:00
Monty Marz	1e1990758b	Fix bow-shot frequency	2019-12-12 20:13:45 +00:00
Forest Anderson	d8fc7cb667	Add advanced path finding to new 'Traveler' enemy using A* algorithm	2019-12-11 05:28:45 +00:00
Adam Whitehurst	20575e0aab	Update controller	2019-12-09 14:45:10 +00:00
S Handley	11dd6b8090	Update footsteps SFX	2019-12-08 10:03:40 +00:00
Adam Whitehurst	92d99af53c	feat: weapon-type dependent wield and attack durations ... also some controller.rs cleanup	2019-12-03 06:30:08 +00:00
Adam Whitehurst	4e574cb29a	Inputs enhancements	2019-11-29 15:20:35 +00:00
Monty Marz	040e1a7535	Fix map being inverted and indicator positioning	2019-11-26 22:39:07 +00:00
S Handley	ea2e0d17de	SFX system ... This is an event based approach to SFX sounds. There is a specific character sound event mapper which determines sfx to play based on character or NPC state, as well as emitting sfx events for non-character-triggers such as levelling up.	2019-11-23 08:26:39 +00:00
Monty Marz	370e94b1ad	Loading Screen with pulsating text, 2 new hairstyles	2019-11-23 00:51:18 +00:00
Songtronix	e885a78deb	change(deps): enforce crossbeam version	2019-11-22 19:12:58 +01:00
Songtronix	bdcea57201	feat(log): add date to log file	2019-11-22 19:12:58 +01:00
telastrus	10d6f3e8b3	jump while underwater	2019-11-21 23:56:07 -05:00
Forest Anderson	5a73554aa1	Merge branch 'qwertycrackers' into 'master' ... Add a `debug_items` chat command that gives all debug items. See merge request veloren/veloren!641	2019-11-11 17:36:31 +00:00
Monty Marz	c38447a264	assets update ... map image human male hairstyles elf male hairstyle potion item cheese item removed admin items from inventory	2019-11-09 13:42:42 +00:00
Joseph Gerardot	0a44e714b4	Cargo fmt	2019-11-06 20:57:05 -05:00
Joseph Gerardot	52020e4902	Don't use the actual multiline doc comment syntax.	2019-11-06 18:02:58 -05:00
Joseph Gerardot	e73884a1d4	Respond to MR feedback. ... Mainly clean up code with better use of iterators, and rename the debug command to be just `debug`.	2019-11-06 17:57:54 -05:00
Joseph Gerardot	7325757066	cargo fmt the previous changes.	2019-11-05 15:57:08 -05:00
Joseph Gerardot	fab5377eed	Add interface to add stuff in bulk to inventory ... Also includes inventory tests. inventory API.	2019-11-05 15:57:08 -05:00
soruh	6dfa146484	Mitgated RUSTSEC-2019-0014 by updating noise and ... disabling its default features, specifically `image`, which had the vulnerability.	2019-11-05 11:14:39 +00:00
soruh	e3bd152d24	update toolchain to nightly-2019-11-04	2019-11-04 18:26:32 +01:00
Justin Shipsey	a6d268e8ee	Merge branch 'slipped/skeletons' into 'master' ... new skeletons See merge request veloren/veloren!620	2019-10-27 14:06:54 +00:00
Marcel Märtens	242a0d35bd	fixing character movement to no longer fail normalization then get a zero vec and then normalize again ... may this can be further simplyfied	2019-10-26 22:14:11 +02:00
jshipsey	2b5fd372c5	streamlined body part naming scheme, swapped quadruped to quadruped_small, rewrote mesh names to reflect body type instead of npckind. finally.	2019-10-25 21:50:14 -04:00
jshipsey	25448ae2a1	body tweak	2019-10-25 21:34:29 -04:00
jshipsey	644939810f	added dragon skeleton	2019-10-25 21:33:59 -04:00
jshipsey	54fc712076	fish_medium and bird_medium skelingtons	2019-10-25 21:33:02 -04:00
timokoesters	3ceb3a9d6d	refactor: small adjustments	2019-10-25 09:47:28 +02:00
timokoesters	a6faffca4e	feat: asset glob loading, random weapons in chests	2019-10-24 23:55:25 +02:00
timokoesters	f1b728b89b	improvement: load_cloned returns a result	2019-10-24 23:55:24 +02:00
timokoesters	0a1e12c9ad	improvement: make debug items of type ItemKind::Tool ... This way all items that can be held in a hand are tools	2019-10-24 23:55:24 +02:00
timokoesters	20248a4818	feat: store items as RON files ... When a new item is created, a ron file will be used as a template	2019-10-24 23:47:26 +02:00
Imbris	a200dafd45	Fix possess bug, remove commented code, drain controller events	2019-10-24 00:00:00 -04:00
Imbris	8f81b69a25	Move terrain management and syncing into server side ecs systems	2019-10-23 23:50:06 -04:00
Imbris	2703c8afe1	Move serverside client to a component and communications into server ecs systems	2019-10-23 23:50:06 -04:00
Imbris	53ddbec527	Actually fix region removal panic, update fuzzy chunk location, sync entity removal when unloading chunks, region size constant tweak	2019-10-23 22:43:02 -04:00
Imbris	10f9f10cb3	Fix some panics when removing regions	2019-10-23 22:43:02 -04:00
Imbris	b09bddda79	Make clients subscribed to nearby regions and only send physics updates from those regions.	2019-10-23 22:43:02 -04:00
Imbris	24d1f6d970	Add initial region system implementation	2019-10-23 22:39:42 -04:00
Monty Marz	3e0ac48bd8	Multiple Assets and UI fixes and additions	2019-10-23 19:40:45 +00:00
Songtronix	3e1bf295b5	fix(crash): singleplayer	2019-10-18 17:39:57 +02:00
Songtronix	fffffff536	fix(crash): overflowing the stack	2019-10-18 14:19:02 +02:00
Songtronix	5b716515bb	change(githash): provide date and hash	2019-10-18 15:32:55 +02:00
Imbris	39656e92be	Merge branch '276-hotloading-armor' into 'master' ... Resolve "Enable hotloading of different offsets for armors/weapons" Closes #276 See merge request veloren/veloren!545	2019-10-18 00:29:09 +00:00
Monty Marz	fdfab6a807	refactor: create_projectile doesn't take a light ... It returns a builder so the caller can just do it	2019-10-17 20:59:36 +00:00
Joshua Barretto	013afafba8	Made rolling less violent when changing directions	2019-10-17 12:21:22 +01:00
Joshua Yanovski	8ae2692b6e	Allow canceling chunk generation. ... Currently we only do this when no players are in range of the chunk. We also send the first client who posted the chunk a message indicating that it's canceled, the hope being that this will be a performance win in single player mode since you don't have to wait three seconds to realize that the server won't generate the chunk for you. We now check an atomic flag for every column sample in a chunk. We could probably do this less frequently, but since it's a relaxed load it has essentially no performance impact on Intel architectures.	2019-10-16 11:39:41 +00:00
Adam Fogle	3a4c307d38	Code cleanup, formatting changes, and fixed the cloth belt's offset.	2019-10-16 00:42:57 -04:00
Joshua Barretto	707b79f2c8	Smoother movement, Space for climbing	2019-10-14 11:22:48 +01:00
heydabop	522ab2cd98	fixes #324 - changes possible modulo range from 0-29 to 1-29 to prevent mod by 0	2019-10-13 21:39:37 -05:00
Adam Fogle	a5db28113f	Redid the mainfest files to remove race/gender. ... Now based on armor slot enum. Added color to the manifest files. Manifest files aren't yet being used, but will load.	2019-10-12 08:31:42 -04:00
Imbris	028d010624	Make bows give experience via giving projectiles an owner field	2019-10-11 19:33:01 -04:00
Imbris	2f9d8ee2e6	Add new debug item	2019-10-11 19:32:46 -04:00
Marcel Märtens	20c520a044	Change the version number to 0.4	2019-10-10 15:48:01 +02:00
Monty Marz	d82ec6715a	Item icons, chests and more	2019-10-09 19:28:05 +00:00
timokoesters	45f756343d	fix: blocking now ends in wielded ... This makes blocking more viable because while blocking you can wait for the enemy to attack and then quickly exit the block and attack yourself.	2019-10-08 21:19:48 +02:00
timokoesters	095e66fc01	fix: tweek hp	2019-10-08 20:36:46 +02:00
timokoesters	051a964798	fix: server side fall damage ... This avoids flickering health	2019-10-08 18:55:30 +02:00
timokoesters	b20cf6c62b	fix: set minimum speed for fall damage and balance it	2019-10-08 18:55:30 +02:00
timokoesters	4e87f125a2	fix: fix level and health distribution	2019-10-08 18:12:08 +02:00
Joshua Barretto	2171e77fe5	Fixed block snapping ground clip	2019-10-08 12:21:05 +01:00
Monty Marz	b3862278af	Help window, UI fixes, asset fixes	2019-10-06 19:19:08 +00:00
timokoesters	182b98081b	feat(bow): arrows despawn after some time	2019-10-06 19:32:46 +02:00
Songtronix	aa556ba4b3	feat(env): added DISABLE_GIT_LFS_CHECK	2019-10-06 07:33:24 +02:00
Timo Koesters	f3787879d3	fix(bow): adds bow icon art	2019-10-05 21:51:08 +00:00
timokoesters	2fc4a8d9aa	fix(exp): crash when gaining many levels at once	2019-10-05 17:37:10 +02:00
Piotr Korgól	09429b45d1	Make /adminify admin-only and /waypoint free	2019-10-05 17:37:10 +02:00
Piotr Korgól	9e10c8b700	Make enemies spawn with different levels	2019-10-05 17:37:09 +02:00
timokoesters	460a494e77	fix(bow): Don't remove vel and use sticky component instead	2019-10-04 21:30:13 +02:00
Pfauenauge90	f1c4e7040a	rebase fix	2019-10-04 21:02:45 +02:00
timokoesters	d876215012	feat(combat): melee combat damage depends on power of the weapon ... Normal NPCs have a weapon of power 5 so they do 5 damage if the attack is not blocked. Bosses and players have power 10.	2019-10-04 21:02:44 +02:00
timokoesters	ba3db852f7	feat(bow): make arrows stick to walls	2019-10-04 21:02:44 +02:00
timokoesters	fc97c27b65	feat(bow): sticky arrows	2019-10-04 21:02:43 +02:00
timokoesters	575f7da64d	feat(bow): Client side prediction	2019-10-04 21:02:43 +02:00
timokoesters	fe17b4952c	Remove warnings	2019-10-04 21:02:42 +02:00
timokoesters	ab634f1d21	Reuse combat code	2019-10-04 21:02:41 +02:00
timokoesters	2ba143a514	Make arrows deal damage	2019-10-04 21:02:41 +02:00
timokoesters	e3c02f8ac1	Allow projectiles to react to triggers	2019-10-04 21:02:40 +02:00
timokoesters	d46f1e1859	Initial bow & arrow implementation	2019-10-04 21:02:39 +02:00
Monty Marz	4c1eba1f3e	Assets update, aesthetics, minor fixes	2019-10-04 18:27:12 +00:00
Nick12	e8340d88af	Increase max bytes per chat message	2019-10-04 16:14:54 +02:00
Nicolas	6e4d556073	Add max chat message length ... Fixes #115 Credit to @scorpion9979 for the previous implementation (https://gitlab.com/veloren/veloren/merge_requests/215)	2019-10-04 16:14:54 +02:00
Forest	35b9040a6f	Removed now stable feature	2019-10-03 17:28:17 -04:00
Acrimon	03bf74f414	Updated toolchain version and a bunch of deps.	2019-10-03 17:19:22 -04:00
Justin Shipsey	27f3bebe40	Char overhaul and asset update	2019-10-02 10:05:17 +00:00
Imbris	83b5ca3335	Higher level cache abstraction	2019-10-01 02:10:28 -04:00
Imbris	89a1c45ac7	Cache most recent chunk access in terrain meshing	2019-10-01 02:10:28 -04:00
Monty Marz	11a022abb3	Better stepping sounds (and minor voxel model fixes)	2019-09-27 16:04:22 +00:00
Joshua Barretto	bdf74cf151	Fixed typo	2019-09-26 14:03:41 +01:00
Joshua Barretto	a6d5b82ef5	Prevented pickups with full inventory	2019-09-26 00:15:07 +01:00
Joshua Barretto	a2758b091c	Added flower and grass items	2019-09-26 00:15:07 +01:00
Joshua Barretto	dff67e1c41	Added block collection, improved controls for it	2019-09-26 00:15:07 +01:00
Joshua Barretto	e22fe81a2f	Added velorite	2019-09-26 00:15:07 +01:00
Joshua Barretto	f57c2ec453	Made consumable items have an effect, better damage animation	2019-09-26 00:15:07 +01:00
Joshua Barretto	a961a267f1	Added apple and mushroom collection	2019-09-26 00:15:07 +01:00
Joshua Barretto	d745acc948	Floodfill shadows, smooth shadow lighting	2019-09-26 00:15:07 +01:00
Acrimon	9ce9251a17	Formatted code.	2019-09-24 11:56:19 +02:00
Acrimon	3db0b2946d	Added some tests.	2019-09-24 11:36:35 +02:00
Acrimon	7e768b84e4	Fast powf for sgrb.	2019-09-24 11:05:01 +02:00
Monty Marz	3a0131306f	Character assets Part 1	2019-09-18 16:46:12 +00:00
Joshua Yanovski	b4ad76372b	Allow canceling chunk generation. ... Currently we only do this when no players are in range of the chunk. We also send the first client who posted the chunk a message indicating that it's canceled, the hope being that this will be a performance win in single player mode since you don't have to wait three seconds to realize that the server won't generate the chunk for you. We now check an atomic flag for every column sample in a chunk. We could probably do this less frequently, but since it's a relaxed load it has essentially no performance impact on Intel architectures.	2019-09-16 03:41:33 +02:00
haslersn	51718c32a6	Bugfix: DefaultPosIterator now starts at lower_bound ... Previosly the first iteration was skipped.	2019-09-11 01:48:28 +02:00
Joshua Barretto	3f2e22f039	Exponential interpolation for linear damping ... With an additional approximation to allow for the same size jumps given different framerates.	2019-09-09 19:11:40 +00:00
Marcel Märtens	58b0b49dfe	adjust metrics to rebased Chunks	2019-09-09 10:47:40 +02:00
Marcel Märtens	b05e51152f	update version, revert from static prometheus back to normal because static doesnt supprot registries, and implement most of the metrics except for entity count	2019-09-09 09:54:30 +02:00
Joshua Barretto	933e48ac3b	Merge branch 'fix-jump-height' into 'master' ... Fix jump height See merge request veloren/veloren!485	2019-09-08 15:50:08 +00:00
Timo Koesters	92c0edcb98	Merge branch 'timo-attack' into 'master' ... Fix wolfs not attacking and adjust movement while attacking See merge request veloren/veloren!484	2019-09-07 10:25:57 +00:00
timokoesters	f3593371ea	Make npcs attack in a smarter way	2019-09-07 12:16:55 +02:00
haslersn	b26043b0e6	common: Rework Chunk and Chonk implementation ... Previously, voxels in sparsely populated chunks were stored in a `HashMap`. However, during usage oftentimes block accesses are followed by subsequent nearby voxel accesses. Therefore it's possible to provide cache friendliness, but not with `HashMap`. The previous merge request [!469](https://gitlab.com/veloren/veloren/merge_requests/469) proposed to order voxels by their morton order (see https://en.wikipedia.org/wiki/Z-order_curve ). This provided excellent cache friendliness. However, benchmarks showed that the required indexing calculations are quite expensive. Particular results on my _Intel(R) Core(TM) i7-7500U CPU @ 2.70 GHz_ were: | Benchmark | Before this commit @ d322384bec | Morton Order @ ec8a7caf42 | This commit | | ---------------------------------------- | --------------------------------- | --------------------------- | -------------------- | | `full read` (81920 voxels) | 17.7ns per voxel | 8.9ns per voxel | **3.6ns** per voxel | | `constrained read` (4913 voxels) | 67.0ns per voxel | 40.1ns per voxel | **14.1ns** per voxel | | `local read` (125 voxels) | 17.5ns per voxel | 14.7ns per voxel | **3.8ns** per voxel | | `X-direction read` (17 voxels) | 17.8ns per voxel | 25.9ns per voxel | **4.2ns** per voxel | | `Y-direction read` (17 voxels) | 18.4ns per voxel | 33.3ns per voxel | **4.5ns** per voxel | | `Z-direction read` (17 voxels) | 18.6ns per voxel | 38.2ns per voxel | **5.4ns** per voxel | | `long Z-direction read` (65 voxels) | 18.0ns per voxel | 37.7ns per voxel | **5.1ns** per voxel | | `full write (dense)` (81920 voxels) | 17.9ns per voxel | **10.3ns** per voxel | 12.4ns per voxel | This commit (instead of utilizing morton order) replaces `HashMap` in the `Chunk` implementation by the following data structure: The volume is spatially subdivided into groups of `4*4*4` blocks. Since a `Chunk` is of total size `32*32*16`, this implies that there are `8*8*4` groups. (These numbers are generic in the actual code such that there are always `256` groups. I.e. the group size is chosen depending on the desired total size of the `Chunk`.) There's a single vector `self.vox` which consecutively stores these groups. Each group might or might not be contained in `self.vox`. A group that is not contained represents that the full group consists only of `self.default` voxels. This saves a lot of memory because oftentimes a `Chunk` consists of either a lot of air or a lot of stone. To track whether a group is contained in `self.vox`, there's an index buffer `self.indices : [u8; 256]`. It contains for each group * (a) the order in which it has been inserted into `self.vox`, if the group is contained in `self.vox` or * (b) 255, otherwise. That case represents that the whole group consists only of `self.default` voxels. (Note that 255 is a valid insertion order for case (a) only if `self.vox` is full and then no other group has the index 255. Therefore there's no ambiguity.) Rationale: The index buffer should be small because: * Small size increases the probability that it will always be in cache. * The index buffer is allocated for every `Chunk` and an almost empty `Chunk` shall not consume too much memory. The number of 256 groups is particularly nice because it means that the index buffer can consist of `u8`s. This keeps the space requirement for the index buffer as low as 4 cache lines.	2019-09-06 18:20:15 +02:00
haslersn	d322384bec	common: Add benchmark for Chonk	2019-09-06 15:44:36 +02:00
haslersn	1796c09ca1	common: Rework volume API ... See the doc comments in `common/src/vol.rs` for more information on the API itself. The changes include: * Consistent `Err`/`Error` naming. * Types are named `...Error`. * `enum` variants are named `...Err`. * Rename `VolMap{2d, 3d}` -> `VolGrid{2d, 3d}`. This is in preparation to an upcoming change where a “map” in the game related sense will be added. * Add volume iterators. There are two types of them: * _Position_ iterators obtained from the trait `IntoPosIterator` using the method `fn pos_iter(self, lower_bound: Vec3<i32>, upper_bound: Vec3<i32>) -> ...` which returns an iterator over `Vec3<i32>`. * _Volume_ iterators obtained from the trait `IntoVolIterator` using the method `fn vol_iter(self, lower_bound: Vec3<i32>, upper_bound: Vec3<i32>) -> ...` which returns an iterator over `(Vec3<i32>, &Self::Vox)`. Those traits will usually be implemented by references to volume types (i.e. `impl IntoVolIterator<'a> for &'a T` where `T` is some type which usually implements several volume traits, such as `Chunk`). * _Position_ iterators iterate over the positions valid for that volume. * _Volume_ iterators do the same but return not only the position but also the voxel at that position, in each iteration. * Introduce trait `RectSizedVol` for the use case which we have with `Chonk`: A `Chonk` is sized only in x and y direction. * Introduce traits `RasterableVol`, `RectRasterableVol` * `RasterableVol` represents a volume that is compile-time sized and has its lower bound at `(0, 0, 0)`. The name `RasterableVol` was chosen because such a volume can be used with `VolGrid3d`. * `RectRasterableVol` represents a volume that is compile-time sized at least in x and y direction and has its lower bound at `(0, 0, z)`. There's no requirement on he lower bound or size in z direction. The name `RectRasterableVol` was chosen because such a volume can be used with `VolGrid2d`.	2019-09-06 15:43:31 +02:00
haslersn	886d554f52	common: prepend/append multiple SubChunks in a batch	2019-09-06 15:33:36 +02:00
haslersn	963c5a7785	common: Calculate magic number in Chonk	2019-09-06 15:33:36 +02:00
haslersn	8451a06804	common: Set TerrainChunk::SIZE.z = std::i32::MAX	2019-09-06 15:33:36 +02:00
haslersn	57354fb062	common: For trait ReadVol remove get_unchecked()	2019-09-06 15:33:36 +02:00
Joshua Barretto	66c58840ef	Merge branch 'scott-c/first-person-model' into 'master' ... Add first person models See merge request veloren/veloren!443	2019-09-06 13:02:03 +00:00
scott-c	bc1ccfc99b	Fix first person weapon visible while not wielding	2019-09-06 18:22:26 +08:00
Andrew Pritchard	05dff792fc	Deref instead of clone vel	2019-09-06 14:22:58 +08:00
Andrew Pritchard	b4c74279b7	Vec3 is apprently *not* Copy, Set near plane to 0.1 to prevent tirangle flickering	2019-09-06 13:24:42 +08:00
Andrew Pritchard	b4d5663fed	Vec3 is copy	2019-09-06 12:04:20 +08:00
Andrew Pritchard	5b82808df0	Merge branch 'master' into 'fix-jump-height' ... # Conflicts: # common/src/sys/phys.rs	2019-09-05 13:07:46 +00:00
Andrew Pritchard	d0b2f7565a	Revert "Revert "Exponential interpolation for linear damping"" ... This reverts commit 8b9a3ae1df.	2019-09-05 18:24:38 +08:00
Andrew Pritchard	8b9a3ae1df	Revert "Exponential interpolation for linear damping" ... This reverts commit 94b9f50efa.	2019-09-05 18:24:22 +08:00
Andrew Pritchard	94b9f50efa	Exponential interpolation for linear damping ... With an additional approximation to allow for the same size jumps given different framerates.	2019-09-05 17:07:15 +08:00
Imbris	52d84248ec	Remove all warnings	2019-09-04 19:03:49 -04:00
Imbris	fc9c87878e	Fix some warnings, cleanup comment	2019-09-03 23:09:29 -04:00
Imbris	8a994ada8e	Remove derpy eyes :( , fix undead eye indices, fmt	2019-09-03 23:06:15 -04:00
jshipsey	ca4da22c7d	fixing eyes, cleanup on offsets	2019-09-03 23:06:13 -04:00
jshipsey	178657c871	tweaked hair colors, head offsets, skin colors	2019-09-03 23:06:11 -04:00
Imbris	cc331c10b6	Remove use of empty.vox	2019-09-03 23:06:09 -04:00
Imbris	074eee06e6	Add pants coloring, chest and pants sliders	2019-09-03 23:06:06 -04:00
Imbris	0ffc534df2	Add separate eye color lists for each race	2019-09-03 23:06:02 -04:00
Pfauenauge90	bdb95be5cc	hair and skin colours	2019-09-03 23:05:59 -04:00
Imbris	c4999f5e9d	adjust how figure head coloring is done	2019-09-03 23:05:58 -04:00
Imbris	9d086949d1	Add basic index based coloring for figures	2019-09-03 23:05:56 -04:00
Imbris	fd251c4d3a	Fix sliders, remove uneeded method, fix aspect ratio in character creation	2019-09-03 23:05:54 -04:00
Imbris	7bebffb2af	Add ron file for head offsets, segment unionizer	2019-09-03 23:05:52 -04:00
Imbris	ab34377309	Add basic segment combination	2019-09-03 23:05:50 -04:00
Imbris	3ccbb0f38d	Convert tooltips to use ImageFrame, add autosizing	2019-09-01 15:34:20 -04:00
Monty Marz	f53904b534	More sprites, ui fixes, lianas	2019-09-01 19:04:03 +00:00
timokoesters	ecbf7cad5b	Remove old code	2019-08-31 09:00:20 +02:00
jshipsey	b81cd6a8f9	combine character.action movement blocks	2019-08-30 22:51:46 -04:00
timokoesters	9a832dd56b	Move std::mem::discriminant into new method	2019-08-30 22:51:46 -04:00
jshipsey	78bf7a0997	slowed movement for block/attack, cleaned up code, made foot speed velocity dependent, tweaked blocking animation	2019-08-30 22:50:53 -04:00
timokoesters	b99bac87db	Make npcs roll correctly	2019-08-30 22:50:53 -04:00
timokoesters	77a48c61a1	Fix rolling for the player	2019-08-30 22:50:53 -04:00
jshipsey	f8d0b1040a	readded cidle	2019-08-30 22:50:53 -04:00
jshipsey	bec942753e	some stuff fixed, other stuff still broken	2019-08-30 22:50:53 -04:00
jshipsey	e6197d4c10	separate static anims for feet (run/static)	2019-08-30 22:50:53 -04:00
timokoesters	15978d216b	Rename controller main, alt to primary, secondary	2019-08-31 00:13:45 +02:00
timokoesters	a95893e43b	Remove inventory::swap and improve inventory::insert	2019-08-31 00:09:25 +02:00
timokoesters	ba02956f05	Make boost RMB go upward again	2019-08-31 00:08:44 +02:00
timokoesters	bd8e71c5aa	Rename activate_inventory_slot to use_inventory_slot	2019-08-30 22:46:45 +02:00
timokoesters	5d02d32ec6	Make inventory::get return a reference	2019-08-30 22:42:43 +02:00
timokoesters	082ccd7c46	Avoid right-ward shift	2019-08-30 22:32:47 +02:00
timokoesters	7e66fe792d	Return the item again if slot was not wrong	2019-08-30 21:03:49 +02:00
timokoesters	952ec35857	Remove warnings	2019-08-29 19:54:53 +02:00
timokoesters	512d2d9a8e	Rename Teleport to Boost	2019-08-29 19:44:30 +02:00
timokoesters	075827698f	Use RMB to boost away again	2019-08-29 19:44:30 +02:00
timokoesters	6e1c78e5d5	Add debug mode item giving speed boost in look_dir on click	2019-08-29 19:44:28 +02:00
timokoesters	155605841b	Use comp::Stats to store Equipment, make char weapon selection work	2019-08-29 19:44:28 +02:00
haslersn	9844e95e5f	common: Stop abusing wild animals for bit shifts	2019-08-29 18:06:52 +02:00
yashaslokesh	be71aea20b	Changed exp type from f64 to u32 and altered exp calculations and function signatures to adhere to the new types ... Signed-off-by: Yashas Lokesh <yashas.lokesh@gmail.com>	2019-08-27 22:33:14 +00:00
timokoesters	b725b0e9ea	End rolling when player is in the air	2019-08-27 11:06:55 +02:00
timokoesters	74677784c0	Add attack buildup duration (Delay before hit)	2019-08-27 11:06:54 +02:00
timokoesters	72564cf8b4	Make action durations constants	2019-08-27 11:06:54 +02:00
timokoesters	869535e5a2	Rename tool strength/damage to power	2019-08-26 20:05:13 +02:00
timokoesters	a7747fe965	Simplify code	2019-08-26 13:12:45 +02:00
timokoesters	c4879307af	Update to github vek repo	2019-08-26 13:12:45 +02:00
timokoesters	b89bfcbfc1	Remove unnecessary map	2019-08-26 13:12:44 +02:00
timokoesters	08fa6a3414	Prevent problems with no vel while rolling in the future	2019-08-26 13:12:44 +02:00
timokoesters	c278ac9927	Add todo making glide an ability/item	2019-08-26 13:12:44 +02:00
timokoesters	98f8196a16	Put combat related values into constants	2019-08-26 13:12:43 +02:00
timokoesters	05f2f168fd	Make falldamage local, don't use force update for local, cleanup	2019-08-26 13:12:43 +02:00
timokoesters	eb34e5bb27	fmt	2019-08-26 13:12:43 +02:00
timokoesters	b96557d012	Fix roll from cliff bug	2019-08-26 13:12:42 +02:00
timokoesters	a715a84ea7	Implement unstoppable rolling	2019-08-26 13:12:42 +02:00
timokoesters	01410569a4	Use look_dir when blocking	2019-08-26 13:12:41 +02:00
timokoesters	3258fa3a3c	Add basis for projectiles ... But we have no controller action to spawn them yet	2019-08-26 13:12:41 +02:00
Songtronix	814e858720	Split Events in ServerEvent and LocalEvent	2019-08-26 13:12:41 +02:00
timokoesters	75368dbac1	Remove dbg	2019-08-26 13:12:40 +02:00
timokoesters	62745c4cad	Only use look_dir for ori when wielded or attacking	2019-08-26 13:12:40 +02:00
timokoesters	295969517c	Improve combat range	2019-08-26 13:12:40 +02:00
timokoesters	b826edf6e8	Make aiming 2D	2019-08-26 13:12:39 +02:00
timokoesters	0912de2a26	Make aiming more precise	2019-08-26 13:12:38 +02:00
timokoesters	e90f95bc75	Look in the direction of the camera	2019-08-26 13:12:38 +02:00
jshipsey	39bd888a7c	idle block animation	2019-08-26 13:12:38 +02:00
timokoesters	e7c61c30cc	Block when pressing right click while looking at the attacker	2019-08-26 13:12:37 +02:00
timokoesters	e42ffb362a	Remove unnecessary components	2019-08-26 13:12:37 +02:00
timokoesters	b748c1a6e5	Make gliding the error animation	2019-08-26 13:12:37 +02:00
timokoesters	0bb70d8182	Fix water	2019-08-26 13:12:36 +02:00
timokoesters	5ab03abbdd	Remove animation warnings	2019-08-26 13:12:36 +02:00
timokoesters	799c73d43a	Fix characterstate in movement.rs, not phys.rs	2019-08-26 13:12:35 +02:00
timokoesters	808467c616	Reset controller after each tick	2019-08-26 13:12:35 +02:00
timokoesters	4d6a32e00f	Allow non player entites to be removed again	2019-08-26 13:12:35 +02:00
timokoesters	90c81b4759	Reset controller after each tick	2019-08-26 13:12:34 +02:00
timokoesters	5d5ccd7b99	Move from state components to single CharaterState struct ... This makes split animations easy and improves overall code quality	2019-08-26 13:12:34 +02:00
Christian Authmann	840e2cbfbf	Build script: check if git-lfs works	2019-08-22 19:18:47 +02:00
Joshua Barretto	d9854ad682	Merge branch 'zesterer/instancing' into 'master' ... Instancing (block sprites) See merge request veloren/veloren!450	2019-08-22 11:10:57 +00:00
Vechro	c6b2303890	Fix wielding jump issue	2019-08-21 20:34:21 +03:00
Monty Marz	fade04d44e	Pfauenauge/plants grass	2019-08-21 17:22:05 +00:00
Vechro	c40e15f070	Fix velocity when stuck	2019-08-21 20:17:19 +03:00
Joshua Barretto	5f09ab3a4f	Added multiple sprite block kind support	2019-08-20 00:31:11 +01:00
Joshua Barretto	b31cca4bb3	Added wheat and sprite rendering	2019-08-19 21:09:35 +01:00
Acrimon	a41cf1a83d	Disabled unsafe using lint level.	2019-08-19 14:39:23 +02:00
Acrimon	d0f10115f4	Eliminated unsafe.	2019-08-19 14:33:31 +02:00
Monty Marz	29f6186139	hotbar changes ... completely switched to. vox files easier to see design gradient and numbers on the health/mana bar	2019-08-18 18:07:21 +00:00
Joshua Barretto	49426565dc	Renamed normal StructureBlock variant	2019-08-18 15:33:16 +01:00
Joshua Barretto	e535537106	Added default block kind to structure loading	2019-08-18 10:33:18 +01:00
Joshua Barretto	825d8bb632	Fixed water in caves, made water reflection vary with lighting	2019-08-18 10:33:18 +01:00
Vechro	b5b3b980fe	Add green sludge special index	2019-08-18 10:33:18 +01:00
Vechro	944067fd43	Add water special index	2019-08-18 10:33:18 +01:00
Joshua Barretto	42237a84e4	Added translucent meshing pass, water reflections	2019-08-18 10:33:18 +01:00
jshipsey	f14a182734	removed wield slowdown by popular request	2019-08-18 03:26:52 -04:00
Piotr Korgól	586bf5faff	Add adminify command to temporarily give admin perms	2019-08-17 23:35:01 +02:00
Imbris	5054f1e87d	remove palette dependency	2019-08-16 00:01:20 -04:00
Imbris	be0e0e52a8	Improve colors	2019-08-15 23:59:09 -04:00
Imbris	c09eb77149	Add srgb converion in shaders	2019-08-15 23:56:14 -04:00
Imbris	43ec7b200b	Handle errors in file watching	2019-08-15 23:56:13 -04:00
Imbris	cb25c45dec	Move shaders, start asset reloading system	2019-08-15 23:56:12 -04:00
Acrimon	42e065d425	[Common] Switch mutexes and channels.	2019-08-16 00:19:54 +02:00
Piotr Korgól	0221de484e	Give singleplayer its own server settings	2019-08-14 17:51:59 +02:00
Piotr Korgól	8ec0a06bbe	Fix spawn command, properly search for admins	2019-08-14 17:30:36 +02:00
Piotr Korgól	6882170d6f	Add Admins field to the settings file	2019-08-14 17:30:36 +02:00
Piotr Korgól	98c0692260	Add AdminPerms component, make some commands require it	2019-08-14 17:30:36 +02:00
Acrimon	b4a46f3e6e	Finished switch to hashbrown.	2019-08-11 22:38:28 +02:00
Joshua Barretto	d5aee13c91	Merge branch 'zesterer/small-fixes' into 'master' ... Added entity event system, fixed fall damage See merge request veloren/veloren!418	2019-08-09 23:56:49 +00:00
telastrus	de2082469d	auth done, no popup yet	2019-08-08 12:01:15 -04:00
telastrus	6d94d43021	still compiles	2019-08-07 23:56:02 -04:00
Joshua Barretto	5b62531da3	Added /explosion command	2019-08-07 18:17:04 +01:00
Joshua Barretto	192f5d355f	Switched to EventBus system	2019-08-07 16:39:16 +01:00
Joshua Barretto	98a913195b	Added entity event system, fixed fall damage	2019-08-07 10:50:49 +01:00
telastrus	e4f2c73b85	undo unnecessary pub mod ... fixed comments fixed other comment	2019-08-06 22:46:25 -04:00
telastrus	0eafd42c0f	fall damage + velocity debug	2019-08-06 17:51:13 -04:00
Joshua Barretto	73a44d0fb1	Collision fixes, better camera in build mode	2019-08-06 16:00:14 +01:00
timokoesters	1227596406	Implement specifier syntax and cleanup	2019-08-06 08:31:48 +02:00
Joshua Barretto	a324f01a1d	Improved orientation slerping	2019-08-04 15:51:17 +01:00
Piotr Korgól	d3f2ca69a4	Change the version number to 0.3	2019-08-04 13:53:59 +02:00
Joshua Barretto	c7d2fbc20e	Made humanoids glide when chasing	2019-08-04 09:21:29 +01:00
Joshua Barretto	ee0eb8d53c	Better enemy AI targetting and combat	2019-08-04 08:58:41 +01:00
Joshua Barretto	f08d8bb00a	Better movement lerping	2019-08-03 22:15:23 +01:00
Joshua Barretto	8b9a92b30e	Added dungeons	2019-08-03 22:15:23 +01:00
Monty Marz	d180c47edc	Pfau/combat	2019-08-03 21:11:57 +00:00
Joshua Barretto	c9f1a793db	Merge branch 'timo-kill-xp' into 'master' ... Give xp depending on max hp and lvl of entity killed See merge request veloren/veloren!400	2019-08-03 20:57:06 +00:00
timokoesters	7365dbe9e6	Give xp depending on max hp and lvl of entity killed	2019-08-03 21:30:01 +02:00
timokoesters	6b69b24185	Make ori more precise	2019-08-03 20:41:55 +02:00
Joshua Barretto	5fc6ab2126	Better enemy attack rate	2019-08-03 19:40:20 +01:00
timokoesters	91b8b69186	Use slerp for ori	2019-08-03 20:33:31 +02:00
Joshua Barretto	c33892e8af	Made entity collisions z-dependent	2019-08-03 19:09:01 +01:00
Joshua Barretto	71bf09d3b7	Better orientation in the air	2019-08-03 18:30:48 +01:00
Joshua Barretto	e52250a193	Made orientation change with move_dir, added a small amount of knockback	2019-08-03 18:24:07 +01:00
Joshua Barretto	5e3e87f9c5	Made enemies sometimes roll	2019-08-03 13:31:40 +01:00
Joshua Barretto	51fa4f3cfc	Merge branch 'animation-tweaks' into 'master' ... animation and movement tweaks See merge request veloren/veloren!389	2019-08-03 12:09:38 +00:00
Joshua Barretto	cab898a91f	Made enemies actually attack	2019-08-03 13:01:54 +01:00
timokoesters	3a43150bc5	Make hostile npcs back away when too close	2019-08-03 12:53:39 +01:00
Pfauenauge90	c919b68346	changed angle of attack, changed z offset on hit	2019-08-03 12:46:07 +01:00
timokoesters	e39324a9d2	Remove knockback	2019-08-03 12:46:07 +01:00
Joshua Barretto	3063546a58	Added entity pushback	2019-08-03 12:26:05 +01:00
Joshua Barretto	e6fe07dd3d	Shortened enemy sight distance	2019-08-02 21:35:03 +01:00
Joshua Barretto	8aa7af781e	Fixed enemy combat	2019-08-02 20:52:46 +01:00
Joshua Barretto	23cfe50455	Better health accessors methods	2019-08-02 20:49:48 +01:00
Joshua Barretto	5e4f383952	Better enemy AI	2019-08-02 20:41:38 +01:00
Joshua Barretto	677c5781ba	Added bosses, improved secret object spawn rates	2019-08-02 20:10:52 +01:00
timokoesters	55079c3d1e	Fix hostile npcs new target selection	2019-08-02 20:44:56 +02:00
Marcel Märtens	e4a9721588	fixed #211 - host specs-idvs on gitlab.com	2019-08-02 10:16:55 +02:00
jshipsey	13310ab9ca	improved animations and movement	2019-08-01 23:57:26 -04:00
Dominik Broński	f644b6ab89	Revert "Merge branch 'imbris/upgrade_specs' into 'master'" ... This reverts merge request !375	2019-08-01 23:32:33 +00:00
Imbris	5f56657f6c	Upgrade specs to 0.15	2019-08-01 18:09:13 -04:00
Piotr Korgól	ec550620ad	Add a health bonus for level ups, fix pets	2019-08-01 18:56:08 +02:00
Songtronix	52ffa02467	fmt	2019-08-01 17:07:42 +02:00
Joshua Barretto	9bc006dee1	Add a few extra items to the inventory by default	2019-08-01 09:13:34 +01:00
Joshua Barretto	39fc1d6b71	Added entity pickup, changed item model	2019-08-01 09:12:00 +01:00
Joshua Barretto	331b6c8b3a	Altered Item structure	2019-08-01 09:12:00 +01:00
Joshua Barretto	995090d2d4	Added item drops	2019-08-01 09:12:00 +01:00
Joshua Barretto	b3cae2f3dd	Added better item manipulation	2019-08-01 09:09:26 +01:00
Joshua Barretto	fc49293874	Clickthrough on items	2019-08-01 09:09:26 +01:00
Joshua Barretto	31f8794c39	Started work on inventory manipulation	2019-08-01 09:09:26 +01:00
Joshua Barretto	123a78552a	Fixed block-hopping on edges, added correct inventory slots	2019-08-01 09:09:26 +01:00
Joshua Barretto	5bb7998d5a	Added inventory sync messages and InventoryUpdate component	2019-08-01 09:09:26 +01:00
Joshua Barretto	a7fc872f1c	Added Default impl for Inventory	2019-08-01 09:08:59 +01:00
Joshua Barretto	fde6ec35cd	Fixed Inventory::remove method	2019-08-01 09:08:59 +01:00
Acrimon	3f85f35084	Fix lockfile.	2019-07-31 11:45:23 +02:00
Acrimon	dadcf27098	Fixed missing import.	2019-07-31 11:41:29 +02:00
Acrimon	9fbf710cc9	Swapped some rarely use storages.	2019-07-31 11:41:29 +02:00
Acrimon	8be62be980	Formatted code.	2019-07-31 11:40:58 +02:00
Acrimon	03253d3cc0	Switch everything to IDVStorage (No tuning yet.)	2019-07-31 11:40:58 +02:00
timokoesters	b695a63e98	Send different physics components individually	2019-07-30 13:35:16 +02:00
timokoesters	c6034bf450	Use Last<C> to check if a physics component changed	2019-07-30 08:32:03 +02:00
Monty Marz	5cfc60da50	Small chat fixes	2019-07-29 14:40:46 +00:00
Acrimon	ee49ebe807	Update rand, log and scan_fmt	2019-07-29 13:42:26 +00:00
timokoesters	5aa864ee58	Update most dependencies	2019-07-28 22:47:23 +02:00
Monty Marz	33565b9480	added comment about object rotation, changed lantern spawning command, changed /tell output when you /tell yourself	2019-07-28 09:21:17 +00:00
Piotr Korgól	5c84508015	Get EXP for killing NPCs and Players, properly show EXP bar	2019-07-26 20:51:40 +02:00
Piotr Korgól	b1aace0110	Add Level and Exp component	2019-07-26 16:44:59 +02:00
tommy	95b5f4acfb	Added private, broadcast, and game_state messages	2019-07-26 07:29:37 -04:00
tommy	ea0bbe7e47	Rebase fixes	2019-07-26 07:29:37 -04:00
tommy	cc6aa6f33d	Adds colour to tells in chat box #194	2019-07-26 07:29:37 -04:00
Nero	53086cb3b2	Nero/light offsets	2019-07-25 20:51:20 +00:00
Pfauenauge90	7a141ad111	More objects	2019-07-24 02:50:19 +02:00
Pfauenauge90	9fd2849c6c	chat warning for unknown objects	2019-07-24 02:50:19 +02:00
Pfauenauge90	85281e7e54	spawn objects by name	2019-07-24 02:50:19 +02:00
Vechro	f3c5ece983	Add tent	2019-07-24 02:50:19 +02:00
Vechro	81f66457de	Add cauldron	2019-07-24 02:50:19 +02:00
Pfauenauge90	870229cd1c	chests, human female head changes	2019-07-24 02:50:19 +02:00
Pfauenauge90	3559926a02	MOAR Pumpkins!	2019-07-24 02:50:19 +02:00
Pfauenauge90	495311de2d	added lanterns and potions	2019-07-24 02:50:18 +02:00
Vechro	e37ca1d1f3	formatting	2019-07-24 02:50:18 +02:00
Vechro	6478c4ec69	Add campfire	2019-07-24 02:50:18 +02:00
Monty Marz	ae4c569fc9	Static entities: Per model offsets, more models	2019-07-21 23:54:31 +00:00
Joshua Barretto	5cdfb26e0d	Added LightEmitter component	2019-07-21 19:22:49 +01:00
Joshua Barretto	dd84c6698b	Fixed infinite NPC jumping	2019-07-21 19:22:49 +01:00
Joshua Barretto	1dc654dde7	Added object entities	2019-07-21 19:22:49 +01:00
Songtronix	de2dbcef45	add global git hash constant	2019-07-21 17:45:31 +00:00
Joshua Barretto	d4821b8de8	Better fog	2019-07-21 00:32:36 +01:00
Joshua Barretto	1d21359337	Removed warning on OoB block modification	2019-07-20 19:08:28 +01:00
Joshua Barretto	ce327445a7	Send block diffs instead of entire chunks on block change	2019-07-20 16:41:03 +01:00
Songtronix	ed0d842e57	Mark InvalidAlias Message as to be done	2019-07-17 18:32:01 +02:00
Songtronix	b41508f025	generalise errors based on zests suggestion	2019-07-17 18:32:01 +02:00
Songtronix	b6c8bdc223	add configurable max player count	2019-07-17 18:32:01 +02:00
Acrimon	20ac81a986	Fixed some misses.	2019-07-12 20:51:22 +02:00
Joshua Barretto	e7dd151833	Added fruit trees	2019-07-09 17:08:43 +01:00
Joshua Barretto	bbd7f579d2	Fix for clipping	2019-07-09 15:07:53 +01:00
Joshua Barretto	9f6f9cb25f	Fixed block snapping at lower framerates	2019-07-09 14:04:30 +01:00
Joshua Barretto	0f0f28284c	Added 'perfect' collisions	2019-07-09 13:37:51 +01:00
Joshua Barretto	6bb48760d7	Fixed jittering collision bug	2019-07-09 11:51:00 +01:00
Joshua Barretto	879789ecc4	Fixed acacia colours	2019-07-08 20:28:48 +01:00
Joshua Barretto	c2a11ed6b2	Improved worldgen performance with more precise z bound checks	2019-07-08 15:51:38 +01:00
Justin Shipsey	1c10ff756f	Holding weapon while running/jumping/standing	2019-07-06 19:00:05 +00:00
Piotr Korgól	04d3c077d0	Remove printlns	2019-07-03 22:38:28 +02:00
timokoesters	a702f7258a	Fix building	2019-07-03 21:28:07 +02:00
Piotr Korgól	7f08377001	Sync CanBuild component, fix /build messages	2019-07-03 21:28:07 +02:00
Piotr Korgól	bf748ae742	Add CanBuild component, Block placing client messages and build mode command	2019-07-03 21:28:07 +02:00
Sheldon Knuth	6d624e96a6	fix the missing set_playing(true) in AudioPlayer::load() to prevent infinity thread loop & adopt std::sync::{Mutex, Condvar} for accurate thread blocking.	2019-07-03 17:23:24 +00:00
Imbris	4a821446b8	Fix common::asset doc test	2019-07-03 05:17:46 -04:00
Imbris	d2f8c47361	Pass BufReader to Asset::load()	2019-07-03 05:02:01 -04:00
Songtronix	0c3d693561	clean warnings from voxygen/hud	2019-07-02 21:25:07 +00:00
timokoesters	f5da167ce5	Fix warnings and clippy recommendations in common	2019-07-02 15:48:25 +02:00
Joshua Barretto	a72c54011a	Fixed relative path of current_dir	2019-07-02 13:52:51 +01:00
Joshua Barretto	107f5caa34	Revamped asset directory search system	2019-07-02 13:52:51 +01:00
Sheldon Knuth	cdda20a1e8	hotfix on assets_folder issue by increasing the depth to 3.	2019-07-02 19:43:38 +08:00
Sheldon Knuth	d75d632279	Add mpmc support to audio-base.	2019-07-02 11:29:00 +08:00
Piotr Korgól	a66dc9a24f	Add /health command	2019-07-01 20:07:30 +00:00
Joshua Barretto	631df59083	Merge branch 'zesterer/small-fixes' into 'master' ... Fixed chonk memory usage bug, added block manipulation See merge request veloren/veloren!278	2019-07-01 15:22:04 +00:00
Joshua Barretto	489f5f6b2a	fmt	2019-07-01 14:38:45 +01:00
Joshua Barretto	c8a2e4722c	Fixed chonk memory usage bug, added block manipulation	2019-07-01 14:36:45 +01:00
jshipsey	cc548eb669	glider animation fix	2019-06-30 18:53:45 -04:00
jshipsey	e9bbe0e800	rebase	2019-06-30 18:53:45 -04:00
jshipsey	2ce5c5881e	combat run/jump/idle animation states	2019-06-30 18:53:44 -04:00
Joshua Barretto	e4dc145f17	Merge branch 'zesterer/small-fixes' into 'master' ... More small fixes See merge request veloren/veloren!271	2019-06-30 22:52:21 +00:00
Joshua Barretto	0de505b74c	fmt	2019-06-30 23:46:55 +01:00
Joshua Barretto	14d9071670	Fixed minor physics bugs	2019-06-30 23:46:46 +01:00
timokoesters	370e7db1ee	Fix death	2019-06-30 22:29:00 +02:00
Joshua Barretto	b35832c37d	Prevent movement in unloaded chunks	2019-06-30 19:54:13 +01:00
Joshua Barretto	2985f94751	Prevented stalling when jumping before a block-hopping	2019-06-30 19:54:13 +01:00
timokoesters	7fec42ce2c	Fix controls	2019-06-30 19:48:38 +02:00
timokoesters	14400f6380	Remove Actor and use Body instead	2019-06-30 18:57:24 +02:00
Joshua Barretto	af755c0964	fmt	2019-06-29 22:47:24 +01:00
Joshua Barretto	f2df3a9d18	Block-hopping fix, better dusk shaders	2019-06-29 22:47:24 +01:00
Joshua Barretto	f1ba97ae7a	Merge branch 'timo-rolling-fix' into 'master' ... Rolling bugs + NPC bugs + "Impossible" bug See merge request veloren/veloren!265	2019-06-29 21:47:05 +00:00
timokoesters	ccbacabd2f	Make agents use controller correctly	2019-06-29 22:51:22 +02:00
timokoesters	d235374d8e	Fix npc and death bug	2019-06-29 22:43:44 +02:00
timokoesters	5fcf6ededa	magnitude_squared everywhere, actionstate everywhere, constant for moving	2019-06-29 22:11:21 +02:00
timokoesters	610c86a3b9	Animation fixes	2019-06-29 21:01:27 +02:00
timokoesters	9f83533741	Fix invisible characters	2019-06-29 20:24:07 +02:00
timokoesters	c80351f6ca	Fix double roll bug	2019-06-29 19:49:51 +02:00
Joshua Barretto	324de39bfe	fmt	2019-06-29 16:48:43 +01:00
Joshua Barretto	0c918c835f	Prevented invalid username usage	2019-06-29 16:48:43 +01:00
Joshua Barretto	905b3d6f45	Prevented block-hopping when not on ground	2019-06-29 16:48:43 +01:00
timokoesters	b0ea959f67	Remove animation syncing (does not fix any known bug)	2019-06-29 17:09:38 +02:00
timokoesters	5a41a58c0a	End roll when going too slow	2019-06-29 14:10:52 +02:00
timokoesters	fe6f627d42	Clean up ecs actor body components	2019-06-29 01:49:33 +02:00
Mckol	5ffa79d07d	Added the standard linux asset path and an enviroment variable for configuring it ... The variable is VELOREN_ASSETS	2019-06-28 19:50:11 +02:00
Monty Marz	cef52a0440	Char fixes	2019-06-28 14:45:02 +00:00
Justin Shipsey	4ac7307f8f	minor main menu changes ... made the settings button's text grey and removed hover/press image as long as it's not functional changed server list placement and spacing	2019-06-28 08:24:13 +00:00
Joshua Barretto	acb184e15d	Made physics cheaper still	2019-06-27 15:37:33 +01:00
Joshua Barretto	6444ba1933	Made collision detection cheaper, fixed snapping bug, somewhat nerfed rolling	2019-06-27 15:21:41 +01:00
Joshua Barretto	cdb405d7b8	Made physics fps-independent	2019-06-26 22:43:47 +01:00
Joshua Barretto	46fce696a2	Better path noise, better shadows	2019-06-26 19:14:12 +01:00
Joshua Barretto	b987bda9ce	Stronger shadows, fewer cliffs in oceans	2019-06-26 19:14:12 +01:00
Joshua Barretto	d0b38e9875	Worldgen performance improvements, better sun	2019-06-26 19:14:12 +01:00
Joshua Barretto	9279611d6d	Added longer day/night cycle, /time command	2019-06-26 19:14:12 +01:00
Joshua Barretto	7b7d843d0f	Comments and fmt	2019-06-26 11:53:43 +01:00
Joshua Barretto	4a340f69b5	Camera clipping and block-hop fix	2019-06-26 11:53:43 +01:00
Joshua Barretto	5decd48db6	Used velocity bias for collision correction	2019-06-26 11:53:43 +01:00
Joshua Barretto	6258035a4d	Added attempts counter to prevent infinite collision loops	2019-06-26 11:53:43 +01:00
Joshua Barretto	44f4031e58	Resolved collision bugs with prioritised collision system	2019-06-26 11:53:43 +01:00
Joshua Barretto	ae168711d7	Added configurable details	2019-06-26 11:53:43 +01:00
Joshua Barretto	0d984a5671	Fixed collision bugs	2019-06-26 11:53:43 +01:00
Joshua Barretto	af432ec510	Calculate delta time properly, fix low fps collision issues by decreasing max dt	2019-06-26 11:53:43 +01:00
Joshua Barretto	2c24ba7776	Fixed block-hopping, block-snapping, added interpolation to figures	2019-06-26 11:52:36 +01:00
Joshua Barretto	7a1359961c	Removed block-hopping, fixed collisions	2019-06-26 11:52:36 +01:00
Joshua Barretto	285cf2f973	Added proper 3D collisions	2019-06-26 11:52:36 +01:00
Joshua Barretto	62f148b46f	Network fix for 32-bit	2019-06-16 22:59:25 +01:00
Joshua Barretto	9ad2feb037	Ignore ForcedUpdate insertion	2019-06-16 20:53:10 +01:00
timokoesters	eb10389eb6	cargo fmt	2019-06-16 19:59:16 +02:00
timokoesters	f0e6e76423	Don't sync animations, just sync components used to construct them	2019-06-16 19:59:15 +02:00
jshipsey	8e019cdbec	lowered roll duration	2019-06-16 19:59:14 +02:00
timokoesters	14ff033770	Fix glider	2019-06-16 19:59:14 +02:00
timokoesters	2afc45617d	More input validation	2019-06-16 19:59:14 +02:00
jshipsey	0c534efddd	adjusted v-tilt, roll speed, run animation tempo	2019-06-16 19:59:13 +02:00
jshipsey	e066d98762	slight roll tweak, altered speeds in physics	2019-06-16 19:59:13 +02:00
timokoesters	ae081b8f67	Make roll timed	2019-06-16 19:59:13 +02:00
jshipsey	ecf0d9647c	added roll physics, improved anims for roll, glide, run, attached hands to torso	2019-06-16 19:59:12 +02:00
timokoesters	7deb3da1af	Add pub use phys:: and remove most pub mods	2019-06-16 19:59:12 +02:00
timokoesters	955c20fa61	Remove crun and cidle components and inputs	2019-06-16 19:57:04 +02:00
timokoesters	e2c81dd036	Fixes for .maybe() and animation	2019-06-16 19:57:04 +02:00
jshipsey	4de5489367	groundwork for role, crun, cidle	2019-06-16 19:57:04 +02:00
Cody	1f6c1188bc	Removes input sys, moves code to combat and phys	2019-06-16 19:57:03 +02:00
timokoesters	b947d78dac	Improve organization of controls	2019-06-16 19:57:03 +02:00
timokoesters	69cb2ed84f	Revamp control system	2019-06-16 19:57:03 +02:00
Joshua Barretto	132d1a67a6	Merge branch 'zesterer-worldgen-stuff' into 'master' ... Worldgen stuff See merge request veloren/veloren!217	2019-06-16 10:46:59 +00:00
liids	f726d755b7	fix formatting	2019-06-15 13:48:14 +02:00
Joshua Barretto	a9d30bbfb6	Adjusted tree colour variation	2019-06-15 11:36:26 +01:00
liids	c859371ddb	Merge all spawn commands into one	2019-06-15 09:56:27 +02:00
Joshua Barretto	30b668d0cc	Added dynamic tree colours	2019-06-13 11:59:05 +01:00
Joshua Barretto	9fed2c1534	Merged stumps, adjusted scale code	2019-06-13 11:59:05 +01:00
Joshua Barretto	c445e76afa	Fixed usize size issue for 32-bit platforms	2019-06-13 11:59:05 +01:00
Joshua Barretto	cf193a97c4	Set default case for block type opacity	2019-06-13 11:59:05 +01:00
Imbris	8dcf030bd8	Use Instant and running compensation in clock	2019-06-09 14:14:02 -04:00
Cody	14ac5babd4	Removes most unused imports; changes some unused variables to underscores or provides a leading underscore; removes some unnecessary variables and mutable declarations; and performs other miscellaneous warning fixes.	2019-06-06 14:48:41 +00:00
Joshua Barretto	afd983f6f8	Lighting fix	2019-06-06 12:25:06 +01:00
Joshua Barretto	1b5d2d468b	Made idx_for use idx_for_unchecked internally	2019-06-06 07:42:59 +01:00
Joshua Barretto	9da2d82197	Added proper VD fog	2019-06-05 20:52:51 +01:00
Joshua Barretto	9a8552d5fb	Added rocks	2019-06-05 20:52:51 +01:00
Joshua Barretto	06201c7353	fmt	2019-06-05 20:52:51 +01:00
Joshua Barretto	92f2d36b0c	Optimised sub-terrain chonk storage, fixed hash chunk bug, altered terrain base	2019-06-05 20:52:51 +01:00
Louis Pearson	4cf13cc588	Integrate forces *after* velocity is applied	2019-06-04 12:14:10 -06:00
Louis Pearson	84ac965240	Normalize move_dir only if the magnitude is greater than one	2019-06-04 10:13:40 -06:00
Louis Pearson	52764376ae	Use constants and normalized move direction	2019-06-04 10:09:34 -06:00
Louis Pearson	82aabf242a	Add a function for integrating forces	2019-06-04 09:42:31 -06:00
Louis Pearson	c7a2ecd1f2	Adjust gliding speed ... Former-commit-id: f2104422d1874e80f792bb97ded19ca976bbd4c1	2019-06-04 07:57:12 -06:00
Louis Pearson	e2d96cc7e0	Add CollisionShape, move friction calculations to phys ... Former-commit-id: 3723a8f74bc2854aaa98357e2d0b51a1668d9030	2019-06-04 07:57:12 -06:00
Louis Pearson	afc5199b63	Remove z < 0 hack ... Former-commit-id: e0e4ad6e806189cd67ac626685ce9ed1456222f0	2019-06-04 07:55:49 -06:00
Ahmed Ihsan Tawfeeq	e98eff613b	Fixed bug in loading JSON assets	2019-06-04 12:39:46 +00:00
Forest Anderson	4548ec3bf9	Merge branch 'randomized-npc-names' into 'master' ... Added randomized NPC names veloren/veloren#133 Closes #133 See merge request veloren/veloren!207	2019-06-04 05:23:25 +00:00
scorpion9979	b66fbce99d	Cleaned code	2019-06-04 01:10:59 -04:00
scorpion9979	7bfd9464c9	Added humanoid NPC type w/ names	2019-06-04 01:10:59 -04:00
scorpion9979	7919442d3d	Implemented asset system for caching json data	2019-06-04 01:10:59 -04:00
scorpion9979	29f230d23e	Cleaned code ... Refactored code for readability	2019-06-04 01:10:59 -04:00
Ahmed Ihsan Tawfeeq	eb80459872	Added randomized NPC names veloren/veloren#133	2019-06-04 01:10:59 -04:00
Joshua Barretto	3a1221068f	Merge branch 'voxel-shadows' into 'master' ... Shadows, deserts, snow, caves See merge request veloren/veloren!198	2019-06-03 22:13:10 +00:00
Joshua Barretto	e2182b1a68	Added basic light	2019-06-03 22:50:47 +01:00
Cody	692b216651	Fixes a bug where animals continually jumped after their target was any height above them, even once the target was no longer above them.	2019-06-03 20:09:18 +00:00
Timo Koesters	930bc91174	Merge branch 'fix-server-info' into 'master' ... Add server info and player list to client See merge request veloren/veloren!197	2019-06-02 14:45:41 +00:00
Cody	04d4dc1da5	Reverts one erroneous change, further corrects another comment.	2019-06-01 00:52:20 -04:00
Cody	8562a09595	cargo fmt	2019-05-31 16:36:24 -04:00
Cody	75ca605f5d	Changes the physics misnomer Direction to Orientation and adjusts some ECS read_storage names.	2019-05-31 16:36:24 -04:00
Cody	6c76667356	Addresses more naming schemes and typos.	2019-05-31 16:36:24 -04:00
timokoesters	c10a43f541	Add server info ... Former-commit-id: 9e504c821e871d30f8ac7cd4acb7a8022bdb5710	2019-05-28 22:25:46 +02:00
Forest Anderson	2fc4e9a2f8	Merge branch 'enemies' into 'master' ... Enemies See merge request veloren/veloren!186 Former-commit-id: f920608508868119aad286cbe45599342dc1942b	2019-05-28 19:08:02 +00:00
Joshua Barretto	8407908af2	fmt ... Former-commit-id: 7535fe743722967dd59e383aa93cb78cb3be6e23	2019-05-28 19:59:32 +01:00
timokoesters	5c48330460	Fix moving after death (again) ... Former-commit-id: 1c46fed1f5d9a74bcf926354b3b4efd442f5b5bc	2019-05-28 18:37:49 +02:00
Marcel	b5b61462ee	Merge branch 'event-chat-messages' into 'master' ... Event chat messages See merge request veloren/veloren!188 Former-commit-id: 5701dd41f52f76ee5733a3580da9fab59dc539e7	2019-05-28 10:45:24 +00:00
jshipsey	6cb1a75b93	speed tweak ... Former-commit-id: a3938ec59032794c7135facddecbf7131fb5262e	2019-05-27 19:48:44 -04:00
Joshua Barretto	bfc70f4d78	Sort of fixed enemy freezes ... Former-commit-id: 30933b3ff7d16428a107ade6163cb83562668b66	2019-05-28 00:04:25 +01:00
jshipsey	f9e2828de5	swing animation changes ... Former-commit-id: 1bc70090e938c12d6e133683932b470be102aecd	2019-05-27 19:03:52 -04:00
jshipsey	5f22c4e26f	swing animation ... Former-commit-id: 19e2c32aa36e3890e35df87f01bb0aec4cc8cf9c	2019-05-27 18:54:09 -04:00
timokoesters	2008400169	Implement killer name in chat ... Former-commit-id: 5aa87529179a684d5675c33e4001806aa2040802	2019-05-27 21:47:19 +02:00
timokoesters	a6439984be	Add connect, disconnect and kill messages ... Former-commit-id: c25f6fb0b594e5d61a965447359536ca17173aa7	2019-05-27 19:45:43 +02:00
Joshua Barretto	baf740a289	Added enemies ... Former-commit-id: 2c07c9e52a7cbfb85508e7098c528bddd9b12997	2019-05-27 12:18:14 +01:00
Imbris	de4d1a0e06	Fix pet spawning leading to NaN move_dir ... Former-commit-id: ac68702bfdb482f32967d96e4b1da2b0ffc4e4c4	2019-05-26 11:24:26 -04:00
jshipsey	7aab509701	rebase with combat merge ... Former-commit-id: 04885878ecaffba6b9bd78b2e59512d1914be3b1	2019-05-26 11:02:01 -04:00
jshipsey	26da091b0b	add wolf ... Former-commit-id: b16aa2e7c382710c0705371cd36d57ddf62cf13c	2019-05-26 10:39:57 -04:00
timokoesters	64b00f41f4	Fix invisible chars ... Former-commit-id: cbb93e0511100b9b66f9ea22451c99a69b50b19c	2019-05-26 16:04:44 +02:00
timokoesters	746e286b5b	Fixes ... Former-commit-id: 0bbbcf187248dd192e7e9a226bcf5b496437d578	2019-05-26 00:00:38 +02:00
timokoesters	4696cd2c8b	Add better inputs, input validation and more ... Former-commit-id: 3227221b12a674f66b011ce0ba734e226f223f34	2019-05-25 23:46:56 +02:00
timokoesters	f4434013db	Fix clear_terrain not changing Changes ... Former-commit-id: da7b02939d6d0bc7dbef7d923fb880081f6e08aa	2019-05-25 23:21:40 +02:00
timokoesters	73f29e3716	More comments ... Former-commit-id: 762d6437fa341a33ee80088e2c5dbbdf96387df0	2019-05-25 23:21:40 +02:00
timokoesters	15d1a789d6	Better formatting ... Former-commit-id: 22b83b6dd5ad145a39b236436a019c6b172787d7	2019-05-25 23:21:39 +02:00
timokoesters	3697c47e33	Change client_state_pending to ClientState::Pending ... Former-commit-id: 4b6a304a138ccfbffc3b6e28d36feaa2693d01a7	2019-05-25 23:21:39 +02:00
timokoesters	1dbca8b994	Fix respawn position ... Former-commit-id: c4dabc71a1c7af538e2c30acbf463340a4618cc9	2019-05-25 23:21:39 +02:00
timokoesters	1826a2b4f9	Implement fast respawn ... Former-commit-id: 17f9aceba5c40a5d3ddc2e0fd6795479487753fd	2019-05-25 23:21:39 +02:00
timokoesters	0344f3eba8	Implement hit time delay ... Former-commit-id: 6c1990645fd07e23de5eb97b6fc22f34ce09a6b7	2019-05-25 23:21:39 +02:00
timokoesters	ad3b8dffa1	Limit attack direction ... Former-commit-id: b132f01f86814d2f8dd10d6d1454b6e2a95595f8	2019-05-25 23:21:39 +02:00
timokoesters	f5751d65b1	Fix terrain not loading ... Former-commit-id: f9279878ab051c6083c4a1f5125531fe79151fb8	2019-05-25 23:21:39 +02:00
timokoesters	30bf1cde10	Add knockback ... Former-commit-id: a703eb937ef7094a085548ca3197a575059855a0	2019-05-25 23:21:38 +02:00
timokoesters	a0918d11b6	Fix red effect ... Former-commit-id: 1fd90a40aaaccb98aeb34715ee7cad5c0b3b3de7	2019-05-25 23:21:38 +02:00
timokoesters	ad5dcb4158	Make use of states in char-selection ... Former-commit-id: f74d4811bebb0e60093a96d70feeedaae8bc6c04	2019-05-25 23:21:38 +02:00
timokoesters	fc39356cde	Use correct time ... Former-commit-id: df33e802ee46f9ebe190be705ff8d81f856024e0	2019-05-25 23:21:38 +02:00
timokoesters	8af3ca5317	Fix animations ... Former-commit-id: 20285b42be6f1858105cc4287e357ea254a8ce35	2019-05-25 23:21:37 +02:00
timokoesters	b3e4ca0a5d	Implement killing ... Change animation history to animation Add attack input event Implement killing with ecs systems for damage and death Sync attack properly Sync deaths Former-commit-id: 72b5be7d65d9d3fcbef50d4836a6f06ec218d69e	2019-05-25 23:21:37 +02:00
Joshua Barretto	0bb217d53f	Added docs to assets::load_map ... Former-commit-id: 50397d3c5d8c30ea392b784d9309d0e2ecb28f73	2019-05-25 09:38:30 +01:00
Joshua Barretto	92391883a9	fmt ... Former-commit-id: 689464ed1009ebfd74769fa113fc7b433ea62bbd	2019-05-25 06:54:47 +01:00
Joshua Barretto	c8ba5d9f89	Basic pine tree spawning ... Former-commit-id: e58374724f6c9cb4a54ae96abd3420b02207fd30	2019-05-25 05:51:45 +01:00
Joshua Barretto	4d73f38e6d	Refactored worldgen sampling, added cache layer ... Former-commit-id: 3ad5277ed0c871d6678a42629145cb722d4c76c5	2019-05-25 05:51:45 +01:00
Joshua Barretto	86bb277116	Added snow to mountains, fixed hash sub-chunk allocation failure ... Former-commit-id: 45bb3063172b980f7cd7aa5bd2b50a1a53480120	2019-05-25 05:51:45 +01:00
Joshua Barretto	cafbb45e52	Small worldgen fixes and hash chunk optimisation ... Former-commit-id: f1cb9a010f5d0882d4bc21ede1f405a8a7fa867c	2019-05-25 05:51:45 +01:00
jshipsey	f94a8b636d	restored previous animations with new bone setup ... Former-commit-id: e507dba772d931e3ddebd0c4ecc8e038521a2e3e	2019-05-24 18:51:33 -04:00
jshipsey	5049b9a2ae	attack state ... Former-commit-id: 316d1dbb607688d88c067adc6498497aa67cb017	2019-05-24 18:33:55 -04:00
Joshua Barretto	fc25dc8c7f	fmt ... Former-commit-id: 1f7bec8da117091b3f2e8f58ce45b9caf1b6c89d	2019-05-21 23:31:38 +01:00
Joshua Barretto	0c78264ebc	Added spawn point ... Former-commit-id: 04ea38df61d3610d679368166de220243ef1bfba	2019-05-21 23:04:39 +01:00
Joshua Barretto	feece604be	Restarted worldgen ... Former-commit-id: e1526ec5f865904f11ab6a1507ecdc1a52acb28d	2019-05-21 22:51:41 +01:00
Joshua Barretto	a0dfa3fddc	Added basic mountain/valley worldgen ... Former-commit-id: 5a45f18fcdf523841ee8433ba2ff0b8765eadf3a	2019-05-21 22:51:41 +01:00
Pfauenauge90	c13206d82d	Basic worldgen ... Former-commit-id: 3ca0afa95dd1d868a84a41129e889a203e8a7cd9	2019-05-21 22:51:41 +01:00
Joshua Barretto	b48b9f0141	Attempted fix of deltatime bug ... Former-commit-id: d287bbf541dd318a7034f1e3ad4d9a167ac3c344	2019-05-21 22:51:41 +01:00
Joshua Barretto	5b2da36fd0	Added mega worldgen ... Former-commit-id: f7c88a1d387c282b78ab834dd63e64432b371552	2019-05-21 22:51:41 +01:00
Joshua Barretto	3508e4afcb	Added view distance configuration ... Former-commit-id: b3c7a21631ce0c6b058f25aede0e3e2895a16f81	2019-05-19 01:45:02 +01:00
Louis Pearson	d55e803ab5	Use PathBuf to load files ... Former-commit-id: b72084fab1b8faeabc47eee927654f963643bb78	2019-05-18 13:30:52 -06:00
Forest Anderson	2e7984ebc3	Char selection ... Former-commit-id: 8da211b00dcd9a550a8f46e79164ece8f5c193e5	2019-05-18 19:03:13 +00:00
Piotr Korgól	0e2b09a5f8	Create a skeleton for the Inventory system and Item system ... Former-commit-id: 2579b70257ee9faa6d8614c33677ad0fc3c77a0d	2019-05-18 16:46:14 +00:00
Cody	6b09fd7c53	Pedantic comment and language fixes. ... Former-commit-id: eb49765c911aaa97a9c8ed351216a7a6f8411213	2019-05-17 18:32:07 -04:00
Joshua Barretto	5a2c7a7813	Removed accidental println ... Former-commit-id: a203e8105cd42463b9a72245e1623dde68874571	2019-05-17 22:55:50 +01:00
Joshua Barretto	7174830279	fmt ... Former-commit-id: 71912bdd2b8f40020153c5696cd5cc1af3f154cc	2019-05-17 18:54:56 +01:00
Joshua Barretto	91184356e7	Added chonks ... Former-commit-id: a62fb321dbfb7541feaa9de4e641db9887b061fd	2019-05-17 18:44:30 +01:00
Joshua Barretto	fa052a22b7	More lenient max deltatime to avoid physics lag ... Former-commit-id: bdd4a9d634f9aa1e52ab3885e5b8a49348011760	2019-05-17 13:39:40 +01:00
Joshua Barretto	3940e73b31	Stopped syncing time ... Former-commit-id: 8453a8f1c2361b1e6b5bb7f11470c33f2c0f910b	2019-05-17 00:26:18 +01:00
Joshua Barretto	db4be8e492	Updated sphynx ... Former-commit-id: f81484571bda8c5e15ea2b6c0e8b9b6892b094a3	2019-05-17 00:05:46 +01:00
Joshua Barretto	7b09070fc8	fmt ... Former-commit-id: 8f0bc964e00bfd9461f752622862de5335678e5b	2019-05-16 20:23:45 +01:00
Joshua Barretto	a0e685c03f	Improved falling glider physics ... Former-commit-id: 752c1291c7d38282312446c5391c2fb4fa7cbf6e	2019-05-16 14:13:28 +01:00
Joshua Barretto	bb95f5bf78	Added correct gliding animation calculation ... Former-commit-id: 625310820c9cf7a1d37401875db43b5b597eb590	2019-05-16 12:04:42 +01:00
jshipsey	50fa3cf098	glide anim ... Former-commit-id: b614a672b0a94f2b8803c0c1c22468b889242cc6	2019-05-16 00:40:35 -04:00
Joshua Barretto	5092df0e7f	Improved quadruped origin ... Former-commit-id: 35a360bf285f2495dda7859cb8d376d5aa16a1af	2019-05-15 17:06:58 +01:00
Joshua Barretto	7ac973623f	Fixed friction ... Former-commit-id: d9ac7fa7fb98c2ac829470fa8deeb314cc0f15f6	2019-05-15 13:26:14 +01:00
Joshua Barretto	5c57568d31	Fixed physics ... Former-commit-id: b4b208754e38aba2150efe99d319638910f64904	2019-05-15 13:26:14 +01:00
Joshua Barretto	8ef8c178d7	Added test gliding ... Former-commit-id: 7aa1513511490feec531f10e58ad955c485ac594	2019-05-15 13:26:14 +01:00
Joshua Barretto	e8b6e120dc	Fixed pet spawning bug ... Former-commit-id: 78dcd034940a4de1ce7d66a79d9134be6ee281f2	2019-05-15 13:26:14 +01:00
Joshua Barretto	1209f0393d	Added figure colour to shader and health component ... Former-commit-id: 222c39bd401ad0a9707eb348d5640717004dbf96	2019-05-15 13:26:14 +01:00
Louis Pearson	85e97e16d3	Change vec<u8> to BufReader ... Former-commit-id: 0e91de7976357c96ac58e4f4293c680b9ab98155	2019-05-15 13:24:32 +01:00
jshipsey	2a2b873f56	added skeleton, needs animation fix ... Former-commit-id: f2c741426c073f3bfab3cdcd5b7f401a4fc6400e	2019-05-13 22:24:34 -04:00
jshipsey	732c43ce11	first quadruped changes ... Former-commit-id: 71ad084a872c3bf96d5cbab53c376d214f3cdcd0	2019-05-13 19:43:10 -04:00
Joshua Barretto	0b1ea359fa	Adjustments to VolMap ... Former-commit-id: 53ba7185102e7ff17825891d02bd0e26e5fe1076	2019-05-13 11:06:59 +01:00
Joshua Barretto	edfd2290eb	Massively sped up VolMap offset calculations ... Former-commit-id: 8f3cdf57a77691ca60c0921bc86a79c8cfe36539	2019-05-13 11:06:58 +01:00
Joshua Barretto	216819ca92	fmt ... Former-commit-id: 4fd53e02969d9d044367d81640a2975043c6953a	2019-05-13 11:06:58 +01:00
Joshua Barretto	761c6e9cf8	Switched to actor system ... Former-commit-id: d2a482f6209aff7aaa4e747e35ce4a7c8a79cdfc	2019-05-13 11:06:58 +01:00
sxv20_	f600eca072	start fixing chunk rendering, noticed stack overflow crash ... Former-commit-id: 334904276580cd78f5d5e3bf010a86fcd822cfdf	2019-05-13 11:03:47 +01:00
sxv20_	e20c2a1e00	Move VolMap to HashMap<_, Arc<Chunk>> ... Former-commit-id: e209891596acbb1705876a1cb7ccce3ac2fe2d45	2019-05-13 11:03:47 +01:00
sxv20_	a23f9d90ea	cache a chunk while cloning to increase performance (?) ... Former-commit-id: 69c1fa67b13a8de49f2c73e9526f548779e988c1	2019-05-13 11:03:47 +01:00
jshipsey	98380df9b2	pipeline fix ... Former-commit-id: 5de7ef7070f1d978206a4e303058411627fac138	2019-05-12 22:39:16 -04:00
jshipsey	e8c91f753e	Merge branch 'master' of https://gitlab.com/veloren/veloren ... Former-commit-id: 9306d50f9ba615dd6ca091753ff26688767b6291	2019-05-12 21:52:44 -04:00
jshipsey	dec9632460	animation adjustments ... Former-commit-id: 8752caf0bdcac1c2938f048878a008e8f5cd18e0	2019-05-12 20:52:30 -04:00
Forest Anderson	413b67e6ad	Merge branch 'master' into 'master' ... Fixes match pattern code that rendered an actionable branch unreachable. See merge request veloren/veloren!120 Former-commit-id: 06bcf5a6caf32fa80576d56766571c7f9ce7d54d	2019-05-12 20:40:09 +00:00
Forest	3d14d791cf	Cleaned code ... Former-commit-id: fd4ef550ff58f621a129901d142d80266fbbc534	2019-05-12 15:57:39 -04:00
Joshua Barretto	a8981378bf	Improved performance and compilation speed for debug builds ... Former-commit-id: 5d8b1c27a8a2ebfe63797969ee2aba7452a09dd3	2019-05-12 18:43:55 +01:00
Joshua Barretto	fc0f2f0801	Added option to not stop raycasting on error ... Former-commit-id: 6e094b6514bcda2fbcdfe44dbb90900b50e939c2	2019-05-12 14:03:08 +01:00
Joshua Barretto	266101c90d	Added basic pets ... Former-commit-id: 1ef17505ecb11acb82541349343989128b78630f	2019-05-12 14:03:08 +01:00
timokoesters	bdf241bf24	Add TODO comment ... Former-commit-id: fdc9e6d65d9d534e238a6ba2d1c2e66f194d975e	2019-05-11 21:48:05 +02:00
timokoesters	4ce1f9ee54	Temporary fix for falling into void ... Former-commit-id: 8e3d9c0c34e897f13cc60d5968f390ed0107dd76	2019-05-11 21:38:05 +02:00
MidgeOnGithub	bbe971de7f	Fixes match pattern code that rendered an actionable branch unreachable. ... Former-commit-id: 69f562bf54307ab7402dabe52e07a7a46ea4c4b1	2019-05-10 23:38:19 -04:00
Forest Anderson	cf22cb99e7	Ran fmt ... Former-commit-id: 6acf43d8e4c446b3f50a673179b8df20d6da648c	2019-05-09 17:30:44 -04:00
Joshua Barretto	89f9589cf0	Fixes to head animations ... Former-commit-id: b595d4cdb459acbdd3a9a971aff8f0fbfd45981a	2019-05-09 20:18:13 +01:00
Joshua Barretto	54cc9e137a	fmt ... Former-commit-id: b43b7192f7a2dd71da26182ca0c74449867381f3	2019-05-09 18:58:16 +01:00
Joshua Barretto	3b44bda43c	Secret feature ... Former-commit-id: 254581d14d272f77b2d047dd8a740a458270c0b2	2019-05-09 18:57:47 +01:00
Joshua Barretto	cf4e02252a	Smartened up terrain generation ... Former-commit-id: d85448e5171bd27b04530da8e1ca927554136ebf	2019-05-09 18:57:47 +01:00
Joshua Barretto	94fd0b1a22	Fixed running animation, changed movement physics ... Former-commit-id: 1b4c1f63701668074874aa6efc65f883f29e2cc1	2019-05-09 18:57:47 +01:00
Joshua Barretto	3705f9a871	Added anim_time to animations ... Former-commit-id: 44ec8108c41a3cad74b6f3c0a2df02e5166a5487	2019-05-09 18:57:47 +01:00
Joshua Barretto	e6a40bbda2	Added jumping and Jump animation state ... Former-commit-id: 6ae9f7e9c9fb2bc519a0ef2c1c8195376616ed4c	2019-05-09 18:57:47 +01:00
Joshua Barretto	9ebe3c3e6f	Added a delta time cap to avoid missing important physics events ... Former-commit-id: e9f14ddda0963537ae6593c2dacc6a877f88c824	2019-05-09 18:57:47 +01:00
Joshua Barretto	342ea6aa65	Significantly upped view distances ... Former-commit-id: 4cd306ebfa1acd765cb68d4a6d5a026b43fafa2f	2019-05-09 18:57:47 +01:00
Joshua Barretto	3cd48ba468	Added lz4 compression to networking ... Former-commit-id: 7910c933f110d595da70552716b6e8f0eb7544a1	2019-05-09 18:57:47 +01:00
Joshua Barretto	33e93ef25f	Added basic byte XOR checksum ... Former-commit-id: 2e8c23ce51038fd7442cc489d9cb45838f3378c3	2019-05-09 18:57:47 +01:00
Forest Anderson	8b4d998943	Merge branch 'fix-doc-test' into 'master' ... Fix doc test See merge request veloren/veloren!112 Former-commit-id: 7330a2022ac892a60a7c9df7ac42d7b054622301	2019-05-08 23:06:07 +00:00
Imbris	470e63a691	Remove or uncomment commented code ... Former-commit-id: 32ac76b649012a0a2756f796b26d48318faad11c	2019-05-07 21:59:35 -04:00
timokoesters	24161d4521	Fix doc test ... Former-commit-id: e08cb9fdfca5b3d12a34220ef4af042d6fb913e6	2019-05-07 20:59:06 +02:00
timokoesters	7132cfdf5b	Fix doc test ... Former-commit-id: e347ad79dd229d72f70820189e6ae6011868c5ef	2019-05-07 20:36:07 +02:00
Imbris	81c5a070c5	move conrod font out of common ... Former-commit-id: 1e7cbce00eddff6c765326671d04d9494639773e	2019-05-07 02:25:26 -04:00
Imbris	eb3d8310f8	rustfmt ... Former-commit-id: 7e2cdb284c670b5991c69b6aab042194c806171f	2019-05-07 01:40:03 -04:00
timokoesters	f695973bb2	Make fonts work, Remove style ... Former-commit-id: 53d158aff30d8c53b86deb62f7079ba06b5119ce	2019-05-07 01:08:27 -04:00
timokoesters	53a78e1c2f	Remove unnecessary debug from try_open_with_path ... Former-commit-id: 891d24c247d15f406ebd24ca923b62e6f43bf9ea	2019-05-07 01:00:48 -04:00
Imbris	cb507ebfa0	small comment ... Former-commit-id: 13e443edbb52e1c1423446168235c986b8999de0	2019-05-07 00:59:06 -04:00
Imbris	8232ffbd33	add load_expect, change error reporting ... Former-commit-id: 6064384b14e055701f11c3a1f4931aa6eb27adda	2019-05-07 00:59:05 -04:00
Imbris	33fbcd1e93	formatting tweaks ... Former-commit-id: 90d46c995737d7077a581e9767209fc338c392fa	2019-05-07 00:48:39 -04:00
Imbris	990b42a6b0	remove poison err & Segment Asset impl, cleanup ... Former-commit-id: a2bf1ed8400da824c18ceb33a02160ecaf7d43fa	2019-05-07 00:47:22 -04:00
Imbris	1d5020634d	revamp asset system with a global singleton cache ... Former-commit-id: edfc83397ed897fcec37589261c2cfae42d6ec32	2019-05-07 00:44:44 -04:00
timokoesters	c7dd3e96cc	Start work on image_ids! and asset loading ... Former-commit-id: 1e86e627f8ec6a146aa59558da50658beaad91c6	2019-05-07 00:28:05 -04:00
robojumper	b2c2d89447	Run cargo fmt ... Former-commit-id: c038eee51ee522fc170f7dcee94c533ad2708df2	2019-05-05 17:54:08 +02:00
robojumper	647d1dcc9c	Smoother and terrain-aware camera ... Former-commit-id: 46b4e90d03792c9efb7d6b728c0d0cd60b1f5058	2019-05-05 17:44:56 +02:00
Imbris	7a192a9466	add nightly feature back for specs -> shred ... Former-commit-id: b483f75c10cc47faa66ab8063f7747e654068634	2019-05-01 14:46:06 -04:00
Imbris	f0b0b83cc8	Store thread pool in State, Remove unnecessary dep ... Former-commit-id: cbce09915267f264801c174817b97ed3528715fd	2019-05-01 14:10:43 -04:00
Forest Anderson	993388e56a	Ran fmt on codebase ... Former-commit-id: 7fecffa1dc66fffba4f07d45fb80960dc5178f4f	2019-04-29 20:37:19 +00:00
timokoesters	f35e8d7b98	Fix gitignore and delete gitignores in subdirs ... Former-commit-id: 4d57caa521c47d137e29d5b781abbdda6a2d8759	2019-04-29 20:43:04 +02:00
Joshua Barretto	e4d6d96afc	Remove post debugging ... Former-commit-id: 4a82bf8b6178fb88d5a6ea93706fb4e97ac2256d	2019-04-25 20:25:22 +01:00
Joshua Barretto	5e38eee8d4	Added chunk deletion ... Former-commit-id: 63c29e43c4dc28097aaf4e0ff72977c7db5cc28f	2019-04-25 20:08:26 +01:00
Joshua Barretto	f136a63f69	Adjusted terrain loading and meshing performance ... Former-commit-id: b55800b559289bf925d56096f29c0cfbc22439d2	2019-04-25 17:52:11 +01:00
Joshua Barretto	0b0c71592c	Fixed orientation issue ... Former-commit-id: 9fdeadb4c9a9ff55cbdeccbbf97ac32b4e9f4226	2019-04-25 17:52:11 +01:00
Joshua Barretto	fc8b7e9750	Worked on improving networking and terrain ... Former-commit-id: e5ce819036a01f274c1c114bcd3b50fa42858703	2019-04-25 17:52:11 +01:00
timokoesters	927f3a12ba	Fix ray issue after max_iteration ... Former-commit-id: 55afdeeb0358934e3874ab3ca573e8cc71904ea1	2019-04-25 17:52:11 +01:00
timokoesters	c37db43580	Fix ray position ... Former-commit-id: 772d5652d44c9467d22c9c93547ac154ce3110b3	2019-04-25 17:52:11 +01:00
Joshua Barretto	9105bf0811	Added better terrain collisions ... Former-commit-id: 38de44654d8050260a19a1da6c40c0f701602f13	2019-04-25 17:52:11 +01:00
Joshua Barretto	f210de09df	Added raycasting (needs testing) and basic character terrain collision ... Former-commit-id: be6bfacfd28e777a64d8157fce129f8072e20b38	2019-04-25 17:52:11 +01:00
Joshua Barretto	f9f434a1c2	Started work on worldgen ... Former-commit-id: 277a4b2a0a5a393c590a710aebaf62e5cce2ad1d	2019-04-25 17:52:11 +01:00
timokoesters	701755a8e2	Add disconnect handling ... Former-commit-id: 24a9d535101f28debc0fe5a0600a32c9b744466f	2019-04-23 14:01:16 +02:00
timokoesters	3bf09f9f9c	Handle errors with error_state instead of disconnect ... Former-commit-id: cad5bbf9a5bb22dc6adf81d248d85d6a5d6aa140	2019-04-22 23:00:25 +02:00
timokoesters	06693136b6	Fixed names, debug and notify ... Former-commit-id: f58dedf7c4eb9b284982588fc6b19bbe3edb0391	2019-04-22 23:00:24 +02:00
timokoesters	e9027c6433	Split connecting from registering ... Former-commit-id: 56c21f72bc5b53635d6fdf00c99eb34df3b448c9	2019-04-22 23:00:24 +02:00
timokoesters	9a48e2fd42	Rename ClientState Connected -> Registered, Visitor -> Connected ... Former-commit-id: 34f6726203b7d20b42937a02f48d8920ca3f1d7a	2019-04-22 23:00:23 +02:00
timokoesters	07a2aab8a3	Rename Disconnected to Visitor ... Former-commit-id: aeb729a933cda380c03efe346347fc4dc0648dfb	2019-04-22 23:00:23 +02:00
timokoesters	fc2e6c3624	Clean up client state code ... Former-commit-id: 2469a49abd23038838f6176b7f5cf0b303e8bee5	2019-04-22 23:00:22 +02:00
timokoesters	794b9cafad	Implement ClientStates ... Former-commit-id: f6167fd6de6fd1a3309224409cac77193be982e2	2019-04-22 23:00:22 +02:00
timokoesters	802c484a38	Make character model more variable ... Former-commit-id: 331baad40c79d846290c4617ea8e359b2786c7ef	2019-04-22 23:00:21 +02:00
Joshua Barretto	779d50b6de	Fixed clock ... Former-commit-id: 585000319073e06f6511b3ef2c3db1135167d9d4	2019-04-22 17:50:18 +01:00
Joshua Barretto	247ba6621a	Made NPC movement smoother ... Former-commit-id: 105908cf0118113408acd5ad7dce191fe405f88f	2019-04-22 17:50:18 +01:00
timokoesters	91057edfac	Remove .internal and .internal_mut ... Former-commit-id: 261b656ec400f6780f2be2f5a4c331cc3b2a64a2	2019-04-22 10:24:27 +02:00
Imbris	1143c58e37	add graphic cache clearing on resize ... Former-commit-id: 49b3a52036171fd8b66d9fae73bebb15fbf83a0b	2019-04-19 21:35:12 -04:00
timokoesters	86898c26a0	Rename lastAnimation to last_animation ... Former-commit-id: 7eabea72ad5ee2cfed20b3927a828eb55fae8e33	2019-04-17 22:44:10 +02:00
timokoesters	ec16153164	Rename animationHistory to animation_history ... Former-commit-id: bb2c882332fa9c3fd7f2c7fbd6143cd5f85153d8	2019-04-17 22:32:36 +02:00
timokoesters	b9607ef405	Fix #21 by checking animation history ... Former-commit-id: 5272d1d7aee73fc07edeb31d9f29238d19b7d229	2019-04-17 19:39:12 +02:00
Joshua Barretto	6693d22ecd	Fixed animation copypasta bug ... Former-commit-id: e4b06e4e7c50214c7d7d9cc618ea7f117dc78ccc	2019-04-17 10:07:02 +01:00
Joshua Barretto	8029edde0b	Moved animation determination to Control ECS system ... Former-commit-id: 6650bc4d882d3f6779f99afea2e05155ad008282	2019-04-17 09:59:38 +01:00
Joshua Barretto	2c650f9cff	Added basic agent AI ... Former-commit-id: bb17edc8f2027c0c63c6a3ef0fc80c7a68c9aa05	2019-04-17 01:39:39 +01:00
Piotr	ddb32eec30	Animation States ... Former-commit-id: 769f09dc44143b5e54623ea819db2d6149429184	2019-04-16 14:29:44 +00:00
Joshua Barretto	c98d841890	Fixed physics sync ... Former-commit-id: 86d3af46c69f6566f4cab8d93ecf27636a9563cf	2019-04-15 00:29:28 +01:00
Joshua Barretto	f69ad40bd5	Fixed aspect on scene start, added more information to post errors ... Former-commit-id: 0daff37cbcad6f906962216ce923a005da6861c1	2019-04-14 16:05:51 +01:00
Joshua Barretto	7fc923f2a7	Rebased ... Former-commit-id: 017002bca2078f48998ecb412480492556082491	2019-04-14 14:23:43 +01:00
Joshua Barretto	a444826f0b	Fixed zombie network worker threads ... Former-commit-id: a8e74a9a8e42a0d5e1a79d87a1daf398e6294c73	2019-04-14 14:23:43 +01:00
Joshua Barretto	413bdf44e5	Extended timeout on huge transfer test to avoid failure on debug ... Former-commit-id: 7fa49db2ce310ff83b0c7ba2c4525771f16e7842	2019-04-14 14:23:43 +01:00
Joshua Barretto	9f5aab3564	Prevented postal workers spinning for too long ... Former-commit-id: e535f5745c817b7fd5f109711aaa65e6c78d6ecc	2019-04-14 14:23:43 +01:00
Joshua Barretto	f4260706e6	Updated package versions ... Former-commit-id: bb0d1efd718ddef598fbb894498a43ad014a11c0	2019-04-14 14:23:43 +01:00
Joshua Barretto	3112486005	Added partial chunk loading, package section to workspace Cargo.toml ... Former-commit-id: 4164daf4ccbe6695f664a44d0fce0ee10df39b8d	2019-04-14 14:23:43 +01:00
Joshua Barretto	507c47e771	Rewrote netcode, added basic chunk synching ... Former-commit-id: e9f76f7fa9dbe0c81cd4c998bf0f0b3eec9235cb	2019-04-14 14:23:43 +01:00
Joshua Barretto	f27b5fa975	Added server-side chunk generation ... Former-commit-id: 72e02f8ec711ec4fac3111b591c4b08086dee4e3	2019-04-14 14:23:43 +01:00
Joshua Barretto	3d9f8105e6	Started work on server-side chunks ... Former-commit-id: 84a6bd7358f67a77043c4b11c787538f073c8d28	2019-04-14 14:23:43 +01:00
Joshua Barretto	62b91eb01b	Integrated Sphynx ... Former-commit-id: 5d96983a385bb77a2876aa7439158252b7e2f0fc	2019-04-14 14:23:43 +01:00
Imbris	fb83c836a1	make to_server() blocking, post fixes & cleanup, use server address ... Former-commit-id: 7debc790e158a996ed58271d3307214e42b850bd	2019-04-14 15:04:44 +02:00
Marcel Märtens	251cccffe5	add simple interface to get assets from various locations ... Former-commit-id: 2ee6c4ef811e935eb8684a2cd827a97b8ad0be7a	2019-04-13 03:40:59 +02:00
Pfauenauge	8ecb849970	Char Window, Mana, Health, Exp-Bar ... Former-commit-id: 546d29aae7441232892c7b7438708e93fb440128	2019-04-06 00:36:04 +02:00
Pfauenauge90	6ebff7ce2c	Merged with UI-Input ... Former-commit-id: f18e92dcac87c3b2806065078c70527ffd805876	2019-04-04 16:45:57 +02:00
Imbris	48d5c70b2a	minor fixes ... Former-commit-id: 56d6b123d6def65b3f7660eea6490277597813b0	2019-03-29 01:56:08 -04:00
Pfauenauge90	60df735e3b	accessories tab ... Former-commit-id: 542362e98e908c9ec7c563d7fdcd43c4b8f922fd	2019-03-28 23:03:39 -04:00
Joshua Barretto	3214164070	Working with upstream ... Former-commit-id: 6543387e4df9a96a443c510c9e382ace3731d2f6	2019-03-19 14:12:42 +00:00
Joshua Barretto	c75625f179	Physics update adjustment ... Former-commit-id: 10a8828b1ac496c7419672b88049fbda848d9d9d	2019-03-19 11:35:38 +00:00
Joshua Barretto	ffc4e6ebd4	Improved State API design ... Former-commit-id: a32ab93409b1044fe2838f684d30ca2b963d4eb2	2019-03-19 11:35:38 +00:00
Joshua Barretto	99bd0630b7	Added post refactor unit tests ... Former-commit-id: 66ea368de32dc6dfe22fc752476b71856e0588a0	2019-03-19 11:35:38 +00:00
Joshua Barretto	664f28a972	Patched in netcode refactor ... Former-commit-id: 34a3b9a95129edad6dc8280d9a3cb41581d4d386	2019-03-19 11:35:38 +00:00
Joshua Barretto	a8b0039898	Added networked entity updates, player entity allocation ... Former-commit-id: b81d6e38a74f846d64c092d1422dc402f369100c	2019-03-19 11:35:38 +00:00
Joshua Barretto	bb93f29522	Fixed client/server comms bug ... Former-commit-id: fffc9cbf59784e7e2c9c2d9a60b8f2520b6f41fb	2019-03-19 11:35:38 +00:00
Tanner Donovan	d9f179b980	update Duration method calls ... Former-commit-id: 4343e30583f74094a73365465a1d1ca912b693e6	2019-03-18 16:46:37 -07:00
Joshua Barretto	2e613178a0	Component sync + UID system ... Former-commit-id: 5ecddc0e1f9c1a15f99dd167b825178c972da062	2019-03-04 19:58:58 +00:00
Joshua Barretto	ef333877ae	Added Uid marker component ... Former-commit-id: b0aae7a8e6dd075996f3bee6cc7be29763f6cdaa	2019-03-04 19:58:58 +00:00
Joshua Barretto	dbbcc1e80e	Added basic networked communications, chat communication ... Former-commit-id: 06bafdf69486f4da5fbc416835e34c5bed8c2caa	2019-03-04 19:58:58 +00:00
Joshua Barretto	72e0cacfef	Merge branch 'physics' into 'master' ... Player movement with basic physics ecs system See merge request veloren/fresh!9 Former-commit-id: 87ca6d878c32b7fae9de9994ab2771129d76c747	2019-03-02 19:51:37 +00:00
Imbris	33b8922aa4	move/name velocity constant, rename move_vec, simplify cam rotate_by() ... Former-commit-id: 0835a9e91bd0133922f5d4e9731b9f6b6b547a0b	2019-03-02 14:43:51 -05:00
Imberflur	6f5f80f749	add player movement with basic physics ecs system ... Former-commit-id: f2e151971a42b25bfd1971311f5a06535a577007	2019-03-01 22:48:30 -05:00
Joshua Barretto	3f5782e993	Netcode usability improvements ... Former-commit-id: a0e0d0b6fd503b4de9c60d2fcb02562def98c75e	2019-02-25 16:45:54 +00:00
Maciej Ćwięka	d011256542	Moved PostBox and PostOffice to separate files, finished implementing PostBox, started implementing PostOffice, fixups all over the place ... Former-commit-id: 7a891b8937498b534ad611d7ede29de01ba88ea7	2019-02-19 16:59:50 +00:00
Joshua Barretto	8a37662cf0	Cleaned up codebase, added cursor grab toggle	2019-01-23 22:21:47 +00:00
Joshua Barretto	248577bdef	Added test terrain loading and meshing	2019-01-23 20:01:58 +00:00
Joshua Barretto	41b6672743	Added Terrain type to scene	2019-01-15 15:13:11 +00:00
Joshua Barretto	bd561dd1aa	Added terrain pipeline	2019-01-14 23:13:58 +00:00
Joshua Barretto	ae4f1ae2ea	Added vox trait	2019-01-14 18:49:53 +00:00
Joshua Barretto	8184bc6fc0	Added figures, segments, test .vox files, basic animation test	2019-01-13 20:53:55 +00:00
Joshua Barretto	b37a6b67f9	Added time of day, tick time, basic skybox shader and client to voxygen	2019-01-12 15:57:19 +00:00
Joshua Barretto	523db9f054	Started work on adding terrain	2019-01-02 19:22:01 +00:00
Joshua Barretto	819af1594f	Initial structure	2019-01-02 17:23:31 +00:00