574 Commits

Author SHA1 Message Date
Joshua Barretto
f3464b36b9 Optimised sub-terrain chonk storage, fixed hash chunk bug, altered terrain base 2019-06-05 20:52:51 +01:00
Louis Pearson
f06fd808ba Update cpal 2019-06-05 13:17:19 -04:00
Joshua Barretto
f473c13d03 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
e0cf6b5e37 Compressed vertex data even more 2019-06-04 00:09:49 +02:00
Joshua Barretto
76965c7e99 disabled temporarily point light 2019-06-04 00:08:58 +02:00
Joshua Barretto
3c16c5a3ec Added basic light 2019-06-03 22:50:47 +01:00
Pfauenauge90
b1a6219e31 Roots added
fmt

asset fix
2019-06-03 22:50:27 +01:00
Timo Koesters
d1b0af51cd 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
815e1ccf9c Button added
Former-commit-id: d8e88da53c3f8daa3216a7d0657f0934ec1a051f
2019-06-02 02:17:36 +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
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
Louis Pearson
7edc53049a Add fix for headphone and invalid device params 2019-05-31 14:24:33 -06:00
Louis Pearson
be5261475c Move to latest version of cpal 2019-05-31 13:19:32 -06:00
Joshua Barretto
1fcf6aebcb Added desert and snowy areas
Former-commit-id: 220e404de8f64e35d9f54f2b0eeff3fe90c33802
2019-05-29 22:24:47 +01:00
Joshua Barretto
69a158a83c Basic cave test
Former-commit-id: 5b56bb882aca37d7fee1ee9c5e100ad2bf97834e
2019-05-29 14:49:27 +01:00
Joshua Barretto
4477e8ca6e Added voxel shadows
Former-commit-id: 86f8d6f53073736a7036ad3371eb6f283cfdac3c
2019-05-29 12:01:02 +01: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
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
b8fa7c3236 Fix game crashing when trying to start audio
Former-commit-id: fa24d352f3d8721406fbeda9785689d681d42d27
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
timokoesters
506468ef6f Get player count and calculate ping time
Former-commit-id: 99da086195e301f1e6cba3ebe7fa5b745b86502a
2019-05-28 21:55:05 +02: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
JMS
bc1840600a Add player coordinates to debug window
Former-commit-id: 00285712652ed97c7f18a5f4834f1eaef269afc7
2019-05-28 14:23:24 -04: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
jshipsey
e7f00829a2 speed tweak
Former-commit-id: a3938ec59032794c7135facddecbf7131fb5262e
2019-05-27 19:48:44 -04: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
timokoesters
30df57d287 Add default run to allow compiling with just cargo run
Former-commit-id: 88c41361bda4b77c13d52217024e286cb7c0a565
2019-05-27 22:51:42 +02:00
timokoesters
171ca86340 Implement killer name in chat
Former-commit-id: 5aa87529179a684d5675c33e4001806aa2040802
2019-05-27 21:47:19 +02:00
timokoesters
40eef27bcb Add connect, disconnect and kill messages
Former-commit-id: c25f6fb0b594e5d61a965447359536ca17173aa7
2019-05-27 19:45:43 +02:00
Monty Marz
ee6cc31552 Wolf model assets update
Former-commit-id: 3bf065f97bd000ef3f140e3c776a34057217cdfd
2019-05-26 19:12:32 +00:00
Imbris
9d82e4fe7f Add check for typing
Former-commit-id: 582d0b5894f44f8491b671823b09f064d139df02
2019-05-26 12:23:24 -04:00
Imbris
c2407f6659 Fix hud handle_event() match arm order
Former-commit-id: 484b74fc9d82a18b5ac4d7da2dedcd426d100041
2019-05-26 12:12:10 -04:00
Timo Koesters
cca5682c22 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
0fa701b086 Fix invisibility
Former-commit-id: daeed655d2af1d990eee5d03df22b8a9bcbdf011
2019-05-26 18:01:55 +02:00
timokoesters
449690f38e Fix wolf red and dead velocity
Former-commit-id: 2d59c545d3a101e630f56cc0c96d8579508dd99d
2019-05-26 17:34:00 +02:00
Imbris
6da6ea4b1b Don't create Consts if they are not needed
Former-commit-id: 3af8652100c009afda53637b292ded67587d89d4
2019-05-26 11:24:26 -04:00