Commit Graph

1126 Commits

Author SHA1 Message Date
Louis Pearson
1a81660915 Update cpal 2019-06-04 13:18:59 -06:00
Louis Pearson
4cf13cc588 Integrate forces *after* velocity is applied 2019-06-04 12:14:10 -06:00
Louis Pearson
84ac965240 Normalize move_dir only if the magnitude is greater than one 2019-06-04 10:13:40 -06:00
Louis Pearson
52764376ae Use constants and normalized move direction 2019-06-04 10:09:34 -06:00
Louis Pearson
82aabf242a Add a function for integrating forces 2019-06-04 09:42:31 -06:00
Louis Pearson
c7a2ecd1f2 Adjust gliding speed
Former-commit-id: f2104422d1874e80f792bb97ded19ca976bbd4c1
2019-06-04 07:57:12 -06:00
Louis Pearson
e2d96cc7e0 Add CollisionShape, move friction calculations to phys
Former-commit-id: 3723a8f74bc2854aaa98357e2d0b51a1668d9030
2019-06-04 07:57:12 -06:00
Louis Pearson
afc5199b63 Remove z < 0 hack
Former-commit-id: e0e4ad6e806189cd67ac626685ce9ed1456222f0
2019-06-04 07:55:49 -06:00
Joshua Barretto
c8c07d2783 Merge branch 'assets-bug-fix' into 'master'
Fixed bug in loading JSON assets

See merge request veloren/veloren!210
2019-06-04 12:39:46 +00:00
Ahmed Ihsan Tawfeeq
e98eff613b Fixed bug in loading JSON assets 2019-06-04 12:39:46 +00:00
Forest Anderson
4548ec3bf9 Merge branch 'randomized-npc-names' into 'master'
Added randomized NPC names veloren/veloren#133

Closes #133

See merge request veloren/veloren!207
2019-06-04 05:23:25 +00:00
Forest Anderson
9da46ba6c5 Merge branch 'randomized-npc-names' of gitlab.com:veloren/veloren into randomized-npc-names 2019-06-04 01:11:19 -04:00
scorpion9979
b66fbce99d Cleaned code 2019-06-04 01:10:59 -04:00
scorpion9979
7bfd9464c9 Added humanoid NPC type w/ names 2019-06-04 01:10:59 -04:00
scorpion9979
7919442d3d Implemented asset system for caching json data 2019-06-04 01:10:59 -04:00
scorpion9979
29f230d23e Cleaned code
Refactored code for readability
2019-06-04 01:10:59 -04:00
Ahmed Ihsan Tawfeeq
eb80459872 Added randomized NPC names veloren/veloren#133 2019-06-04 01:10:59 -04:00
scorpion9979
681de8bb7a Cleaned code 2019-06-04 07:22:11 +03:00
scorpion9979
2070bcac84 Added humanoid NPC type w/ names 2019-06-04 01:38:44 +03: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
scorpion9979
00f7253e5f Implemented asset system for caching json data 2019-06-04 01:11:27 +03: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
8a6ed86b2e Fixed hard cave walls 2019-06-04 00:08:23 +02:00
Joshua Barretto
e766bdf412 Removed second cave layer 2019-06-04 00:08:22 +02:00
Joshua Barretto
f35739ed30 Upped cave spawn rate 2019-06-04 00:08:22 +02:00
Joshua Barretto
f86bf5045e Made extreme biomes more common 2019-06-03 22:50:47 +01:00
Joshua Barretto
b554d7b19e Made caves wider 2019-06-03 22:50:47 +01:00
Joshua Barretto
e2182b1a68 Added basic light 2019-06-03 22:50:47 +01:00
Joshua Barretto
07eb56f287 Improved cave proportions 2019-06-03 22:50:47 +01:00
Joshua Barretto
e618e97b1f Improved cave noise 2019-06-03 22:50:47 +01:00
Pfauenauge90
455b99ed37 human house assets 2019-06-03 22:50:47 +01:00
Pfauenauge90
ce6a9ac32d Roots added
fmt

asset fix
2019-06-03 22:50:27 +01:00
Joshua Barretto
2946846a67 Merge branch 'midge/pet-jump-fix' into 'master'
Fixes pet jumping bug.

See merge request veloren/veloren!206
2019-06-03 20:09:18 +00:00
Cody
692b216651 Fixes a bug where animals continually jumped after their target was any height above them, even once the target was no longer above them. 2019-06-03 20:09:18 +00:00
scorpion9979
da01e797a3 Refactored code for readability 2019-06-03 12:21:38 +03: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
timokoesters
a69b5022c2
Add TODO 2019-06-02 16:35:21 +02:00
Forest Anderson
555d46674b Merge branch 'esc-menu-fix' into 'master'
esc menu rework

See merge request veloren/veloren!160
2019-06-02 02:17:36 +00:00
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