576 Commits

Author	SHA1	Message	Date
Joshua Barretto	9a8552d5fb	Added rocks	2019-06-05 20:52:51 +01:00
Joshua Barretto	478cc24c91	Deferred normal unpacking to the terrain fragment shader	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	3723649d39	Update cpal	2019-06-05 13:17:19 -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	c3cd3b9a69	Compressed vertex data even more	2019-06-04 00:09:49 +02:00
Joshua Barretto	8d04b9297e	disabled temporarily point light	2019-06-04 00:08:58 +02:00
Joshua Barretto	e2182b1a68	Added basic light	2019-06-03 22:50:47 +01:00
Pfauenauge90	ce6a9ac32d	Roots added ... fmt asset fix	2019-06-03 22:50:27 +01: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
Monty Marz	112f0515bd	Button added ... Former-commit-id: d8e88da53c3f8daa3216a7d0657f0934ec1a051f	2019-06-02 02:17:36 +00:00
Cody	04d4dc1da5	Reverts one erroneous change, further corrects another comment.	2019-06-01 00:52:20 -04:00
Cody	609742f8fa	Makes some quick in-game menu fixes.	2019-05-31 16:36:25 -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	b05eb2b861	Changes asset filenames for consistencies.	2019-05-31 16:36:24 -04:00
Cody	6c76667356	Addresses more naming schemes and typos.	2019-05-31 16:36:24 -04:00
Cody	b9377b5c33	cargo fmt	2019-05-31 16:36:23 -04:00
Cody	a258be7aac	Fixes some typos, comment inconsistencies, and incorrect naming conventions.	2019-05-31 16:36:16 -04:00
Louis Pearson	70b503868e	Add fix for headphone and invalid device params	2019-05-31 14:24:33 -06:00
Louis Pearson	64d38e687b	Move to latest version of cpal	2019-05-31 13:19:32 -06:00
Joshua Barretto	024afb9b4a	Added desert and snowy areas ... Former-commit-id: 220e404de8f64e35d9f54f2b0eeff3fe90c33802	2019-05-29 22:24:47 +01:00
Joshua Barretto	f49796dcef	Basic cave test ... Former-commit-id: 5b56bb882aca37d7fee1ee9c5e100ad2bf97834e	2019-05-29 14:49:27 +01:00
Joshua Barretto	1e2f130ad6	Added voxel shadows ... Former-commit-id: 86f8d6f53073736a7036ad3371eb6f283cfdac3c	2019-05-29 12:01:02 +01:00
Imbris	061ab9f45e	limit ingame element size ... Former-commit-id: b60e297096ad354cae77482fe84aca88bb9a8f3e	2019-05-28 20:47:03 -04:00
Imbris	c41fc026a8	fmt ... Former-commit-id: 288b2b5d5872aebd255e464c921521c0b8b864fa	2019-05-28 20:47:03 -04:00
Imbris	e3e8afd99b	Stop drawing entities outside the vd ... Former-commit-id: 34878fb66ec22ac77a7400724b80ad7f8321f4cf	2019-05-28 20:47:01 -04:00
timokoesters	59967c603c	Save settings when the game closes ... Former-commit-id: 0190f45ddbd87ec6ae2e4d4d959672d22e560907	2019-05-28 19:16:07 -04:00
Imbris	38416ef37c	Show disclaimer once ... Former-commit-id: f4937dba2caca207b02deb18ad209a8435e65b61	2019-05-28 19:16:07 -04:00
Imbris	045f41dae7	Use vd setting when creating client ... Former-commit-id: b9a32c6b2f1a61a407991507c63ba7d708723410	2019-05-28 19:16:06 -04:00
Joshua Barretto	ec3176a471	Merge branch 'audio-error-1' into 'master' ... Fix game crashing when trying to start audio Closes #112 See merge request veloren/veloren!187 Former-commit-id: e2c62779efae0a91edf1ad546fe1f077ddc5227e	2019-05-28 22:16:03 +00:00
Louis Pearson	a3dafde081	Add better version of Snowtop ... Former-commit-id: ea47207ec7651d8c7eedea14f77399e96c3546b6	2019-05-28 15:01:10 -06:00
Louis Pearson	4502def070	Fix game crashing when trying to start audio ... Former-commit-id: fa24d352f3d8721406fbeda9785689d681d42d27	2019-05-28 15:01:10 -06:00
Joshua Barretto	5b5cd7d341	Merge branch 'healthbar-rendering-when-less-than-full' into 'master' ... Only render other player's healthbars when less than 100% full Closes #123 See merge request veloren/veloren!195 Former-commit-id: 70607acd77d14b911574d328332f341e5f395b24	2019-05-28 20:37:37 +00:00
timokoesters	3d21cd7402	Get player count and calculate ping time ... Former-commit-id: 99da086195e301f1e6cba3ebe7fa5b745b86502a	2019-05-28 21:55:05 +02:00
JMS	e3902ea134	Fix debug coordinates window crashing when player has no Pos component yet ... Closes #136 Former-commit-id: eb7b2a4c525a4b2771a9ca168e566b24bd23c7b8	2019-05-28 15:40:50 -04:00
JMS	b5976b567e	Only render other player's healthbars when less than 100% full ... Implements part of #123 Former-commit-id: d927d153a39b016d029587351eeb5fa87ccb5197	2019-05-28 15:26:11 -04:00
JMS	4fcb6cd025	Add player coordinates to debug window ... Former-commit-id: 00285712652ed97c7f18a5f4834f1eaef269afc7	2019-05-28 14:23:24 -04: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
Marcel	7cbc4dbfdb	Merge branch 'easy-run' into 'master' ... Add default-run to allow compiling with just `cargo run` See merge request veloren/veloren!189 Former-commit-id: e520b72762accce00e275a48d70bbec31f2dbd83	2019-05-28 10:27:45 +00:00
jshipsey	6cb1a75b93	speed tweak ... Former-commit-id: a3938ec59032794c7135facddecbf7131fb5262e	2019-05-27 19:48:44 -04: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	7ced54ba54	Add default run to allow compiling with just cargo run ... Former-commit-id: 88c41361bda4b77c13d52217024e286cb7c0a565	2019-05-27 22:51:42 +02: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
Monty Marz	8a3b308224	Wolf model assets update ... Former-commit-id: 3bf065f97bd000ef3f140e3c776a34057217cdfd	2019-05-26 19:12:32 +00:00
Imbris	ec4bf7279a	Add check for typing ... Former-commit-id: 582d0b5894f44f8491b671823b09f064d139df02	2019-05-26 12:23:24 -04:00
Imbris	8754ea1661	Fix hud handle_event() match arm order ... Former-commit-id: 484b74fc9d82a18b5ac4d7da2dedcd426d100041	2019-05-26 12:12:10 -04:00
Timo Koesters	48a905ba86	Merge branch 'attack' into 'master' ... Attack fixes See merge request veloren/veloren!179 Former-commit-id: 97f1e109dcbcbf7f1d860cf3aebae871f93884cf	2019-05-26 16:07:08 +00:00
timokoesters	a7faa82aad	Fix invisibility ... Former-commit-id: daeed655d2af1d990eee5d03df22b8a9bcbdf011	2019-05-26 18:01:55 +02:00