1892 Commits

Author	SHA1	Message	Date
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	7208b37dc5	Squashed figure vertices for better performance	2020-04-25 21:44:23 +01:00
Joshua Barretto	37301706d4	Reduced size of terrain sprite vertices	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
Pfauenauge90	3421b3d8da	sprites VD slider visuals	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	e498d78b6c	Fixed boundary meshing issue for scaled terrain sprites	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	2a6a19f7ef	fmt	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	01e2cd2b88	Warning cleanup	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	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	58874803a3	Disabled chunk mesh sorting for now	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	a9adebcab3	Improved rendering performance with smarter meshing order	2020-04-23 18:19:41 +01:00
Pfauenauge90	db5311189d	scarecrow	2020-04-23 18:19:41 +01:00
jshipsey	729912d33b	corrected villager empty weapon issue	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	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	c4879e991d	Enabled AO in darkness, better light attenuation	2020-04-23 18:19:41 +01:00
Joshua Barretto	568a8ab87c	Increased block rendering altitude range	2020-04-23 18:19:41 +01:00
Joshua Barretto	48e67ba9c0	Fixed terrain sprite 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	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	8c73ec982c	Resolved rebase problems	2020-04-23 18:19:40 +01:00
Joshua Barretto	b3c9122395	Overhauled domestic economy simulation, better debug information	2020-04-23 18:19:40 +01:00
Joshua Barretto	a0dae82a2b	Added correctly allocated labours, fishing	2020-04-23 18:19:40 +01:00
Joshua Barretto	df5aa93fd7	Better AO, fixed cloud pixelation	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
Songtronix	26e27f4198	fix toolchain	2020-04-21 20:04:55 +00:00
Imbris	b3c54a9bbb	Merge branch 'olexorus/fix_serverlist_panic' into 'master' ... Fix panic if default server index is out of bounds See merge request veloren/veloren!909	2020-04-14 17:06:51 +00:00
Olexorus	027d0f11da	Fix panic if default server index is out of bounds	2020-04-14 18:32:01 +02:00
Pfauenauge	25a9d5bf2f	resolved comments	2020-04-12 21:45:19 +02:00
Pfauenauge90	cee1c2f85b	cleanup, slot background, scaling	2020-04-12 18:41:10 +02:00
Imbris	b9a66a93b7	Add backgound to hotbar slots	2020-04-12 18:41:09 +02:00
Imbris	c6b5570637	Move item amount text to bottom right	2020-04-12 18:41:09 +02:00
Imbris	cae5313127	tooltips for the skillbar	2020-04-12 18:41:08 +02:00
jshipsey	d7e605e658	lantern visuals, random cape flutter	2020-04-12 18:41:08 +02:00
Imbris	2c4c006396	Lantern tweaks, remove unused bones	2020-04-12 18:41:07 +02:00
Imbris	f81f91162d	Basic hotbar functionality	2020-04-12 18:41:07 +02:00
Imbris	77d13376d3	Add right click to use, latern is not armor tweaks	2020-04-12 18:41:07 +02: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
Imbris	66b4c0d529	rework slot trait	2020-04-12 18:41:05 +02:00
jshipsey	e2d60b858e	cape work	2020-04-12 18:41:05 +02:00
Pfauenauge90	88a938653b	translation fix	2020-04-12 18:41:04 +02:00
Pfauenauge90	0a52dc61d6	hotbar text shadows	2020-04-12 18:41:04 +02:00
Pfauenauge90	f24ba71d94	hotbar keybindings	2020-04-12 18:41:03 +02:00
Pfauenauge90	a29f199e80	fmt	2020-04-12 18:41:02 +02:00
Pfauenauge90	2263b9be95	starter chest, removed unused key commands	2020-04-12 18:41:02 +02:00
Pfauenauge90	d62dfffd69	starter armor in char creation	2020-04-12 18:41:01 +02:00
Pfauenauge90	0fb5b73606	fix	2020-04-12 18:41:00 +02:00
Pfauenauge90	85f9f80024	starter equip	2020-04-12 18:41:00 +02:00
Pfauenauge	6dcdd80ec8	smarter code	2020-04-12 18:40:59 +02:00
Pfauenauge	c6eda08679	fmt	2020-04-12 18:40:59 +02:00
Pfauenauge	d5128b751d	png item images, fix map cursor	2020-04-12 18:40:59 +02:00
Pfauenauge90	ca667fd02b	tooltips	2020-04-12 18:40:58 +02:00
jshipsey	ea2c646df3	initial cape implementation	2020-04-12 18:40:57 +02:00
Pfauenauge90	fa03f9ddb9	slot kinds	2020-04-12 18:40:56 +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	1f31b7f123	Drag things!	2020-04-12 18:40:55 +02:00
Imbris	6c336c015e	Make remove skin in armor item images	2020-04-12 18:40:54 +02:00
Imbris	77948d27ca	Scale content image based on slot size, fix weapon images not showing, stop selection of empty slots	2020-04-12 18:40:54 +02:00
Imbris	4c5f668203	Don't show icon when slot is filled and have a separate image for filled ... slot backgrounds	2020-04-12 18:40:54 +02:00
Pfauenauge	cac2321464	armor slot visuals	2020-04-12 18:40:53 +02:00
Imbris	0b932ae99a	Use new slot widget for armor slots	2020-04-12 18:40:53 +02:00
Imbris	968c064874	Restore slot interaction functionality	2020-04-12 18:40:52 +02:00
Imbris	9c76bdde0e	Setup basic generic slot system and used it for the inventory slots	2020-04-12 18:40:52 +02:00
Olexorus	4bd7e5ab67	Allow passwords with up to 35 characters	2020-04-12 13:52:39 +02:00
Carbonhell	c0c92c4259	Fixes mouse_input event not being pushed everytime	2020-04-09 18:43:12 +02:00
Carbonhell	20ec77eeb0	Fixes mouseinput event ignoring cursor_grabbed being true	2020-04-08 23:46:42 +02:00
Capucho	b6078d832a	Fixed the player being rendered after dying	2020-04-08 21:28:33 +01:00
Carbonhell	198c875559	Carbonhell/keybindings	2020-04-08 17:36:37 +00:00
Capucho	8f6686adc1	Fix the problems of players walking over water with dithering	2020-04-07 22:50:01 +00:00
Monty Marz	32db0df208	Merge branch 'pfau/small_ui_fixes' into 'master' ... Small UI fixes See merge request veloren/veloren!888	2020-04-04 21:51:06 +00:00
Monty Marz	07242644ca	Small UI fixes	2020-04-04 21:51:06 +00:00
Imbris	e2c818b556	Merge branch 'imbris/fix' into 'master' ... Remove newline from password when pressing enter See merge request veloren/veloren!887	2020-04-04 21:45:30 +00:00
Capucho	a21ae27a77	Add player transparency and silhouette	2020-04-04 19:36:55 +00:00
Imbris	d36c2cac99	Trim newlines from password when pressing enter	2020-04-04 13:55:25 -04:00
Songtronix	4fdf6896ab	Merge branch 'shandley/fix-sfx' into 'master' ... Fix run SFX See merge request veloren/veloren!880	2020-04-02 07:05:33 +00:00
Shane Handley	3e4b40380f	fix: Restore run SFX when the character is using a weapon other than the sword.	2020-04-02 14:47:26 +11: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	87a82bb59a	Fix tests	2020-04-01 11:41:26 -04:00
Marli Frost	3806f08eb0	feat: configure audio output using an enum	2020-03-31 22:29:30 +01:00
Marli Frost	a83f09bd60	fix: avoid rodio API when audio is disabled	2020-03-31 21:28:09 +01:00
Marli Frost	c82d1b9316	allow the game to start without an audio device	2020-03-31 21:27:55 +01:00
Imbris	508def2701	Merge branch 'capucho/resume-do-not-eject-cursor' into 'master' ... Don't eject mouse on resume Closes #307 See merge request veloren/veloren!873	2020-03-31 16:50:45 +00:00
Imbris	b3791a2b4e	Upgrade vek version so that it actually uses the patch	2020-03-30 19:44:51 -04:00
Capucho	3f1f9b9ab0	Make so that the resume button doesn't eject the mouse	2020-03-30 22:00:46 +01:00
Capucho	abc1a041fa	Added a portuguese translation	2020-03-30 22:57:26 +02:00
AdamWhitehurst	d3b99fc026	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-29 13:40:08 -07:00
AdamWhitehurst	dcc9d44b1c	remove unused timed_combo	2020-03-29 13:40:03 -07:00
jshipsey	ff56e5f9f9	fireball damage tweaks/staff shooting anim	2020-03-29 14:00:05 -04:00
jshipsey	fa54c90558	cleanup, tweak to triplestrike stage 1	2020-03-29 03:53:52 -04:00
Pfauenauge90	e3a5051b52	small fix	2020-03-28 18:06:00 +01: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
Capucho	15d2a6d3dc	Fix the wrong default keybind change	2020-03-27 19:36:20 +00:00
Capucho	15ecdfb9b4	Added an option for hold and added everything to the settings	2020-03-27 18:35:52 +00:00
AdamWhitehurst	d774091fa4	Add triple_strike anims for axe and hammer	2020-03-27 11:00:58 -07: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
Pfauenauge90	c3a4f897da	update help screen	2020-03-27 17:50:34 +01:00
Pfauenauge90	11be9c10b2	remapped default look key, removed unused keys	2020-03-27 16:09:51 +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
Pfauenauge90	50b7206577	asset cleanup, map visuals	2020-03-27 04:06:27 +01:00
Shane Handley	362771be4b	SFX and unit test fixes.	2020-03-27 12:06:25 +11:00
timokoesters	fe2aa7da7b	Merge remote-tracking branch 'origin/master' into combat	2020-03-26 23:43:33 +01:00
jshipsey	7692f1d354	fixed wield feet while jumping, tweaked charge anim	2020-03-26 18:26:23 -04:00
Capucho	03396eb77e	Implement #505	2020-03-26 21:22:21 +00:00
jshipsey	175fea98ef	more cleanup, WIP fake swimming	2020-03-26 01:35:25 -04:00
Pfauenauge90	5f10cdf0c6	adjusted foot step sounds, inventory space above bag	2020-03-25 21:06:01 +01:00
Pfauenauge90	8b05dda1d9	assset cleanup, transparency, new icons	2020-03-25 16:47:48 +01: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
jshipsey	c7d9b5ae0f	fixed critter animation	2020-03-25 01:29:55 -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
Pfauenauge90	550dd144bc	new icon art	2020-03-25 01:41:43 +01:00
timokoesters	58585e0810	Better climbing, fireball impl	2020-03-24 20:09:23 +01:00
timokoesters	99e7e1f785	Split staff into 3 abilities	2020-03-24 14:00:22 +01:00
jshipsey	7a4f0fa9ac	climb fix, const tweak update, trying equip anims	2020-03-24 00:24:31 -04:00
Pfauenauge90	7f30ec3d55	colors for inventory space counter	2020-03-24 01:31: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	c01cd62f5f	Move meta.dat to ron, so we don't create memory allocation errors	2020-03-23 14:18:05 +01:00
timokoesters	fb16106960	Merge remote-tracking branch 'origin/master' into combat	2020-03-23 11:30:47 +01:00
jshipsey	eddf3ec658	raised run anim speed 20%	2020-03-22 21:32:34 -04:00
Capucho	0358caa173	Fix the wrong logs directory being displayed on panic	2020-03-22 22:06:05 +00: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
jshipsey	eafd761d5a	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-22 00:14:11 -04:00
jshipsey	32c85d1bab	axe attack	2020-03-22 00:11:24 -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
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
jshipsey	a861f6ad26	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-21 15:47:28 -04:00
jshipsey	14f560f21b	proper hammer smash, small tweaks	2020-03-21 15:47:16 -04:00
jshipsey	221f675217	spin attack	2020-03-21 14:54:29 -04: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
jshipsey	49986a0e09	bow work	2020-03-21 03:40:14 -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
Pfauenauge90	4153df66ea	stat icons, frame colours	2020-03-20 20:52:32 +01: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	c630df7f9a	Ranged weapons now give xp on kill and also make enemies angry	2020-03-20 14:26:18 +01:00
Pfauenauge90	6836a043af	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-20 13:02:35 +01:00
Pfauenauge90	4f1104a417	new loading screen bg	2020-03-20 13:01:31 +01:00
Songtronix	b940cde501	change(panic): mention the game version in panic	2020-03-20 09:47:00 +01:00
jshipsey	50e96efe6b	hammer go smash	2020-03-20 02:38:53 -04:00
jshipsey	93bea033d9	axe, hammer proper wields	2020-03-20 01:27:54 -04:00
Pfauenauge90	6094e4b017	added chest drops	2020-03-20 01:11:02 +01:00
Adam Whitehurst	0b7a572178	update triple_strike	2020-03-19 15:40:03 -07:00
Pfauenauge90	3145b26cd6	item images	2020-03-19 22:36:40 +01: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
Pfauenauge90	44d3f4c4ac	fix	2020-03-19 20:01:31 +01:00
Pfauenauge90	3c0e070ed0	stack numbers	2020-03-19 19:33:59 +01:00
Pfauenauge90	e16bb66fb3	fix	2020-03-19 18:19:05 +01:00
Pfauenauge90	466b80e8a8	added const tweaker	2020-03-19 18:11:45 +01:00
timokoesters	6c129c9b8d	Fix amounts out of range	2020-03-19 16:51:50 +01:00
Pfauenauge90	0bb0d5e7a6	Update bag.rs	2020-03-19 16:43:11 +01:00
Pfauenauge90	041277917b	Update bag.rs	2020-03-19 15:49:32 +01:00
timokoesters	449ae22730	Add inventory stacking	2020-03-19 14:32:17 +01:00
timokoesters	87c276b292	Add hard coded loot	2020-03-18 20:37:42 +01:00
Pfauenauge90	1cb2022d35	UI visuals	2020-03-18 19:51:48 +01:00
Pfauenauge90	43bae55961	coin/currency visuals	2020-03-18 12:05:36 +01:00
Pfauenauge90	70511e0f4e	background images	2020-03-18 01:43:55 +01:00
Pfauenauge90	04c8ed9a3c	armour slot bgs	2020-03-17 19:48:15 +01:00
Pfauenauge90	d752501db1	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-17 19:04:11 +01:00
Pfauenauge90	c9d09b8cdd	more slots	2020-03-17 19:04:06 +01:00
timokoesters	4741e41230	Add support for different models per weapon type	2020-03-17 18:28:07 +01:00
Pfauenauge90	431974cf8e	test armor slot	2020-03-17 17:02:50 +01:00
timokoesters	d6929ae0ea	Select newly created character automatically	2020-03-17 16:22:34 +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
Pfauenauge90	7ded921ecc	more UI visuals	2020-03-16 22:58:19 +01:00
timokoesters	b040e18246	Fix body parts not changing	2020-03-16 22:06:23 +01:00
Pfauenauge90	11e4289f28	small fixes	2020-03-16 20:50:01 +01:00
Pfauenauge90	2e41b59282	removed character window and questlog	2020-03-16 19:56:15 +01:00
Pfauenauge90	b9f61d4e7a	UI colourable in the code, stats window	2020-03-16 18:55:43 +01:00
Pfauenauge90	ab8b83f8d6	more bag parts	2020-03-16 18:55:31 +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
Pfauenauge90	db6099a62f	reenabled inventory slots	2020-03-15 19:48:02 +01:00
timokoesters	1f78344d6f	Move equipment from loadout into body	2020-03-15 19:44:47 +01:00
Pfauenauge90	817cd24d54	minimap scale	2020-03-15 16:53:28 +01:00
Pfauenauge90	492db3ac5f	minimap position	2020-03-15 16:53:28 +01:00
Pfauenauge90	7b77064539	mmap visuals	2020-03-15 16:52:38 +01:00
Pfauenauge90	caf4159463	UI changes	2020-03-15 16:50:37 +01:00
Joshua Barretto	e20feeeb0c	Added armour items and equipping of armour	2020-03-15 16:42:09 +01:00
Pfauenauge90	1b170f70c3	Even less blending.	2020-03-15 15:53:51 +01:00
Pfauenauge90	0e7f3a6b00	Update vol.rs	2020-03-15 15:53:51 +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
timokoesters	fe19698d52	Make abilities depend on weapon	2020-03-14 16:40:29 +01:00
Shane Handley	4e5d200b70	Fix: Make the dropped item collection range match the world item range limit.	2020-03-12 11:54:23 +09:00
Shane Handley	434dd96cd6	Check for the mousedown state before trying to collect an item via secondary mouse click.	2020-03-11 15:39:46 +09: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
Mckol	c3f1afdf2b	Merge branch 'controller' into 'master' ... Controller support Closes #20 See merge request veloren/veloren!750	2020-03-10 21:00:13 +00:00
Mckol	8838682f0b	Added Controller support	2020-03-10 21:00:13 +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	16e4214a52	Switch states instead of popping	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
Imbris	8d7c454029	Hide password text	2020-03-08 23:00:34 +01:00
Imbris	0022f8464d	Update auth	2020-03-08 22:59:22 +01:00
Songtronix	d2e12fd166	feat(auth): localisation of authentication errors	2020-03-08 22:58:43 +01:00
Imbris	a04c1b1d1d	Add uid to Player component ... fix: world examples	2020-03-08 22:58:38 +01:00
Acrimon	d4225cfb45	Auth error help message. ... main menu message about auth	2020-03-08 22:57:09 +01:00
Imbris	6cc07270ac	improve(login): more precise error handling during login	2020-03-08 22:56:59 +01:00
Songtronix	ac5ff453cc	improve(voxygen): error handling while connecting	2020-03-08 22:54:49 +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	584dcddba9	Updated to latest and greatest auth version.	2020-03-08 22:46:40 +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
Snow	72b2334434	more eagle adjustements	2020-03-08 15:07:47 +00: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
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
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
Acrimon	511bbd3899	Merge branch 'capucho/screenshots-logs-directory' into 'master' ... Save screenshots and logs in a fixed directory Closes #484 See merge request veloren/veloren!835	2020-03-05 19:26:07 +00:00
S Handley	ea53dea8a7	Fixes https://gitlab.com/veloren/veloren/issues/484 partially by saving logs to a fixed place (defined in the settings file)	2020-03-05 19:26:07 +00:00
Capucho	a3479f6a49	Fixed the bugs in the settings tab and the character button in the escape menu and unpause when there is more than 1 player	2020-03-05 18:55:14 +00:00
Capucho	6f6b8986b6	Removed logging, added the changes to the changelog and fixed the logout button	2020-03-05 18:55:14 +00:00
Capucho	f13314e3da	Fixed the erroneous load on pause	2020-03-05 18:38:39 +00:00
Capucho	af21d19ff3	Moved paused from GlobalState to SinglePlayer to prevent errors and unpauses now works using the resume button	2020-03-05 18:38:39 +00:00
Capucho	a97b694dfe	Groundwork for fixing #36 and rewrite of client timeouts so that they don't use Instant and Duration	2020-03-05 18:38:39 +00:00
Justin Shipsey	86e15695fc	weapon control bone	2020-03-05 14:02:11 +00:00
Shane Handley	9d8d61736b	Deselect the inventory slot after dropping an item.	2020-03-05 16:11:45 +09: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
S Handley	daa0a10c2c	Revert "Do that better, and add a TODO." ... This reverts commit 9b0f11bd89. It wasn't better.	2020-03-01 19:45:05 +00:00
Shane Handley	0d2b26a3b8	SFX Fixes - Reinstate run, uncomment tests and make them pass, adjust ... config.	2020-02-25 22:03:29 +09:00
Justin Shipsey	5438514343	animation housekeeping	2020-02-25 06:47:56 +00:00
Shane Handley	d6f72876e9	Fix tests for movement sfx.	2020-02-25 10:01:41 +09: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	2fa902270e	fix: block	2020-02-24 18:10:42 +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
Monty Marz	18f46a6f83	Fix Fonts	2020-02-17 16:22:49 +00:00
Treeco	abe47d8621	Gamma setting now works	2020-02-17 00:46:31 +00:00
Treeco	aaf1de9f9b	Added gamma setting, not hooked up yet	2020-02-16 20:32:17 +00:00
Rémy PHELIPOT	98c37d0b28	[i18n] Configurable fonts ... - Add font configuration in internationalization files - Scale font size using a configurable ratio - Add a script to identify translation item statuses using Git metadata - Execute the i18n script in a new gitlab-ci step (delayed) - Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended) to add some additional latin characters (mainly for French)	2020-02-16 16:02:38 +01:00
Monty Marz	90680d5490	Fix healthbar background alignment	2020-02-16 10:58:44 +00:00
S Handley	b739623579	Split the audio channels into SFX and music channels. This makes the ... Music Channel for exploration music a basic Sink without spatial audio functionality, which is not required.	2020-02-15 21:30:44 +00:00
Imbris	fb7edd2404	Make nametag positioning slightly better	2020-02-06 17:10:52 -05:00
Imbris	f8283116a8	Fix highlighting non-collectibles	2020-02-06 17:06:49 -05: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
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
S Handley	b7ce91fead	Move music under audio ... Also add some blank time after each track so that we get some silence between tracks.	2020-02-03 11:55:32 +00: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
Joshua Barretto	faa86226c7	Collars	2020-01-29 12:01:28 +00:00
Justin Shipsey	908e099aa5	minor anim tweaks	2020-01-29 06:38:08 +00:00
Rémy PHELIPOT	ce54f27531	Add missing translations	2020-01-27 20:34:36 +01:00
Rémy PHELIPOT	c501b2d0bf	Use English instead of saved language if loading fails	2020-01-27 19:59:17 +01:00
Rémy PHELIPOT	8946ed8d82	Add missing translations in voxygen ... Fix #436	2020-01-27 19:59:17 +01:00
Rémy PHELIPOT	f60a68d96d	Improve i18n "get" performances by returning a &str	2020-01-27 19:59:17 +01:00
timokoesters	76dfac7366	fix: rolling	2020-01-27 18:32:05 +01:00
Justin Shipsey	53e57cb5dc	quad_medium animation	2020-01-27 14:16:23 +00:00
Treeco	6bcab1e89b	Fixed lag caused when turning the camera with large entity counts	2020-01-26 20:04:56 +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	2d9aa21eef	Added test world, friendly NPC pathfinding	2020-01-26 12:52:07 +00:00
Monty Marz	49071400d2	Fix: Healthbars size	2020-01-26 01:19:36 +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
Monty Marz	4287c76e95	Fix: Player can't push the "Enter World" button anymore without having a character.	2020-01-25 10:36:30 +00:00
Imbris	460f5e6f26	Enable pixel art resizing for voxel based ui elements	2020-01-24 23:14:59 -05:00
Imbris	e5d841e62f	Adds fullscreen and window size settings and coverage based pixel art ... scaling	2020-01-24 23:14:59 -05:00
Imbris	166aba61f0	Make nametages etc fixed size and only display within limited range	2020-01-24 22:09:45 -05:00
timokoesters	6515daddce	fixes	2020-01-24 16:57:24 +01:00
Pfauenauge90	c08c545474	fixed numbers spam	2020-01-24 16:10:38 +01: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	1d6d0ea03d	Fix all warnings.	2020-01-23 18:18:16 +01:00
Joshua Yanovski	14e4dfb53f	Re-fix map orientation.	2020-01-23 18:18:13 +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
Joshua Yanovski	72287f2041	Implement carving strategy for lake connections. ... Also fix mapgen slopes and make a much more pleasing world.	2020-01-23 18:18:08 +01:00
Monty Marz	bfee0a6f9e	Character stats displayed in char window, pulsating active slot in inventory	2020-01-23 17:14:02 +00:00
Monty Marz	1365abae99	Clean up unused UI assets	2020-01-22 21:56:03 +00:00
timokoesters	7b558b4542	refactor: combine actionstate and movestate	2020-01-21 23:54:59 +01:00
Monty Marz	e2707ff24a	start menu text	2020-01-21 22:04:39 +00:00
Gilbert Röhrbein	c2b99f3a62	Fix panic in case no default audio device found when audio off	2020-01-21 18:09:37 +01:00
Joshua Barretto	8e7a8aa4f9	Shader optimisations	2020-01-21 12:58:20 +00:00
Joshua Barretto	8a0bd9220b	Fixed button font	2020-01-20 22:54:51 +00:00
Joshua Barretto	4b5cc272ac	sync	2020-01-20 22:51:55 +00:00
Joshua Barretto	397fa7777f	Switched to enum-based char creation state	2020-01-20 22:29:14 +00:00
Rémy PHELIPOT	a6f9f533a5	Localization system for Voxygen ... - Added a localization system in voxygen - Support English and French languages - Added a configuration option in the interface settings to change the language	2020-01-20 21:07:25 +01:00
Joshua Barretto	0223a60a1e	Merge branch 'zesterer/cs-char-saving' into 'master' ... Client-side character saving See merge request veloren/veloren!737	2020-01-20 18:03:28 +00:00
Joshua Barretto	6f26f2afb1	fmt	2020-01-20 17:45:28 +00:00
Pfauenauge	caa5abf183	updated info main menu info	2020-01-20 18:08:05 +01:00
S Handley	b44955ba30	Remove currently unused audio assets ... This clears out about 56MB of unused audio files. There were also some unused methods in the audio modules which referenced a file, which has also been removed.	2020-01-20 15:07:30 +00:00
Joshua Barretto	fc1e66fb31	Solved character select body bug	2020-01-20 15:04:53 +00:00
Joshua Barretto	8f86e45a72	Enumerated Body type	2020-01-20 14:21:06 +00:00
Joshua Barretto	2c42aaf5f5	Added client-side character saving	2020-01-20 13:37:29 +00:00
Joshua Yanovski	898b5c6593	Fix benchmarks and profile overrides. ... This was necessary because Cargo recently deprecated the "overrides" keyword in favor of "package", and Criterion changed its interface. This commit also now lists more configurable keys, so if they aren't set to their defaults the user will be able to find them. This includes the roll key, which wasn't listed earlier and is different on Windows and Mac. It does *not* include the respawn key because that key is already shown when you die.	2020-01-20 14:16:28 +01:00
Joshua Yanovski	355a1b204a	Fixes for OS X machines. ... Handles scroll wheel events in pixels (enabling the scroll wheel) and sets rolling and wall leaping to use left shift by default on OS X (instead of middle mouse click, which is absent by default on Apple trackpads). Also updates the controls UI to show the actual assigned keys for those controls which are configurable.	2020-01-20 05:12:41 +01:00
Imbris	38c48317f7	Fix lighting calc bug, lower meshing bench sample size	2020-01-19 18:14:07 -05:00
Pfauenauge90	8a0efd3654	added TODO for energy numbers	2020-01-19 22:39:20 +01:00
Pfauenauge90	885e698e5a	charge icon update	2020-01-19 22:39:19 +01:00
Pfauenauge90	6a32845e58	various fixes	2020-01-19 22:39:19 +01:00
Pfauenauge90	480b920fa3	skillbar background fix	2020-01-19 22:39:18 +01:00
Pfauenauge90	863e4c4962	darkened button for unavailabe charge	2020-01-19 22:39:18 +01:00
Imbris	94210070f7	fmt fix	2020-01-19 16:03:27 -05:00
Imbris	3c8d0a3bb9	fix typo, replace u32 with Vec3<u8> in light propagation queue	2020-01-19 16:03:27 -05:00
Imbris	4b01c1b082	add: capability to disable blending for particular BlockKinds	2020-01-19 16:03:27 -05:00
timokoesters	ae1fa5e4c4	improvement: fog doesn't go back and forth anymore	2020-01-19 16:03:27 -05:00
Imbris	b3cdde3ce9	fix: panic in terrain meshing	2020-01-19 16:03:27 -05:00
Imbris	5666f18ded	Add terrain meshing benchmark	2020-01-19 16:02:12 -05:00
Imbris	6f6dc1b16b	Cleanup	2020-01-19 16:02:12 -05:00
Imbris	aa48729376	Compress position used in propagation queue, decrease outer bounds to the area sunlight can reach the inner area from	2020-01-19 16:02:12 -05:00
Imbris	09239caf88	While copying terrain sample to flat array, keep track of highest and lowest positions with exposed faces in order to constrain further iteration	2020-01-19 16:02:12 -05:00
Imbris	3347438d51	Propagate light via queue to avoid block lookups	2020-01-19 16:02:12 -05:00
Imbris	211c076b8d	Remove unnecessary sampling in meshing light calculations	2020-01-19 16:02:12 -05:00
Imbris	33993638fe	Experiment with replacing hashmap in light calculations	2020-01-19 16:02:12 -05:00
Imbris	9d6bf66a32	Add options to turn off the clouds and to render ugly water	2020-01-19 14:05:31 -05:00
S Handley	309834df1b	fix: Prevent dispatching Run SFX if an entity is not moving ... This adds the entity's velocity as an argument when mapping the movement state to an SFX event, and prevents the run SFX from being returned if the velocity is below a threshold. This will prevent hearing the run sfx when stuck in a corner, or running into a surface where the character is not actually moving their feet.	2020-01-18 18:49:17 +00:00
Gilbert Röhrbein	b2503397c9	Fix panic in case no default audio device found when audio off	2020-01-18 19:16:23 +01:00
Monty Marz	cb5976b9de	create character button position change	2020-01-18 15:42:21 +00:00
Monty Marz	a4274ef8aa	Charge Icon and flashing skillbar	2020-01-17 22:00:00 +00: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
Gilbert Röhrbein	28060e7b6e	fixing #405 - Energy as its own component	2020-01-12 22:25:04 +01:00
Monty Marz	f6dfb74b3e	fix ... slightly lower trigger velocity slighty more transp map image	2020-01-12 19:01:02 +00:00
S Handley	00c1493548	Play the Run SFX when a character lands after jumping or falling ... This is a small detail but makes a noticable difference.	2020-01-12 16:35:20 +00:00
Piotr Korgól	e1adf40856	Improvement: Replace all '..=b' with '..b + 1'	2020-01-12 15:46:53 +01:00
Pfauenauge90	e0fc3ce425	fixed number shadow for "0" damage appearing on level up	2020-01-11 21:31:57 +01:00
Imbris	2b4d4aa480	Merge branch 'yusdacra/tweaks' into 'master' ... Fixes minor issues with frustum culling See merge request veloren/veloren!712	2020-01-11 16:36:51 +00:00
Songtronix	70eb2eed33	remove: discord rich presence	2020-01-10 17:01:50 +01:00
Monty Marz	851d7858e6	Scrolling Combat Text (SCT)	2020-01-10 00:33:38 +00:00
Yusuf Bera Ertan	127f8fb72b	Fix lpindex not being updated for culled objects, and don't ... recalculate frustum for every entity	2020-01-09 22:22:06 +03:00
AdamWhitehurst	de36e75264	Fix imports, update matches	2020-01-08 11:31:42 -08:00
Yusuf Bera Ertan	4a0a2d5229	Cargo fmt	2020-01-08 20:09:54 +03:00
Yusuf Bera Ertan	71db9d6350	Replace radio list with drop down selector for AA mode setting	2020-01-07 20:37:55 +03:00
Yusuf Bera Ertan	24013f1a32	Use treeculler crate	2020-01-07 19:40:06 +03:00
Adam Whitehurst	8648641362	Grooming	2020-01-07 07:49:08 -08:00
Yusuf Bera Ertan	0b67dad4a5	Fix figure visible value not updating	2020-01-07 18:46:37 +03:00
Yusuf Bera Ertan	31d18b3381	Use temporal coherence for figure frustum culling, don't process figures if they are not in view frustum	2020-01-07 18:46:22 +03:00
Yusuf Bera Ertan	c19c222a90	Use temporal coherence for chunk frustum culling	2020-01-07 18:46:09 +03:00
Yusuf Bera Ertan	e32153e980	Improve frustum culling by using AABBs, add related debug information	2020-01-07 18:44:33 +03:00
Yusuf Bera Ertan	fd9cc76786	Reimplement #210	2020-01-07 18:40:45 +03:00