Commit Graph

555 Commits

Author SHA1 Message Date
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
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
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
timokoesters
4ebf2e13a5 Fix wolf red and dead velocity
Former-commit-id: 2d59c545d3a101e630f56cc0c96d8579508dd99d
2019-05-26 17:34:00 +02:00
Imbris
3c7f463330 Don't create Consts if they are not needed
Former-commit-id: 3af8652100c009afda53637b292ded67587d89d4
2019-05-26 11:24:26 -04:00
Imbris
4a8e85ef64 restore lost changes
Former-commit-id: a94c52677287131e02c88748694dfbcaf90b531a
2019-05-26 11:24:25 -04:00
jshipsey
d179ccbd92 rebase fix
Former-commit-id: b1a1136942ec37647401dfa28682f2ee33b760a2
2019-05-26 11:11:14 -04:00
jshipsey
b4e9359e3f Merge branch 'pets' of https://gitlab.com/veloren/veloren into pets
Former-commit-id: f6ab802ebcb24a6c9c5d1c4343ce6b4d68cf942d
2019-05-26 11:04:11 -04:00
jshipsey
7aab509701 rebase with combat merge
Former-commit-id: 04885878ecaffba6b9bd78b2e59512d1914be3b1
2019-05-26 11:02:01 -04:00
jshipsey
c342a7136b tweaking quadrupedmedium
Former-commit-id: 61dac48095caa4c7f0fe92ff7badf360b1a1402d
2019-05-26 10:39:57 -04:00
jshipsey
cd4e36e32a pipeline adjustment
Former-commit-id: 9b263baee41e1701532aa09ed3cde51da42bd9de
2019-05-26 10:39:57 -04:00
jshipsey
51b54a0252 cleanup
Former-commit-id: 62237741afd6d2f6a22030a378a612c3b62dc0ae
2019-05-26 10:39:57 -04:00
jshipsey
26da091b0b add wolf
Former-commit-id: b16aa2e7c382710c0705371cd36d57ddf62cf13c
2019-05-26 10:39:57 -04:00
jshipsey
fa07323083 tweaking quadrupedmedium
Former-commit-id: 3e06337cd99ced44a786c55666764a8c54bc8b90
2019-05-26 10:25:56 -04:00
jshipsey
9a4e663ef9 pipeline adjustment
Former-commit-id: 8f42b9971cb6a0f3fa9b7852fb52f4710acdcf12
2019-05-26 10:18:50 -04:00
timokoesters
f0397f1a32 log::error instead of panic
Former-commit-id: 802f81425869698a95654d423fef93136617cb5f
2019-05-26 16:11:30 +02:00
timokoesters
64b00f41f4 Fix invisible chars
Former-commit-id: cbb93e0511100b9b66f9ea22451c99a69b50b19c
2019-05-26 16:04:44 +02:00
timokoesters
cda253c3cf Make Failed to tick go back to the main screen and move to ron
Former-commit-id: 14d4ab3cb9d964805a2f275b932e93cef9b72d38
2019-05-26 12:58:43 +02:00
jshipsey
eddffb9d91 cleanup
Former-commit-id: c4cad9ddce3d58bfb08a13959fe9bb97d44fd986
2019-05-26 00:43:16 -04:00
jshipsey
b7cbe1e67c add wolf
Former-commit-id: 49fee3e5056377966068bd690333f83192d1fd41
2019-05-25 23:31:49 -04:00
timokoesters
a18a8e0d15 Fix nametags showing on dead players (maybe)
Former-commit-id: 94548e131ee7c94fc5546fa7410fc9694d1db68e
2019-05-26 00:34:24 +02:00
timokoesters
79a0edad85 Fix glider
Former-commit-id: dbcdfef19b3cd428736e77176a958f128b7fe7ad
2019-05-26 00:04:40 +02:00
timokoesters
746e286b5b Fixes
Former-commit-id: 0bbbcf187248dd192e7e9a226bcf5b496437d578
2019-05-26 00:00:38 +02:00
timokoesters
4696cd2c8b Add better inputs, input validation and more
Former-commit-id: 3227221b12a674f66b011ce0ba734e226f223f34
2019-05-25 23:46:56 +02:00