971 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Monty Marz	815e1ccf9c	Button added ... Former-commit-id: d8e88da53c3f8daa3216a7d0657f0934ec1a051f	2019-06-02 02:17:36 +00:00
Imbris	2534e79df7	Merge branch 'misc_fixes' into 'master' ... Miscellaneous language and name fixes See merge request veloren/veloren!201	2019-06-01 05:05:40 +00:00
Cody	02da1bd4e5	Reverts one erroneous change, further corrects another comment.	2019-06-01 00:52:20 -04:00
Cody	cfc68deafe	Makes some quick in-game menu fixes.	2019-05-31 16:36:25 -04:00
Cody	763a84ad94	cargo fmt	2019-05-31 16:36:24 -04:00
Cody	0ec9fafec0	Changes the physics misnomer Direction to Orientation and adjusts some ECS read_storage names.	2019-05-31 16:36:24 -04:00
Cody	3c3fa995ba	Changes asset filenames for consistencies.	2019-05-31 16:36:24 -04:00
Cody	a229d08c2b	Addresses more naming schemes and typos.	2019-05-31 16:36:24 -04:00
Cody	a7fc0966b4	cargo fmt	2019-05-31 16:36:23 -04:00
Cody	de7f18d90d	Fixes some typos, comment inconsistencies, and incorrect naming conventions.	2019-05-31 16:36:16 -04:00
Forest Anderson	f13f9e625b	Merge branch 'desttinghim/update-cpal' into 'master' ... Add fix for headphone and invalid device params Closes #139 See merge request veloren/veloren!203	2019-05-31 20:30:58 +00:00
Louis Pearson	7edc53049a	Add fix for headphone and invalid device params	2019-05-31 14:24:33 -06:00
Forest Anderson	cafb395eec	Merge branch 'desttinghim/update-cpal' into 'master' ... Move to latest version of cpal See merge request veloren/veloren!202	2019-05-31 19:47:08 +00:00
Louis Pearson	be5261475c	Move to latest version of cpal	2019-05-31 13:19:32 -06:00
Forest Anderson	db4f466823	Merge branch 'vd_and_disclaimer' into 'master' ... View Distance Tweaks and Showing Disclaimer Once Closes #126 See merge request veloren/veloren!185 Former-commit-id: a808bbdea6d9cf84cbadb5c592f9db6dc6b0140d	2019-05-29 02:09:40 +00:00
Imbris	a237afffb9	limit ingame element size ... Former-commit-id: b60e297096ad354cae77482fe84aca88bb9a8f3e	2019-05-28 20:47:03 -04:00
Imbris	270b9c9e4c	fmt ... Former-commit-id: 288b2b5d5872aebd255e464c921521c0b8b864fa	2019-05-28 20:47:03 -04:00
Imbris	34564c22fa	Only send physics updates for entities within vd ... Former-commit-id: d3307641cd31418bf8b9831296a96d58926184e0	2019-05-28 20:47:03 -04:00
Imbris	7e83a8c7c1	Stop drawing entities outside the vd ... Former-commit-id: 34878fb66ec22ac77a7400724b80ad7f8321f4cf	2019-05-28 20:47:01 -04:00
timokoesters	74a7f815cf	Save settings when the game closes ... Former-commit-id: 0190f45ddbd87ec6ae2e4d4d959672d22e560907	2019-05-28 19:16:07 -04:00
Imbris	278a08c127	Show disclaimer once ... Former-commit-id: f4937dba2caca207b02deb18ad209a8435e65b61	2019-05-28 19:16:07 -04:00
Imbris	a5f8c3ee90	Use vd setting when creating client ... Former-commit-id: b9a32c6b2f1a61a407991507c63ba7d708723410	2019-05-28 19:16:06 -04:00
Joshua Barretto	8b8c4e248b	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	e8c6287fc8	Add better version of Snowtop ... Former-commit-id: ea47207ec7651d8c7eedea14f77399e96c3546b6	2019-05-28 15:01:10 -06:00
Louis Pearson	ff02148e87	Update cpal again ... Former-commit-id: b5810766a8f37095401f05d5fb787b9e478f0bd2	2019-05-28 15:01:10 -06:00
Louis Pearson	d59c81502c	Recreate Cargo.lock from master Cargo.lock ... Former-commit-id: e26cfbede0634e1a771257ecd22e05afbce7a85e	2019-05-28 15:01:10 -06:00
Louis Pearson	b8fa7c3236	Fix game crashing when trying to start audio ... Former-commit-id: fa24d352f3d8721406fbeda9785689d681d42d27	2019-05-28 15:01:10 -06:00
Joshua Barretto	becab7ba68	fmt ... Former-commit-id: d0c862d91e152f6e71ab7614cc5cb65f7800eef7	2019-05-28 15:01:10 -06:00
Joshua Barretto	d1a4b00be3	Sort of fixed enemy freezes ... Former-commit-id: b21819c6309cec41d4812e712c1ca3b31452e530	2019-05-28 15:01:10 -06:00
Joshua Barretto	0361783a07	Added enemies ... Former-commit-id: 5ff3aadeb55595f3f7da34ab9bdfd3a76158f928	2019-05-28 15:01:10 -06:00
timokoesters	6946c41afd	Fix moving after death (again) ... Former-commit-id: 35804903bfb93ad78621dd3dfe8e341a222d0265	2019-05-28 15:01:10 -06:00
Joshua Barretto	966c1e8612	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
Joshua Barretto	4f3eefb14d	Merge branch 'fix-delay' into 'master' ... Fix attack delay See merge request veloren/veloren!194 Former-commit-id: 2846e7c2ffe0c35427a9bb7fa0c387fd6374e0c9	2019-05-28 20:23:24 +00:00
Joshua Barretto	50c62e345c	Merge branch 'fix-invalid-player-position-for-debug-info' into 'master' ... Fix debug coordinates window crashing when player has no Pos component yet Closes #136 See merge request veloren/veloren!196 Former-commit-id: d57c2307307290a15f290bc1f8affe6415ea6d36	2019-05-28 19:49:02 +00:00
JMS	64d4fc3b31	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	3bcf329811	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
timokoesters	75fca3b446	Fix attack delay ... Former-commit-id: 28f7a492adcc37cec15e3e3c0d46b6015b27ee04	2019-05-28 21:11:29 +02:00
Forest Anderson	e93815011b	Merge branch 'enemies' into 'master' ... Enemies See merge request veloren/veloren!186 Former-commit-id: f920608508868119aad286cbe45599342dc1942b	2019-05-28 19:08:02 +00:00
Joshua Barretto	5ed84538c6	Merge branch 'fix-moving' into 'master' ... Fix moving after death (again) See merge request veloren/veloren!192 Former-commit-id: a8390094833976a009af7a1e044ff6ee9e10c4ff	2019-05-28 19:01:30 +00:00
Joshua Barretto	e2f65627af	fmt ... Former-commit-id: 7535fe743722967dd59e383aa93cb78cb3be6e23	2019-05-28 19:59:32 +01:00
Forest Anderson	8133e3a187	Merge branch 'debug-coordinates' into 'master' ... Add player coordinates to debug window Closes #129 See merge request veloren/veloren!193 Former-commit-id: 51cfaee7dcff37ccf83f2386441e0e1364134ad7	2019-05-28 18:32:38 +00:00
JMS	bc1840600a	Add player coordinates to debug window ... Former-commit-id: 00285712652ed97c7f18a5f4834f1eaef269afc7	2019-05-28 14:23:24 -04:00
timokoesters	b28a68a84d	Fix moving after death (again) ... Former-commit-id: 1c46fed1f5d9a74bcf926354b3b4efd442f5b5bc	2019-05-28 18:37:49 +02:00
Marcel	1ace61bb49	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	8a22393d0d	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
Marcel	ed24e6f448	Merge branch 'swing-animation' into 'master' ... Swing animation See merge request veloren/veloren!191 Former-commit-id: da4296c0d311bd7a3b17c45b86cf61858ccb2f53	2019-05-28 10:26:48 +00:00
jshipsey	e7f00829a2	speed tweak ... Former-commit-id: a3938ec59032794c7135facddecbf7131fb5262e	2019-05-27 19:48:44 -04:00
Joshua Barretto	15979d5528	Sort of fixed enemy freezes ... Former-commit-id: 30933b3ff7d16428a107ade6163cb83562668b66	2019-05-28 00:04:25 +01:00
jshipsey	12bac9c7dd	swing animation changes ... Former-commit-id: 1bc70090e938c12d6e133683932b470be102aecd	2019-05-27 19:03:52 -04:00
jshipsey	1fdb3df193	swing animation ... Former-commit-id: 19e2c32aa36e3890e35df87f01bb0aec4cc8cf9c	2019-05-27 18:54:09 -04:00