Commit Graph

5914 Commits

Author SHA1 Message Date
Joshua Barretto
44f4031e58 Resolved collision bugs with prioritised collision system 2019-06-26 11:53:43 +01:00
Joshua Barretto
ae168711d7 Added configurable details 2019-06-26 11:53:43 +01:00
Joshua Barretto
0d984a5671 Fixed collision bugs 2019-06-26 11:53:43 +01:00
Joshua Barretto
c2c5b9f5e7 Better camera interpolation 2019-06-26 11:53:43 +01:00
Joshua Barretto
af432ec510 Calculate delta time properly, fix low fps collision issues by decreasing max dt 2019-06-26 11:53:43 +01:00
Joshua Barretto
2c24ba7776 Fixed block-hopping, block-snapping, added interpolation to figures 2019-06-26 11:52:36 +01:00
Joshua Barretto
7a1359961c Removed block-hopping, fixed collisions 2019-06-26 11:52:36 +01:00
Joshua Barretto
285cf2f973 Added proper 3D collisions 2019-06-26 11:52:36 +01:00
Timo Koesters
4641c2f659 Merge branch 'timo-fix-interpolation' into 'master'
Fix fps dependent interpolation by using dt

See merge request veloren/veloren!250
2019-06-25 19:49:26 +00:00
timokoesters
7fc53db328
Fix fps dependent animation interpolation by using dt 2019-06-25 21:43:45 +02:00
Forest Anderson
81932ac509 Merge branch 'imbris/vd_circle' into 'master'
Circular View Distance

See merge request veloren/veloren!248
2019-06-24 23:13:02 +00:00
Imbris
16e5b6bafd circular view distance 2019-06-23 15:49:15 -04:00
Timo Koesters
36ffd15c98 Merge branch 'qutrin/updatereadmeimage' into 'master'
Update README.md

See merge request veloren/veloren!244
2019-06-22 15:49:40 +00:00
Piotr Korgól
2a402413de Update readme.md 2019-06-22 19:26:40 +02:00
Piotr Korgól
cbef2fa82d Update image 2019-06-22 18:50:50 +02:00
Forest Anderson
153ab47b58 Merge branch 'angelonfira/add-manual-exe-step' into 'master'
Added manual build option

See merge request veloren/veloren!243
2019-06-19 15:51:21 +00:00
Forest Anderson
92c5a7dd7c Added manual build option 2019-06-19 15:51:21 +00:00
Marcel
99f248529c Merge branch 'timo-fix-join' into 'master'
Timo fix join

See merge request veloren/veloren!240
2019-06-17 19:30:41 +00:00
timokoesters
9701a666d9
Don't try to compensate bad states 2019-06-17 20:10:47 +02:00
timokoesters
57894a0368
Fix join problems 2019-06-17 19:52:06 +02:00
Joshua Barretto
48d925622f Merge branch 'qutrin-chat-cli' into 'master'
Make chat-cli read user input

Closes #150

See merge request veloren/veloren!239
2019-06-17 11:15:42 +00:00
Piotr Korgól
f460fc5e2a fmt 2019-06-17 15:10:14 +02:00
Piotr Korgól
d33c4e35c5 read input on a different thread 2019-06-17 15:07:55 +02:00
Piotr Korgól
a4a835d26b fmt 2019-06-17 12:40:50 +02:00
Piotr Korgól
3ddc56e4ac Allow client to read user input 2019-06-17 12:40:19 +02:00
Joshua Barretto
121d9e0d61 Merge branch 'zesterer/net-fixes' into 'master'
Network fix for 32-bit

See merge request veloren/veloren!238
2019-06-16 22:01:18 +00:00
Joshua Barretto
62f148b46f Network fix for 32-bit 2019-06-16 22:59:25 +01:00
Joshua Barretto
ceff450233 Merge branch 'timo-rebase-slipped-on-midge' into 'master'
ECS organization + Rolling animation

See merge request veloren/veloren!235
2019-06-16 19:56:44 +00:00
Joshua Barretto
9ad2feb037 Ignore ForcedUpdate insertion 2019-06-16 20:53:10 +01:00
timokoesters
eb10389eb6
cargo fmt 2019-06-16 19:59:16 +02:00
timokoesters
f0e6e76423
Don't sync animations, just sync components used to construct them 2019-06-16 19:59:15 +02:00
jshipsey
8dd1e46883
run tweaks 2019-06-16 19:59:15 +02:00
jshipsey
ed2773fbca
changed hand motion on run animation 2019-06-16 19:59:15 +02:00
jshipsey
8e019cdbec
lowered roll duration 2019-06-16 19:59:14 +02:00
timokoesters
14ff033770
Fix glider 2019-06-16 19:59:14 +02:00
timokoesters
2afc45617d
More input validation 2019-06-16 19:59:14 +02:00
jshipsey
0c534efddd
adjusted v-tilt, roll speed, run animation tempo 2019-06-16 19:59:13 +02:00
jshipsey
e066d98762
slight roll tweak, altered speeds in physics 2019-06-16 19:59:13 +02:00
timokoesters
ae081b8f67
Make roll timed 2019-06-16 19:59:13 +02:00
jshipsey
ecf0d9647c
added roll physics, improved anims for roll, glide, run, attached hands to torso 2019-06-16 19:59:12 +02:00
timokoesters
7deb3da1af
Add pub use phys:: and remove most pub mods 2019-06-16 19:59:12 +02:00
timokoesters
955c20fa61
Remove crun and cidle components and inputs 2019-06-16 19:57:04 +02:00
timokoesters
e2c81dd036
Fixes for .maybe() and animation 2019-06-16 19:57:04 +02:00
jshipsey
4de5489367
groundwork for role, crun, cidle 2019-06-16 19:57:04 +02:00
Cody
1f6c1188bc
Removes input sys, moves code to combat and phys 2019-06-16 19:57:03 +02:00
timokoesters
b947d78dac
Improve organization of controls 2019-06-16 19:57:03 +02:00
timokoesters
69cb2ed84f
Revamp control system 2019-06-16 19:57:03 +02:00
Joshua Barretto
132d1a67a6 Merge branch 'zesterer-worldgen-stuff' into 'master'
Worldgen stuff

See merge request veloren/veloren!217
2019-06-16 10:46:59 +00:00
Joshua Barretto
8a490a6456 Merge branch '134-merge-all-spawning-commands-into-one' into 'master'
Resolve "Merge all spawning commands into one"

Closes #134

See merge request veloren/veloren!237
2019-06-16 10:45:54 +00:00
Joshua Barretto
76344d142e Added clouds 2019-06-15 18:23:01 +01:00