Monty Marz
112f0515bd
Button added
...
Former-commit-id: d8e88da53c3f8daa3216a7d0657f0934ec1a051f
2019-06-02 02:17:36 +00:00
scorpion9979
50acaf0ae1
Cleaned code
2019-06-01 22:49:34 +03:00
Ahmed Ihsan Tawfeeq
e867c71c86
Merge branch 'randomized-npc-names' into 'randomized-npc-names'
...
Added randomized NPC names veloren/veloren#133
See merge request veloren/veloren!205
2019-06-01 19:24:17 +00:00
Ahmed Ihsan Tawfeeq
01e1245c95
Added randomized NPC names veloren/veloren#133
2019-06-01 19:24:17 +00:00
Imbris
1ccaf9a7bd
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
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
8562a09595
cargo fmt
2019-05-31 16:36:24 -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
Forest Anderson
02ee63d676
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
70b503868e
Add fix for headphone and invalid device params
2019-05-31 14:24:33 -06:00
Forest Anderson
3ffe556905
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
64d38e687b
Move to latest version of cpal
2019-05-31 13:19:32 -06:00
Pfauenauge90
f5f5110f77
third pine variation
2019-05-31 18:05:56 +02:00
Pfauenauge90
53ffc50242
Even more assets with offsets
2019-05-31 18:05:56 +02:00
Pfauenauge90
17b8dafd65
changed chest and pants colours
2019-05-31 18:05:55 +02:00
Pfauenauge90
47e4c297d8
more assets, offsets for temperate trees
2019-05-31 18:05:55 +02:00
Pfauenauge90
04ec381715
Asset path change
2019-05-31 18:05:55 +02:00
Joshua Barretto
6725e99798
Switched to squircle caves
2019-05-31 17:00:51 +01:00
Joshua Barretto
c4f49a1bee
Reduced cave winding, increased cave size
2019-05-31 16:28:01 +01:00
Joshua Barretto
abaec6d325
Much better caves
2019-05-31 16:16:26 +01: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
Forest Anderson
09327914b5
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
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
942096c754
Only send physics updates for entities within vd
...
Former-commit-id: d3307641cd31418bf8b9831296a96d58926184e0
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
e647be3e57
Update cpal again
...
Former-commit-id: b5810766a8f37095401f05d5fb787b9e478f0bd2
2019-05-28 15:01:10 -06:00
Louis Pearson
10b21ff380
Recreate Cargo.lock from master Cargo.lock
...
Former-commit-id: e26cfbede0634e1a771257ecd22e05afbce7a85e
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
7cf527894b
fmt
...
Former-commit-id: d0c862d91e152f6e71ab7614cc5cb65f7800eef7
2019-05-28 15:01:10 -06:00
Joshua Barretto
61ca4b5775
Sort of fixed enemy freezes
...
Former-commit-id: b21819c6309cec41d4812e712c1ca3b31452e530
2019-05-28 15:01:10 -06:00
Joshua Barretto
923ee08ac2
Added enemies
...
Former-commit-id: 5ff3aadeb55595f3f7da34ab9bdfd3a76158f928
2019-05-28 15:01:10 -06:00
timokoesters
9352d4ba4f
Fix moving after death (again)
...
Former-commit-id: 35804903bfb93ad78621dd3dfe8e341a222d0265
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
c10a43f541
Add server info
...
Former-commit-id: 9e504c821e871d30f8ac7cd4acb7a8022bdb5710
2019-05-28 22:25:46 +02:00
Joshua Barretto
f8e18eef01
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
timokoesters
3d21cd7402
Get player count and calculate ping time
...
Former-commit-id: 99da086195e301f1e6cba3ebe7fa5b745b86502a
2019-05-28 21:55:05 +02:00
Joshua Barretto
cb6b60fefe
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
