688 Commits

Author SHA1 Message Date
timokoesters
a46fcdf1ec
Fixes for .maybe() and animation 2019-06-16 19:57:04 +02:00
jshipsey
13ee9b52fc
groundwork for role, crun, cidle 2019-06-16 19:57:04 +02:00
Cody
244b27cb29
Removes input sys, moves code to combat and phys 2019-06-16 19:57:03 +02:00
timokoesters
facbb622d6
Improve organization of controls 2019-06-16 19:57:03 +02:00
timokoesters
f5a2dcb98e
Revamp control system 2019-06-16 19:57:03 +02:00
Joshua Barretto
ae528f12e0 Merge branch 'zesterer-worldgen-stuff' into 'master'
Worldgen stuff

See merge request veloren/veloren!217
2019-06-16 10:46:59 +00:00
liids
dcce12e5ce fix formatting 2019-06-15 13:48:14 +02:00
Joshua Barretto
226ac08ee3 Adjusted tree colour variation 2019-06-15 11:36:26 +01:00
liids
c2d0f17f92 Merge all spawn commands into one 2019-06-15 09:56:27 +02:00
Joshua Barretto
7a5a7b102c Added dynamic tree colours 2019-06-13 11:59:05 +01:00
Joshua Barretto
2cb57b9456 Merged stumps, adjusted scale code 2019-06-13 11:59:05 +01:00
Joshua Barretto
4d1d730ebf Fixed usize size issue for 32-bit platforms 2019-06-13 11:59:05 +01:00
Joshua Barretto
a8ee4418b7 Set default case for block type opacity 2019-06-13 11:59:05 +01:00
Imbris
7f8415a8a0 Use Instant and running compensation in clock 2019-06-09 14:14:02 -04:00
Cody
68d3642b3a Removes most unused imports; changes some unused variables to underscores or provides a leading underscore; removes some unnecessary variables and mutable declarations; and performs other miscellaneous warning fixes. 2019-06-06 14:48:41 +00:00
Joshua Barretto
ff5a6b9bcb Lighting fix 2019-06-06 12:25:06 +01:00
Joshua Barretto
d7d51e1810 Made idx_for use idx_for_unchecked internally 2019-06-06 07:42:59 +01:00
Joshua Barretto
ca4a0e7bc1 Added proper VD fog 2019-06-05 20:52:51 +01:00
Joshua Barretto
a49e061c7b Added rocks 2019-06-05 20:52:51 +01:00
Joshua Barretto
130cbca49a fmt 2019-06-05 20:52:51 +01:00
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
1a2de98ab6 Integrate forces *after* velocity is applied 2019-06-04 12:14:10 -06:00
Louis Pearson
b1e502cea4 Normalize move_dir only if the magnitude is greater than one 2019-06-04 10:13:40 -06:00
Louis Pearson
3038dff870 Use constants and normalized move direction 2019-06-04 10:09:34 -06:00
Louis Pearson
bca56fcd53 Add a function for integrating forces 2019-06-04 09:42:31 -06:00
Louis Pearson
409e79870c Adjust gliding speed
Former-commit-id: f2104422d1874e80f792bb97ded19ca976bbd4c1
2019-06-04 07:57:12 -06:00
Louis Pearson
e4ea30e158 Add CollisionShape, move friction calculations to phys
Former-commit-id: 3723a8f74bc2854aaa98357e2d0b51a1668d9030
2019-06-04 07:57:12 -06:00
Louis Pearson
002207001c Remove z < 0 hack
Former-commit-id: e0e4ad6e806189cd67ac626685ce9ed1456222f0
2019-06-04 07:55:49 -06:00
Ahmed Ihsan Tawfeeq
5705c1572c Fixed bug in loading JSON assets 2019-06-04 12:39:46 +00:00
Forest Anderson
7235e5fe7c 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
scorpion9979
fe18b88cda Cleaned code 2019-06-04 01:10:59 -04:00
scorpion9979
d566fc4f1f Added humanoid NPC type w/ names 2019-06-04 01:10:59 -04:00
scorpion9979
f6f915e441 Implemented asset system for caching json data 2019-06-04 01:10:59 -04:00
scorpion9979
d62f3a292b Cleaned code
Refactored code for readability
2019-06-04 01:10:59 -04:00
Ahmed Ihsan Tawfeeq
2ef2c22ad1 Added randomized NPC names veloren/veloren#133 2019-06-04 01:10:59 -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
3c16c5a3ec Added basic light 2019-06-03 22:50:47 +01:00
Cody
0f1d37405a 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
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
Cody
02da1bd4e5
Reverts one erroneous change, further corrects another comment. 2019-06-01 00:52:20 -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
a229d08c2b
Addresses more naming schemes and typos. 2019-05-31 16:36:24 -04:00
timokoesters
b0ff00bc0f Add server info
Former-commit-id: 9e504c821e871d30f8ac7cd4acb7a8022bdb5710
2019-05-28 22:25:46 +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
e2f65627af fmt
Former-commit-id: 7535fe743722967dd59e383aa93cb78cb3be6e23
2019-05-28 19:59:32 +01: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
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