1161 Commits

Author	SHA1	Message	Date
Shane Handley	ef6f8b509a	Eeek, remove logging.	2019-11-06 21:34:14 +01:00
Shane Handley	fe9ad3fa19	Network timeout updates ... - Bugfix: Check whether the server response (pong) is greater than the timeout period, rather than the ping (which will always fire regardless of connection status) This was causing the timeout error event to never fire. - Feature: Send the player notifications to the chat window that they will be kicked due to disconnection for 6 seconds before kicking them back to the main menu.	2019-11-06 21:34:14 +01: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
Monty Marz	240b620c13	login info text	2019-11-01 20:53:52 +00:00
Acrimon	5beea76624	Remove heaptrack as it is now deprecated.	2019-10-29 06:55:45 +00:00
Monty Marz	a0a8011d7e	Updated: Help Window, Map, Item Descriptions	2019-10-27 22:22:40 +00:00
jshipsey	12f83cf270	rebase, small fixes	2019-10-25 22:20:38 -04:00
jshipsey	c5942dfcc9	purged references to npckind from anim files, removed warnings	2019-10-25 21:50:14 -04: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	ada6142c1f	added large bipeds, small birbs, small fish skeletons	2019-10-25 21:47:23 -04:00
jshipsey	4f5f7402f0	added dragon skeleton	2019-10-25 21:44:33 -04:00
jshipsey	e858c31b4c	fish_medium and bird_medium skelingtons	2019-10-25 21:39:06 -04:00
jshipsey	574f070758	added large bipeds, small birbs, small fish skeletons	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
Marcel	ee915671ef	Merge branch 'songtronix/set-voxygen-config-via-env' into 'master' ... customizable config file location via environment variable See merge request veloren/veloren!617	2019-10-25 18:52:38 +00:00
Timo Koesters	0ae15bb251	Merge branch 'timo-items-as-ron' into 'master' ... feat: store items as RON files See merge request veloren/veloren!618	2019-10-25 08:57:39 +00:00
Imbris	c18fe8042b	Merge branch 'imbris/mesh-speed' into 'master' ... Speed up terrain meshing ~20% See merge request veloren/veloren!625	2019-10-25 02:22:03 +00:00
Imbris	4bcc55ad34	improvement: roughly ~20% speedup of terrain meshing by eliminating redundant lookups of terrain blocks	2019-10-24 20:02:29 -04: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
Monty Marz	f4ba68c60d	.floating(true) for help window background to make it layer above every recent and future widget	2019-10-24 18:21:17 +00:00
Joshua Barretto	7d86a360d6	Merge branch 'soruh/fix-welcome-window-depth' into 'master' ... fix the welcome window not being closeable, due to it being obscured by the chat See merge request veloren/veloren!623	2019-10-24 12:49:20 +00:00
Imbris	2fad65c749	Merge branch 'imbris/graphic-cache' into 'master' ... Rework GraphicCache to use multiple texture atlases if necessary and put large images in their own textures. See merge request veloren/veloren!609	2019-10-24 05:27:09 +00:00
Imbris	a200dafd45	Fix possess bug, remove commented code, drain controller events	2019-10-24 00:00:00 -04:00
Imbris	966b2bfbff	Integrate new systems with metrics	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
soruh	f186aac2ea	fix the welcome window not being closeable ... due to the chat being in front of it, by giving the welcome window a depth of -1.0. The value of -1.0 is very arbitrary, but has some effect on further development*, so there should be consideration concerning it. * if something is supposed to be over/under the welcome window and over/under something else with a different depth at the same time, the resulting depth could become really ugly. Of course it's always possible to change depths afterwards, but this often breaks things, so the general scope of depths should imo be considered, before this becomes a problem.	2019-10-24 00:46:40 +02:00
Monty Marz	3e0ac48bd8	Multiple Assets and UI fixes and additions	2019-10-23 19:40:45 +00:00
Songtronix	e8a077a5d6	feat(env): customizable config file location	2019-10-22 17:15:10 +02:00
Isaac Freund	355c7666b9	Allow dropping items ... Items can now be dropped by clicking to select the item then clicking outside of the bag.	2019-10-22 01:40:58 +02:00
Imbris	8bb54976eb	Rework GraphicCache to use multiple texture atlases and put large images in their own textures.	2019-10-19 21:28:30 -04:00
Songtronix	fffffff536	fix(crash): overflowing the stack	2019-10-18 14:19:02 +02:00
Songtronix	fe4a61354a	change(menu): display version with hash and date	2019-10-18 15:51:07 +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
Adam Fogle	c41627d75f	Removed the recolor property from the armor ron files.	2019-10-17 19:45:29 -04: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	1f39659a54	Merge branch 'zesterer/small-fixes' into 'master' ... Performance Improvements See merge request veloren/veloren!597	2019-10-17 20:56:37 +00:00
Joshua Barretto	04c64dc122	Better (and faster) water shaders	2019-10-17 17:11:55 +01:00
Shane Handley	ab59d1f262	Title music fix (fixes #342) ... Fix issue with title music restarting and playing in multiple channels when the player chooses a play state but then returns to the main menu.	2019-10-17 16:14:16 +09:00
Joshua Barretto	c01e19fc05	Don't render water that isn't there, improved chunk render order	2019-10-16 12:40:18 +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
Joshua Barretto	4bbc340f52	Faster meshing, better dusk	2019-10-14 10:48:40 +01:00
jshipsey	deadd665c8	tweaks animations to better align with true positions	2019-10-12 14:19:55 -04:00
Adam Fogle	8f7b4afafd	Manifest file is now used to load armor. ... Redid how pants renders so they can use underlying skin model/coloring, same as chest armor. Redid how belts render so they can use the underly skin color, same as shoulder or foot. Converted a manifest variable name to snake case.	2019-10-12 08:31:42 -04: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