Joshua Barretto
51fa4f3cfc
Merge branch 'animation-tweaks' into 'master'
...
animation and movement tweaks
See merge request veloren/veloren!389
2019-08-03 12:09:38 +00:00
Joshua Barretto
cab898a91f
Made enemies actually attack
2019-08-03 13:01:54 +01:00
timokoesters
3a43150bc5
Make hostile npcs back away when too close
2019-08-03 12:53:39 +01:00
Pfauenauge90
c919b68346
changed angle of attack, changed z offset on hit
2019-08-03 12:46:07 +01:00
timokoesters
e39324a9d2
Remove knockback
2019-08-03 12:46:07 +01:00
Joshua Barretto
3063546a58
Added entity pushback
2019-08-03 12:26:05 +01:00
Joshua Barretto
e6fe07dd3d
Shortened enemy sight distance
2019-08-02 21:35:03 +01:00
Joshua Barretto
8aa7af781e
Fixed enemy combat
2019-08-02 20:52:46 +01:00
Joshua Barretto
5e4f383952
Better enemy AI
2019-08-02 20:41:38 +01:00
Joshua Barretto
677c5781ba
Added bosses, improved secret object spawn rates
2019-08-02 20:10:52 +01:00
timokoesters
55079c3d1e
Fix hostile npcs new target selection
2019-08-02 20:44:56 +02:00
jshipsey
13310ab9ca
improved animations and movement
2019-08-01 23:57:26 -04:00
Piotr Korgól
ec550620ad
Add a health bonus for level ups, fix pets
2019-08-01 18:56:08 +02:00
Joshua Barretto
39fc1d6b71
Added entity pickup, changed item model
2019-08-01 09:12:00 +01:00
Joshua Barretto
fc49293874
Clickthrough on items
2019-08-01 09:09:26 +01:00
Joshua Barretto
31f8794c39
Started work on inventory manipulation
2019-08-01 09:09:26 +01:00
Joshua Barretto
123a78552a
Fixed block-hopping on edges, added correct inventory slots
2019-08-01 09:09:26 +01:00
timokoesters
b695a63e98
Send different physics components individually
2019-07-30 13:35:16 +02:00
Joshua Barretto
5cdfb26e0d
Added LightEmitter component
2019-07-21 19:22:49 +01:00
Joshua Barretto
dd84c6698b
Fixed infinite NPC jumping
2019-07-21 19:22:49 +01:00
Joshua Barretto
1dc654dde7
Added object entities
2019-07-21 19:22:49 +01:00
Joshua Barretto
d4821b8de8
Better fog
2019-07-21 00:32:36 +01:00
Joshua Barretto
bbd7f579d2
Fix for clipping
2019-07-09 15:07:53 +01:00
Joshua Barretto
9f6f9cb25f
Fixed block snapping at lower framerates
2019-07-09 14:04:30 +01:00
Joshua Barretto
0f0f28284c
Added 'perfect' collisions
2019-07-09 13:37:51 +01:00
Joshua Barretto
6bb48760d7
Fixed jittering collision bug
2019-07-09 11:51:00 +01:00
Justin Shipsey
1c10ff756f
Holding weapon while running/jumping/standing
2019-07-06 19:00:05 +00:00
timokoesters
f5da167ce5
Fix warnings and clippy recommendations in common
2019-07-02 15:48:25 +02:00
jshipsey
cc548eb669
glider animation fix
2019-06-30 18:53:45 -04:00
jshipsey
e9bbe0e800
rebase
2019-06-30 18:53:45 -04:00
jshipsey
2ce5c5881e
combat run/jump/idle animation states
2019-06-30 18:53:44 -04:00
Joshua Barretto
e4dc145f17
Merge branch 'zesterer/small-fixes' into 'master'
...
More small fixes
See merge request veloren/veloren!271
2019-06-30 22:52:21 +00:00
Joshua Barretto
0de505b74c
fmt
2019-06-30 23:46:55 +01:00
Joshua Barretto
14d9071670
Fixed minor physics bugs
2019-06-30 23:46:46 +01:00
timokoesters
370e7db1ee
Fix death
2019-06-30 22:29:00 +02:00
Joshua Barretto
b35832c37d
Prevent movement in unloaded chunks
2019-06-30 19:54:13 +01:00
Joshua Barretto
2985f94751
Prevented stalling when jumping before a block-hopping
2019-06-30 19:54:13 +01:00
timokoesters
7fec42ce2c
Fix controls
2019-06-30 19:48:38 +02:00
timokoesters
14400f6380
Remove Actor and use Body instead
2019-06-30 18:57:24 +02:00
Joshua Barretto
af755c0964
fmt
2019-06-29 22:47:24 +01:00
Joshua Barretto
f2df3a9d18
Block-hopping fix, better dusk shaders
2019-06-29 22:47:24 +01:00
Joshua Barretto
f1ba97ae7a
Merge branch 'timo-rolling-fix' into 'master'
...
Rolling bugs + NPC bugs + "Impossible" bug
See merge request veloren/veloren!265
2019-06-29 21:47:05 +00:00
timokoesters
ccbacabd2f
Make agents use controller correctly
2019-06-29 22:51:22 +02:00
timokoesters
d235374d8e
Fix npc and death bug
2019-06-29 22:43:44 +02:00
timokoesters
5fcf6ededa
magnitude_squared everywhere, actionstate everywhere, constant for moving
2019-06-29 22:11:21 +02:00
timokoesters
610c86a3b9
Animation fixes
2019-06-29 21:01:27 +02:00
timokoesters
9f83533741
Fix invisible characters
2019-06-29 20:24:07 +02:00
timokoesters
c80351f6ca
Fix double roll bug
2019-06-29 19:49:51 +02:00
Joshua Barretto
324de39bfe
fmt
2019-06-29 16:48:43 +01:00
Joshua Barretto
905b3d6f45
Prevented block-hopping when not on ground
2019-06-29 16:48:43 +01:00
timokoesters
5a41a58c0a
End roll when going too slow
2019-06-29 14:10:52 +02:00
Joshua Barretto
acb184e15d
Made physics cheaper still
2019-06-27 15:37:33 +01:00
Joshua Barretto
6444ba1933
Made collision detection cheaper, fixed snapping bug, somewhat nerfed rolling
2019-06-27 15:21:41 +01:00
Joshua Barretto
cdb405d7b8
Made physics fps-independent
2019-06-26 22:43:47 +01:00
Joshua Barretto
7b7d843d0f
Comments and fmt
2019-06-26 11:53:43 +01:00
Joshua Barretto
4a340f69b5
Camera clipping and block-hop fix
2019-06-26 11:53:43 +01:00
Joshua Barretto
5decd48db6
Used velocity bias for collision correction
2019-06-26 11:53:43 +01:00
Joshua Barretto
6258035a4d
Added attempts counter to prevent infinite collision loops
2019-06-26 11:53:43 +01:00
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
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
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
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
Cody
14ac5babd4
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
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
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
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
Forest Anderson
2fc4e9a2f8
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
8407908af2
fmt
...
Former-commit-id: 7535fe743722967dd59e383aa93cb78cb3be6e23
2019-05-28 19:59:32 +01:00
timokoesters
5c48330460
Fix moving after death (again)
...
Former-commit-id: 1c46fed1f5d9a74bcf926354b3b4efd442f5b5bc
2019-05-28 18:37:49 +02:00
Marcel
b5b61462ee
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
6cb1a75b93
speed tweak
...
Former-commit-id: a3938ec59032794c7135facddecbf7131fb5262e
2019-05-27 19:48:44 -04:00
Joshua Barretto
bfc70f4d78
Sort of fixed enemy freezes
...
Former-commit-id: 30933b3ff7d16428a107ade6163cb83562668b66
2019-05-28 00:04:25 +01:00
jshipsey
f9e2828de5
swing animation changes
...
Former-commit-id: 1bc70090e938c12d6e133683932b470be102aecd
2019-05-27 19:03:52 -04:00
jshipsey
5f22c4e26f
swing animation
...
Former-commit-id: 19e2c32aa36e3890e35df87f01bb0aec4cc8cf9c
2019-05-27 18:54:09 -04:00
timokoesters
2008400169
Implement killer name in chat
...
Former-commit-id: 5aa87529179a684d5675c33e4001806aa2040802
2019-05-27 21:47:19 +02:00
timokoesters
a6439984be
Add connect, disconnect and kill messages
...
Former-commit-id: c25f6fb0b594e5d61a965447359536ca17173aa7
2019-05-27 19:45:43 +02:00
Joshua Barretto
baf740a289
Added enemies
...
Former-commit-id: 2c07c9e52a7cbfb85508e7098c528bddd9b12997
2019-05-27 12:18:14 +01:00
Imbris
de4d1a0e06
Fix pet spawning leading to NaN move_dir
...
Former-commit-id: ac68702bfdb482f32967d96e4b1da2b0ffc4e4c4
2019-05-26 11:24:26 -04:00
timokoesters
64b00f41f4
Fix invisible chars
...
Former-commit-id: cbb93e0511100b9b66f9ea22451c99a69b50b19c
2019-05-26 16:04:44 +02:00
timokoesters
4696cd2c8b
Add better inputs, input validation and more
...
Former-commit-id: 3227221b12a674f66b011ce0ba734e226f223f34
2019-05-25 23:46:56 +02:00
timokoesters
73f29e3716
More comments
...
Former-commit-id: 762d6437fa341a33ee80088e2c5dbbdf96387df0
2019-05-25 23:21:40 +02:00
timokoesters
15d1a789d6
Better formatting
...
Former-commit-id: 22b83b6dd5ad145a39b236436a019c6b172787d7
2019-05-25 23:21:39 +02:00
timokoesters
1dbca8b994
Fix respawn position
...
Former-commit-id: c4dabc71a1c7af538e2c30acbf463340a4618cc9
2019-05-25 23:21:39 +02:00
timokoesters
1826a2b4f9
Implement fast respawn
...
Former-commit-id: 17f9aceba5c40a5d3ddc2e0fd6795479487753fd
2019-05-25 23:21:39 +02:00
timokoesters
0344f3eba8
Implement hit time delay
...
Former-commit-id: 6c1990645fd07e23de5eb97b6fc22f34ce09a6b7
2019-05-25 23:21:39 +02:00
timokoesters
ad3b8dffa1
Limit attack direction
...
Former-commit-id: b132f01f86814d2f8dd10d6d1454b6e2a95595f8
2019-05-25 23:21:39 +02:00
timokoesters
30bf1cde10
Add knockback
...
Former-commit-id: a703eb937ef7094a085548ca3197a575059855a0
2019-05-25 23:21:38 +02:00
timokoesters
a0918d11b6
Fix red effect
...
Former-commit-id: 1fd90a40aaaccb98aeb34715ee7cad5c0b3b3de7
2019-05-25 23:21:38 +02:00
timokoesters
ad5dcb4158
Make use of states in char-selection
...
Former-commit-id: f74d4811bebb0e60093a96d70feeedaae8bc6c04
2019-05-25 23:21:38 +02:00
timokoesters
fc39356cde
Use correct time
...
Former-commit-id: df33e802ee46f9ebe190be705ff8d81f856024e0
2019-05-25 23:21:38 +02:00
timokoesters
8af3ca5317
Fix animations
...
Former-commit-id: 20285b42be6f1858105cc4287e357ea254a8ce35
2019-05-25 23:21:37 +02:00
timokoesters
b3e4ca0a5d
Implement killing
...
Change animation history to animation
Add attack input event
Implement killing with ecs systems for damage and death
Sync attack properly
Sync deaths
Former-commit-id: 72b5be7d65d9d3fcbef50d4836a6f06ec218d69e
2019-05-25 23:21:37 +02:00
Pfauenauge90
c13206d82d
Basic worldgen
...
Former-commit-id: 3ca0afa95dd1d868a84a41129e889a203e8a7cd9
2019-05-21 22:51:41 +01:00
Joshua Barretto
b48b9f0141
Attempted fix of deltatime bug
...
Former-commit-id: d287bbf541dd318a7034f1e3ad4d9a167ac3c344
2019-05-21 22:51:41 +01:00
Cody
6b09fd7c53
Pedantic comment and language fixes.
...
Former-commit-id: eb49765c911aaa97a9c8ed351216a7a6f8411213
2019-05-17 18:32:07 -04:00
Joshua Barretto
7b09070fc8
fmt
...
Former-commit-id: 8f0bc964e00bfd9461f752622862de5335678e5b
2019-05-16 20:23:45 +01:00
Joshua Barretto
a0e685c03f
Improved falling glider physics
...
Former-commit-id: 752c1291c7d38282312446c5391c2fb4fa7cbf6e
2019-05-16 14:13:28 +01:00
Joshua Barretto
bb95f5bf78
Added correct gliding animation calculation
...
Former-commit-id: 625310820c9cf7a1d37401875db43b5b597eb590
2019-05-16 12:04:42 +01:00
jshipsey
50fa3cf098
glide anim
...
Former-commit-id: b614a672b0a94f2b8803c0c1c22468b889242cc6
2019-05-16 00:40:35 -04:00
Joshua Barretto
7ac973623f
Fixed friction
...
Former-commit-id: d9ac7fa7fb98c2ac829470fa8deeb314cc0f15f6
2019-05-15 13:26:14 +01:00
Joshua Barretto
5c57568d31
Fixed physics
...
Former-commit-id: b4b208754e38aba2150efe99d319638910f64904
2019-05-15 13:26:14 +01:00
Joshua Barretto
8ef8c178d7
Added test gliding
...
Former-commit-id: 7aa1513511490feec531f10e58ad955c485ac594
2019-05-15 13:26:14 +01:00
Joshua Barretto
e8b6e120dc
Fixed pet spawning bug
...
Former-commit-id: 78dcd034940a4de1ce7d66a79d9134be6ee281f2
2019-05-15 13:26:14 +01:00
Forest
3d14d791cf
Cleaned code
...
Former-commit-id: fd4ef550ff58f621a129901d142d80266fbbc534
2019-05-12 15:57:39 -04:00
Joshua Barretto
266101c90d
Added basic pets
...
Former-commit-id: 1ef17505ecb11acb82541349343989128b78630f
2019-05-12 14:03:08 +01:00
timokoesters
bdf241bf24
Add TODO comment
...
Former-commit-id: fdc9e6d65d9d534e238a6ba2d1c2e66f194d975e
2019-05-11 21:48:05 +02:00
timokoesters
4ce1f9ee54
Temporary fix for falling into void
...
Former-commit-id: 8e3d9c0c34e897f13cc60d5968f390ed0107dd76
2019-05-11 21:38:05 +02:00
Forest Anderson
cf22cb99e7
Ran fmt
...
Former-commit-id: 6acf43d8e4c446b3f50a673179b8df20d6da648c
2019-05-09 17:30:44 -04:00
Joshua Barretto
89f9589cf0
Fixes to head animations
...
Former-commit-id: b595d4cdb459acbdd3a9a971aff8f0fbfd45981a
2019-05-09 20:18:13 +01:00
Joshua Barretto
54cc9e137a
fmt
...
Former-commit-id: b43b7192f7a2dd71da26182ca0c74449867381f3
2019-05-09 18:58:16 +01:00
Joshua Barretto
cf4e02252a
Smartened up terrain generation
...
Former-commit-id: d85448e5171bd27b04530da8e1ca927554136ebf
2019-05-09 18:57:47 +01:00
Joshua Barretto
94fd0b1a22
Fixed running animation, changed movement physics
...
Former-commit-id: 1b4c1f63701668074874aa6efc65f883f29e2cc1
2019-05-09 18:57:47 +01:00
Joshua Barretto
3705f9a871
Added anim_time to animations
...
Former-commit-id: 44ec8108c41a3cad74b6f3c0a2df02e5166a5487
2019-05-09 18:57:47 +01:00
Joshua Barretto
e6a40bbda2
Added jumping and Jump animation state
...
Former-commit-id: 6ae9f7e9c9fb2bc519a0ef2c1c8195376616ed4c
2019-05-09 18:57:47 +01:00
Joshua Barretto
9ebe3c3e6f
Added a delta time cap to avoid missing important physics events
...
Former-commit-id: e9f14ddda0963537ae6593c2dacc6a877f88c824
2019-05-09 18:57:47 +01:00
Joshua Barretto
3cd48ba468
Added lz4 compression to networking
...
Former-commit-id: 7910c933f110d595da70552716b6e8f0eb7544a1
2019-05-09 18:57:47 +01:00
Forest Anderson
993388e56a
Ran fmt on codebase
...
Former-commit-id: 7fecffa1dc66fffba4f07d45fb80960dc5178f4f
2019-04-29 20:37:19 +00:00
Joshua Barretto
0b0c71592c
Fixed orientation issue
...
Former-commit-id: 9fdeadb4c9a9ff55cbdeccbbf97ac32b4e9f4226
2019-04-25 17:52:11 +01:00
Joshua Barretto
9105bf0811
Added better terrain collisions
...
Former-commit-id: 38de44654d8050260a19a1da6c40c0f701602f13
2019-04-25 17:52:11 +01:00
Joshua Barretto
f210de09df
Added raycasting (needs testing) and basic character terrain collision
...
Former-commit-id: be6bfacfd28e777a64d8157fce129f8072e20b38
2019-04-25 17:52:11 +01:00
Joshua Barretto
247ba6621a
Made NPC movement smoother
...
Former-commit-id: 105908cf0118113408acd5ad7dce191fe405f88f
2019-04-22 17:50:18 +01:00
timokoesters
86898c26a0
Rename lastAnimation to last_animation
...
Former-commit-id: 7eabea72ad5ee2cfed20b3927a828eb55fae8e33
2019-04-17 22:44:10 +02:00
timokoesters
b9607ef405
Fix #21 by checking animation history
...
Former-commit-id: 5272d1d7aee73fc07edeb31d9f29238d19b7d229
2019-04-17 19:39:12 +02:00
Joshua Barretto
6693d22ecd
Fixed animation copypasta bug
...
Former-commit-id: e4b06e4e7c50214c7d7d9cc618ea7f117dc78ccc
2019-04-17 10:07:02 +01:00
