766 Commits

Author	SHA1	Message	Date
jshipsey	9ff5c23cf0	readd sneak	2020-08-08 13:47:32 -04:00
jshipsey	691607f398	swimming changes	2020-08-08 13:47:32 -04:00
scott-c	cae84dd4c9	fix rebase	2020-08-08 20:53:07 +08:00
scott-c	70ff8c3faa	Add Copy trait to dependents	2020-08-08 19:26:52 +08:00
scott-c	dd1e89a691	Implement particle heartbeat scheduler	2020-08-08 19:26:52 +08:00
scott-c	a0107d5cda	fix rebase	2020-08-08 19:26:52 +08:00
scott-c	bf025df204	refactor sfx mgr outcome useage	2020-08-08 19:26:52 +08:00
scott-c	023d465370	clear particle gpu instance buffer when disabled	2020-08-08 19:26:52 +08:00
Joshua Barretto	a924f9694d	Explosion sound and event lights	2020-08-08 19:26:52 +08:00
Joshua Barretto	8547cdd681	Added outcome sound effects, fixed directional sound, particle outcomes	2020-08-08 19:26:52 +08:00
scott-c	5ba4d26821	Update changelog	2020-08-08 19:25:29 +08:00
scott-c	5acfe44cbb	Add toggle particles graphics setting	2020-08-08 19:25:01 +08:00
scott-c	f9f9e9e190	Add particle count to debug info	2020-08-08 19:25:00 +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	7e35617f59	Add particle pipeline	2020-08-08 19:24:25 +08:00
Imbris	1741384d00	Add entity targeting	2020-08-08 01:09:01 +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
jshipsey	bcc257f893	cleanup, last tweaks	2020-08-01 02:19:45 -04:00
jshipsey	aa3bdc42d7	arming the cyclops	2020-08-01 02:19:45 -04:00
jshipsey	5d2be2240e	maneater and feed anim	2020-08-01 02:19:45 -04:00
jshipsey	baf67f303e	new models, anim tweaks	2020-08-01 02:19:44 -04:00
Snowram	3524d644f5	Various changes to npcs animations ... - Improved dragon run with tilting - New run animation for quadsmall, added tilting	2020-08-01 02:19:43 -04:00
Samuel Keiffer	827b91d691	Bow charged shot attack	2020-07-26 03:06:53 +00:00
jshipsey	5b76ed23f4	small fixes	2020-07-20 21:37:13 -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
Joshua Barretto	8d6b442193	Crafting	2020-07-14 20:11:39 +00:00
Kai	6b771b8dca	Add a clientside check to only allow freefly camera for admins	2020-07-11 13:59:47 -07:00
Kai	738fa34534	Add freefly camera mode and cycle camera mode keybind	2020-07-11 11:39:04 -07:00
Samuel Keiffer	fe47a14ba5	Spin attack for axe	2020-07-08 19:58:41 +00:00
scott-c	b72d817cf7	Fix 1h models in character select idle animation #662	2020-07-06 17:54:26 +08:00
scott-c	6014bd8364	fix 1h second item cache issue #661	2020-07-06 17:54:26 +08:00
jshipsey	62eb66173f	tweaks and fixes	2020-07-05 09:39:55 -04:00
jshipsey	ca9ae13527	more latitude tilt, better attack anims, addressed aesthetic concerns, deleted dead assets	2020-07-05 09:38:15 -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	e689de3c8a	better everything	2020-07-05 09:38:14 -04:00
jshipsey	f164bd2280	placeholder attack anim	2020-07-05 09:38:14 -04:00
jshipsey	894a823aad	orientation tilt, make run frequency proportional to species size	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	4acdc24df9	Add tarasque and grolgar improvements	2020-07-05 09:38:14 -04:00
unknown	0de4b6b7f9	Makes anim hotload work for quadlow	2020-07-05 09:38:14 -04:00
Snowram	390f516e13	Homogenizes quadmed bones names	2020-07-05 09:38:12 -04:00
Snowram	9fec5f3d14	Add tiger mob	2020-07-05 09:38:12 -04:00
jshipsey	ccf939b4fd	manifests, skeleton, basic placement	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	fe1656931c	Add legs to quadruped_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	954a4857c4	Added proper training dummy model	2020-07-03 16:53:04 -04: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
scott-c	d53b51954b	Added ability to use 2 x 1h weapons or shields	2020-07-01 17:51:06 +08:00
Delyth Williams	6644375764	Fix sprites w/o models	2020-06-27 21:08:21 +00:00
Delyth Williams	9a79101f57	Welsh pixie/grassets	2020-06-25 21:12:31 +00:00
Shane Handley	304e06cbce	Fix clippy warnings after toolchain update	2020-06-23 16:52:04 +10: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	af3af6c169	Convert voxygen to use tracing ... There are several noteable changes in this commit that mean that logging will behave differently to how it did previously. - There are now no separate filter levels for terminal and file output. This is a feature that is lacking in `tracing` but is set to be resolved by https://github.com/tokio-rs/tracing/pull/508. At which point we MAY include it. - The default log level was previously `WARN` - it is now `INFO`.	2020-06-21 23:17:25 +08:00
Imbris	124ed52554	Windows is weird, cargo is weird..... (also tidy up a few things)	2020-06-19 00:48:19 -04:00
Imbris	d00e88b804	Hotreload animations using libloading	2020-06-19 00:48:19 -04: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
Delyth Williams	b73da5507e	added new flora	2020-06-15 16:39:21 +00: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
Joshua Barretto	9a069c93dc	Better physics comments, removed camera snapping	2020-06-01 21:33:20 +01:00
Justin Shipsey	3877efec50	optimization and tails	2020-06-01 00:33:24 +00:00
Monty Marz	f7d6f76a04	Added 36 Swords ... I added 36 sword models to the code.	2020-05-29 18:23:00 +00:00
Justin Shipsey	ea07d744a7	orientation animation	2020-05-27 06:41:55 +00:00
Joshua Barretto	f09af7980f	Fixed aiming for non-humanoids	2020-05-19 14:47:51 +01:00
Joshua Barretto	05e6df1b65	Added overhead aiming camera	2020-05-19 14:26:53 +01:00
Joshua Barretto	2f47d09af4	Comment fixes and fmt	2020-05-19 00:35:58 +01:00
Joshua Barretto	f1b166d15d	Innumerable camera improvements	2020-05-18 23:40:28 +01:00
jshipsey	cf392b5a66	fmt	2020-05-09 18:11:25 -04:00
Snowram	0248c6a44e	Cleanup	2020-05-09 18:09:27 -04:00
Snowram	cd452cc715	New dragon model, added jaw, splitted head into upper/lower	2020-05-09 18:09:05 -04:00
Snowram	875838ecdf	Initial fly animation work	2020-05-09 18:08:35 -04:00
Snowram	7f0d1e9543	Initial idle animation work	2020-05-09 18:08:35 -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	28c454f9ca	Fix infinitys and NaNs in lights	2020-05-04 17:17:54 -04:00
CapsizeGlimmer	4e7f8c686a	Equipped lanterns now provide an illumination effect.	2020-05-04 15:15:31 +00:00
Monty Marz	c792cc05a9	Villagers and Cultists	2020-04-30 20:43:24 +00:00
Justin Shipsey	b4af588a00	skel attribute transfer	2020-04-27 05:11:34 +00:00
Monty Marz	6d7cb8654d	Merge branch 'pfau/ui-fixes' into 'master' ... UI Fixes See merge request veloren/veloren!946	2020-04-26 01:44:56 +00:00
Monty Marz	4521791591	UI Fixes	2020-04-26 01:44:56 +00:00
Justin Shipsey	6fa13bcb7e	body/anim tweaks	2020-04-26 01:09:03 +00:00
Joshua Barretto	90de779559	Better LoD variable names	2020-04-25 21:44:23 +01:00
Joshua Barretto	93105105e0	Added extra LoD level to terrain sprites	2020-04-25 21:44:23 +01:00
Joshua Barretto	8e95444d85	Made GPU bone updates more conservative for moar fps	2020-04-25 21:44:23 +01:00
Joshua Barretto	c05f4fe009	Added configurable sprite view distance, minor bug fixes	2020-04-25 21:44:23 +01:00
Joshua Barretto	8bf5709ddf	Implemented Treeco's z-only LoD suggestion	2020-04-25 21:44:23 +01:00
Joshua Barretto	1feae79243	Added reseeding for sites	2020-04-25 21:44:23 +01:00
Joshua Barretto	ebd1537769	Fixed figure update rate at a distance	2020-04-25 21:44:23 +01:00
Joshua Barretto	39b88dbcb1	Added LoD for figures and reduced update rates for far figures	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	b2c8dc0806	Added terrain sprite LoD	2020-04-25 21:44:23 +01:00
Treeco	dd08def18f	Add camera smoothing setting	2020-04-23 22:59:34 +00:00
Joshua Barretto	1a4c7f46f4	Fixed second render chunk counting issue	2020-04-23 18:19:42 +01:00
Joshua Barretto	0c491bb558	Fixed incorrect chunk render counter	2020-04-23 18:19:42 +01:00
Joshua Barretto	1983fd8ec1	Cleanup, fixed clouds, removed 45-degree terrain sprites	2020-04-23 18:19:41 +01:00
Joshua Barretto	60bf396e4f	Added doors to houses	2020-04-23 18:19:41 +01:00
Monty Marz	44c5002db3	Pfau/crops	2020-04-23 18:19:41 +01:00
Joshua Barretto	431e199731	Added correctly generating world paths, sub-voxel shader noise	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	77d0292e91	Added windows to buildings and scarecrows	2020-04-23 18:19:41 +01:00
Pfauenauge90	db5311189d	scarecrow	2020-04-23 18:19:41 +01:00
Pfauenauge90	98704a4753	turnip and window blocks	2020-04-23 18:19:41 +01:00
Monty Marz	0fb3a115da	Add more crops	2020-04-23 18:19:41 +01:00
Joshua Barretto	f999edffaa	Fixed crop crash issues	2020-04-23 18:19:41 +01:00
Pfauenauge90	d57ca371e2	fix panic	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	3d4a294b83	Smoothed camera motion, gentler orientation lerping	2020-04-23 18:19:40 +01:00
Joshua Barretto	5f2d0021a3	Reversed water draw order	2020-04-23 18:19:40 +01:00
Joshua Barretto	0021bd6452	Added new settlement generation to world, basic rendering	2020-04-23 18:19:40 +01:00
Joshua Barretto	944a37b848	Initial settlement generation work	2020-04-23 18:19:40 +01:00
Imbris	2c4c006396	Lantern tweaks, remove unused bones	2020-04-12 18:41:07 +02:00
Imbris	c1c09dce1b	Enable unequipping as well as equipping to specific slots	2020-04-12 18:41:06 +02:00
jshipsey	e2d60b858e	cape work	2020-04-12 18:41:05 +02:00
jshipsey	ea2c646df3	initial cape implementation	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
Capucho	b6078d832a	Fixed the player being rendered after dying	2020-04-08 21:28:33 +01:00
Capucho	8f6686adc1	Fix the problems of players walking over water with dithering	2020-04-07 22:50:01 +00:00
Capucho	a21ae27a77	Add player transparency and silhouette	2020-04-04 19:36:55 +00:00
Imbris	831d7c77a6	Make Asset impls avoid panics when parsing fails	2020-04-01 20:06:15 -04:00
AdamWhitehurst	dcc9d44b1c	remove unused timed_combo	2020-03-29 13:40:03 -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
jshipsey	8fd774f21a	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-27 23:59:45 -04:00
jshipsey	49ba196671	proper bow animation	2020-03-27 23:59:05 -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
Pfauenauge90	0b3fb2dd3c	fire bolt visuals	2020-03-27 18:31:45 +01:00
jshipsey	0ffff86e25	third attack for triple strike	2020-03-27 01:57:30 -04:00
jshipsey	1c3d1d260c	small animation tweaks	2020-03-26 23:51:55 -04:00
jshipsey	175fea98ef	more cleanup, WIP fake swimming	2020-03-26 01:35:25 -04:00
Imbris	3889ec7292	climbing tweaks, fix triple strike overflow, fix Last<CharacterState> ... not registered	2020-03-25 02:05:28 -04:00
jshipsey	047f6b8a01	fixed swimming, better charge	2020-03-25 01:22:07 -04:00
jshipsey	a6537ed69b	starting foot movement with attacks, clearing some dead code	2020-03-25 00:15:06 -04:00
timokoesters	58585e0810	Better climbing, fireball impl	2020-03-24 20:09:23 +01:00
jshipsey	7a4f0fa9ac	climb fix, const tweak update, trying equip anims	2020-03-24 00:24:31 -04:00
jshipsey	9cbbe0311f	rewrote the whole stupid skeleton to work much smarter	2020-03-22 16:06:53 -04:00
jshipsey	3baa0471ec	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-22 11:55:35 -04:00
jshipsey	0773524031	wield idle, wield run	2020-03-22 11:55:28 -04:00
Pfauenauge90	662f5b1037	removed warnings and item test values	2020-03-22 14:55:08 +01:00
Adam Whitehurst	db8d89a4d9	* rename CharacterState equals() -> same_variant()	2020-03-22 05:46:09 -07:00
Imbris	41c424ac13	Optimized uses of emitters, cleanup	2020-03-22 00:49:46 -04:00
Imbris	f399085974	Flip models for hands, shoulders, and feet of humanoids	2020-03-21 18:48:21 -04:00
Adam Whitehurst	c5378b7065	Better triple_strike handling	2020-03-21 14:55:04 -07:00
jshipsey	221f675217	spin attack	2020-03-21 14:54:29 -04:00
Imbris	08db424169	Add safe_slerp function that ensures that slerping returns non-NaN normalized values	2020-03-21 00:53:41 -04:00
jshipsey	514d65eb7c	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-20 18:54:54 -04:00
jshipsey	a0785e693a	shooting anim state, cast anim, small tweaks	2020-03-20 18:54:27 -04: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
Adam Whitehurst	0b7a572178	update triple_strike	2020-03-19 15:40:03 -07:00
timokoesters	1e1ce2adbf	Fix weapon not updating after swapping to a weapon of the same type	2020-03-19 20:57:36 +01:00
timokoesters	26674390ab	Hide player body after death	2020-03-19 20:36:19 +01:00
timokoesters	87c276b292	Add hard coded loot	2020-03-18 20:37:42 +01:00
timokoesters	4741e41230	Add support for different models per weapon type	2020-03-17 18:28:07 +01:00
timokoesters	08b44db1fc	Stop first person bounce in air	2020-03-17 16:08:53 +01:00
Pfauenauge90	b9f6dfac77	fixes	2020-03-17 16:07:20 +01:00
Pfauenauge90	40910b28e4	unclothed parts	2020-03-17 15:39:29 +01:00
timokoesters	b040e18246	Fix body parts not changing	2020-03-16 22:06:23 +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
Joshua Barretto	e20feeeb0c	Added armour items and equipping of armour	2020-03-15 16:42:09 +01:00
timokoesters	aa963b7686	Merge remote-tracking branch 'origin/master' into clientstates	2020-03-15 15:27:06 +01:00
timokoesters	598a4c6cbb	Add loadout struct for info on weapon configurations	2020-03-14 22:33:20 +01:00
AdamWhitehurst	6fc94c22ba	Update timed combo, add CharacerBehavior trait	2020-03-14 12:50:07 -06:00
Mckol	8838682f0b	Added Controller support	2020-03-10 21:00:13 +00:00
jshipsey	bce9d4c24f	animation corrections	2020-03-08 17:02:25 -04: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	b1d1299fe6	Clean up character states	2020-03-07 10:15:02 -08:00
Imbris	ed5afaec8a	Fix tests	2020-03-05 23:12:51 -05:00
Imbris	4a0c474be1	Remove Client dependency from Scene types and audio managers, add an ... example for using voxygen as a library to renderer images of characters	2020-03-05 23:12:51 -05:00
Justin Shipsey	86e15695fc	weapon control bone	2020-03-05 14:02:11 +00:00
timokoesters	d0439fdd84	Merge remote-tracking branch 'origin/master' into clientstates	2020-02-24 21:34:17 +01:00
timokoesters	2fa902270e	fix: block	2020-02-24 18:10:42 +01:00
Treeco	abe47d8621	Gamma setting now works	2020-02-17 00:46:31 +00:00
Monty Marz	93d7c67cdc	Hack to allow minimap rotation. ... Currently it just always rotates towards the camera, but it wouldn't be hard to create a config option that swaps out the rotation of the indicator and the map.	2020-02-06 17:34:32 +00:00
timokoesters	0bc07a0835	Merge remote-tracking branch 'origin/master' into clientstates	2020-02-03 22:02:32 +01:00