4905 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Marcel	8250b6612a	Merge branch 'xMAC94x/examples-cleanup' into 'master' ... Switch veloren_network over to use the official example layout. See merge request veloren/veloren!1336	2020-08-26 22:04:44 +00:00
Forest Anderson	129ecbe671	Merge branch 'scott-c/sound-effects-placeholder' into 'master' ... combat sfx See merge request veloren/veloren!1279	2020-08-26 12:52:11 +00:00
scott-c	fadfc4e846	Add combat sfx #647	2020-08-26 19:28:00 +08:00
Marcel Märtens	9f52800e5f	Switch veloren_network over to use the official example layout. ... adjusted those examples to run again created a CI TEST to always `check` examples fixed fmt in examples so that pipeline gets green	2020-08-26 10:07:22 +02:00
Marcel	39e105b7ac	Merge branch 'xMAC94x/compression' into 'master' ... Propper Compression support of network. See merge request veloren/veloren!1334	2020-08-25 22:21:05 +00:00
Marcel Märtens	b344e8d87c	Propper Compression support of network. ... - Compression is no longer enabled always but can now be enabled per Stream. If a Stream is Compression enabled it will compress and decompress all msg (except for `raw` access) before handling them internally. You need to handle compression yourself for `raw` fn. - added a new feature to the network crate to enable or disable the compression - switched to `lz-fear` instead of `lz4-compression` - use `bitflags` to represent the `Promises` struct	2020-08-25 23:55:27 +02:00
Monty Marz	2022f52170	Merge branch 'pfau/nametag_height' into 'master' ... Nametag height See merge request veloren/veloren!1335	2020-08-25 20:43:02 +00:00
Monty Marz	c074c4eff7	fixed nametag height ... fmt fmt	2020-08-25 21:54:47 +02:00
Joshua Barretto	b2d6a08fe9	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
Marcel	3403c5a710	Merge branch 'spelling' into 'master' ... Corrected some spelling errors See merge request veloren/veloren!1326	2020-08-25 12:21:25 +00:00
notoria	90b0012637	Corrected some spelling errors	2020-08-25 12:21:25 +00:00
Joshua Barretto	5f9208a45b	Handled 3d/2d sanity check bug	2020-08-25 12:54:30 +01:00
Joshua Barretto	7aacf23102	Addressed review issues	2020-08-25 11:01:17 +01:00
Joshua Barretto	73dcc7cd00	Improved single-tick projectile wall/entity collision bug	2020-08-25 00:04:04 +01:00
Marcel	ebab872bd1	Merge branch 'xMAC94x/lock-removal' into 'master' ... xmac94x/switch to more efficient Mutex locks See merge request veloren/veloren!1330	2020-08-24 21:26:51 +00:00
Joshua Barretto	a475357dba	Allowed small animals to block-hop again	2020-08-24 21:53:17 +01:00
Joshua Barretto	346dd951eb	Fixed quadruped hitboxes	2020-08-24 21:46:08 +01:00
Joshua Barretto	a1271f9f26	Fixed bad hitbox radii and adjusted field colour	2020-08-24 20:52:18 +01:00
Joshua Barretto	148a351ce1	Fixed failing audio tests	2020-08-24 20:37:47 +01:00
Joshua Barretto	408277a6c5	Corrected hitbox mistake	2020-08-24 18:29:59 +01:00
Joshua Barretto	2825ada8e6	Updated changelog	2020-08-24 18:27:50 +01:00
Joshua Barretto	79a4e6f6d8	Fixed projectile collisions, hitboxes, better aiming	2020-08-24 18:24:44 +01:00
Marcel Märtens	034cc7f8e9	Redefine Close behavior: ... - When Participant A was closed by remote side. Then a `disconnect` on `A` shall return Ok() (instead of ParticipantDisconected) IF: A was already flushed and no data needs to be sended any more. so a `disconnect` doesnt differ if the other side initiated the disconnect before or not. it tries to clean things up and returns Ok(()) if both sides agree	2020-08-24 16:22:12 +02:00
Marcel Märtens	584c10d097	Fixed bug in tcp protocol.rs ... - It was possible for a end_receiver to be triggered in the moment while a frame was started by not finished. This removed bytes from the stream with them getting lost. this almost ever was followed by a RAW frame as the TCP stream was now invalid. The TCP stream was then detected by participant or caused one or multiple failures - introduces some simplifications, removed a macro, reuse code	2020-08-24 16:22:06 +02:00
Joshua Barretto	c32fe3e7ae	Improved world colours	2020-08-24 12:36:27 +01:00
Joshua Barretto	4dbbcbe144	Less harsh terrain noise	2020-08-24 12:36:27 +01:00
Joshua Barretto	246be3ca78	Better pet pathfinding	2020-08-24 12:36:27 +01:00
Monty Marz	3615819262	better formatting and adjusted stone spawn rate	2020-08-24 12:36:27 +01:00
Joshua Barretto	6cf30904b8	Less bizarre rock and stalagtite colours	2020-08-24 12:36:27 +01:00
Joshua Barretto	35d4dd1405	Made below-ground LoD dark	2020-08-24 12:36:27 +01:00
Joshua Barretto	148e5e2632	Prevented terrain scatter spawning in the air	2020-08-24 12:36:27 +01:00
Joshua Barretto	872058e022	Adjusted worldgen colours for new lighting model	2020-08-24 12:36:27 +01:00
Joshua Barretto	a836cd02bf	Merge branch 'james/fix-shiny-shader-nvidia' into 'master' ... Fixed NVidia shiny water shader bug and re-enabled in settings See merge request veloren/veloren!1319	2020-08-24 07:09:48 +00:00
jiminycrick	7bf2c12bed	set shiny water to default	2020-08-23 22:58:01 -07:00
Monty Marz	00b25d5c2b	Merge branch 'pfau/mini-fixes' into 'master' ... Various fixes See merge request veloren/veloren!1329	2020-08-24 00:26:33 +00:00
Imbris	3b9ec38c59	Merge branch 'sovareign/camera_zoom_fix' into 'master' ... fix unequal zoom in distance and zoom out distance See merge request veloren/veloren!1322	2020-08-23 23:24:24 +00:00
Niko Thees	a4631e291a	fix unequal zoom in distance and zoom out distance	2020-08-23 23:24:24 +00:00
Monty Marz	ec759b6798	various fixes ... Balanced crafted weapon power Adjusted tooltip color Added tooltip showing account name to the social window	2020-08-24 01:16:53 +02:00
Marcel Märtens	dc8e0f5bff	using Locks a more sensitive way. ... - replace RwLock by Mutex if it's only accessed for insert/delete - use RwLock<HashMap<Mutex>> pattern otherwise in order to allow concurrent `.read()` - fixed a deadlock O.o	2020-08-23 21:43:17 +02:00
Songtronix	d18b1cd882	Merge branch 'fix_filepath' into 'master' ... fix filepath See merge request veloren/veloren!1325	2020-08-23 13:43:36 +00:00
Monty Marz	22d98c8c9b	fix filepath	2020-08-23 13:36:11 +02:00
Joshua Yanovski	125f435c52	Merge branch 'pfau/follow-up-fixes' into 'master' ... Fix a bunch of issues introduced by the rebalance branch See merge request veloren/veloren!1323	2020-08-22 23:37:45 +00:00
Monty Marz	fec55d9150	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
Marcel	f423b1090f	Merge branch 'xMAC94x/hotfix' into 'master' ... xmac94x/hotfix See merge request veloren/veloren!1321	2020-08-22 10:33:24 +00:00
Marcel Märtens	97d990213c	hotfix a lock	2020-08-22 12:03:06 +02:00
Marcel	b0c666fe3a	Merge branch 'xMAC94x/tmp_raw_fix' into 'master' ... workaround for impossible RAW msg See merge request veloren/veloren!1320	2020-08-22 00:12:25 +00:00
Monty Marz	3c3a7ba9b3	Merge branch 'pfau/fixes' into 'master' ... Balancing and polish See merge request veloren/veloren!1292	2020-08-21 23:39:48 +00:00
Marcel Märtens	7eee92b108	workaround for impossible RAW msg	2020-08-22 01:09:07 +02:00
Monty Marz	f608bf6cd8	fix particles rendering before water ... revert changes to campfires -> Address in another MR!	2020-08-22 00:17:44 +02:00
Monty Marz	12546d6bf4	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