Sam
|
55eb949ba4
|
Initial implementation of new dash melee.
|
2020-09-21 17:38:48 -05:00 |
|
Sam
|
e0960c127e
|
Removed combo duration of combo melee (combo now activated from recover duration). Allowed for forced forward movement in combo melee, and added it to stages 1 and 3).
|
2020-09-21 17:38:47 -05:00 |
|
jshipsey
|
a0cbdaee28
|
stage 2 and 3 anim
|
2020-09-21 17:38:46 -05:00 |
|
Sam
|
75adf154ae
|
Removed swing_frac, added a swing duration instead to allow for more utility in character state. Moved location of stage_section enum to wielding so it could more easily be used by other character states.
|
2020-09-21 17:38:46 -05:00 |
|
Sam
|
1b39374d29
|
Added support for different swings in the combo melee having differnt fractions of time buildup duration is split.
|
2020-09-21 17:38:45 -05:00 |
|
jshipsey
|
7b3b4da073
|
stage 2 animation
|
2020-09-21 17:38:44 -05:00 |
|
Sam
|
2682b18bc2
|
Added enum for stage section instead of using 4 bools.
|
2020-09-21 17:38:43 -05:00 |
|
Sam
|
0ce0765b09
|
Did stuff to support addition of keyframes for combo melee animation.
|
2020-09-21 17:38:43 -05:00 |
|
Sam
|
4cab71667e
|
Animation time for combo melee now resets between stages.
|
2020-09-21 17:38:42 -05:00 |
|
Sam
|
e3b7507ba4
|
Initial implementation of combo melee attack.
|
2020-09-21 17:38:41 -05:00 |
|
Joshua Barretto
|
12547739d8
|
Merge branch 'zesterer/better-block-format' into 'master'
Improved representation of Block for better performance, more...
See merge request veloren/veloren!1395
|
2020-09-21 21:49:43 +00:00 |
|
Joshua Barretto
|
d1adb9c4fc
|
Addressed review issues
|
2020-09-21 21:10:32 +01:00 |
|
Joshua Barretto
|
13770f6408
|
Merge branch 'henild/golem-println-fix' into 'master'
Delete the extra println statement
See merge request veloren/veloren!1401
|
2020-09-21 15:53:56 +00:00 |
|
henild
|
4073fecf4f
|
Delete the extra println
|
2020-09-21 21:13:00 +05:30 |
|
Joshua Barretto
|
b44ecf5a3d
|
Added make_sprite command
|
2020-09-21 16:39:20 +01:00 |
|
Joshua Barretto
|
c1b7199c6c
|
Removed unused sprite manifests
|
2020-09-21 16:07:38 +01:00 |
|
Joshua Barretto
|
37997cb7b1
|
Fixed broken arrow physics
|
2020-09-20 11:56:57 +01:00 |
|
Joshua Barretto
|
df4d3e4323
|
Improved docs
|
2020-09-20 11:46:12 +01:00 |
|
Joshua Barretto
|
f6628d8a35
|
Updated lockfile
|
2020-09-20 11:46:12 +01:00 |
|
Joshua Barretto
|
c66753fb16
|
Updated changelog
|
2020-09-20 11:46:12 +01:00 |
|
Joshua Barretto
|
d17ab15dd9
|
Improved representation of Block for better performance, more features, and better backwards-compatibility
|
2020-09-20 11:46:12 +01:00 |
|
Samuel Keiffer
|
65da0a7f55
|
Merge branch 'sam/boss' into 'master'
Boss
Closes #769
See merge request veloren/veloren!1364
|
2020-09-19 20:47:07 +00:00 |
|
Joshua Yanovski
|
078971683e
|
Merge branch 'droogmic/scene_terrain_refator' into 'master'
Voxygen scene terrain - minor refactor
See merge request veloren/veloren!1392
|
2020-09-19 20:29:02 +00:00 |
|
Sam
|
32bca583d5
|
Addressed another comment.
|
2020-09-19 14:40:22 -05:00 |
|
Sam
|
227dd2883e
|
Addressed comments
|
2020-09-19 14:40:21 -05:00 |
|
Sam
|
8aed41de4b
|
Golem now spawns in dungeon.
|
2020-09-19 14:40:20 -05:00 |
|
Sam
|
03089b05d4
|
Added healing healthsource logic to shockwave system.
|
2020-09-19 14:40:19 -05:00 |
|
Sam
|
6c09b81ed3
|
Added maximum vertical angle for shockwave.
|
2020-09-19 14:40:19 -05:00 |
|
Sam
|
e43e02ada6
|
Fixed shockwave and melee crit damage bypassing infinite armor. Made knockback not be applied if infinite armor.
|
2020-09-19 14:40:18 -05:00 |
|
Sam
|
7eab7dca41
|
Moved knockback to a server event so that it would actually be applied to the player.
|
2020-09-19 14:40:17 -05:00 |
|
Sam
|
7a469e3449
|
Changed boss from cyclops to stone golem. Added ai specific for boss.
Tweaked shockwave.
Fix rebasing errors.
|
2020-09-19 14:40:16 -05:00 |
|
scott-c
|
42aecad3e3
|
Tweak particle effects
|
2020-09-19 14:40:15 -05:00 |
|
Sam
|
ea9d4d5292
|
Added particles dedicated for shockwave.
|
2020-09-19 14:40:15 -05:00 |
|
Sam
|
ac3cae28c6
|
Loadouts are now generated with loadout_builder.rs. Creatures spawned naturally and via command are now spawned with the same mechanics.
|
2020-09-19 14:40:14 -05:00 |
|
Sam
|
5454c51248
|
Added particles to shockwave attack.
|
2020-09-19 14:40:14 -05:00 |
|
Sam
|
0221ccf9a4
|
Tweaked shockwave values. Added shockwave damage type. Changed how knockback was handled in shockwaves to make negative knockback work better.
|
2020-09-19 14:40:13 -05:00 |
|
Imbris
|
b57d0181cf
|
Add shockwave system to handle shockwaves colliding with other entities
|
2020-09-19 14:40:10 -05:00 |
|
Sam
|
84fc76ac56
|
Started to implement shockwave system.
|
2020-09-19 14:29:06 -05:00 |
|
Sam
|
14b8c9248a
|
Projectile speed is no longer hard-coded.
|
2020-09-19 14:29:05 -05:00 |
|
Sam
|
7fc9c72a4a
|
Separated knockback out from basicmelee. Added weapon for cyclops boss to use, and added 1 ability to it.
|
2020-09-19 14:29:04 -05:00 |
|
Imbris
|
29ee6aea27
|
Merge branch 'imbris/random-fixes' into 'master'
Random fixes
Closes #697
See merge request veloren/veloren!1391
|
2020-09-19 18:54:42 +00:00 |
|
Imbris
|
49d672e85d
|
Unify healthbar showing calculation, move bubble acquisition into closure
|
2020-09-19 13:54:05 -04:00 |
|
Imbris
|
ad3ebfeaec
|
Fix projectile/water interaction
|
2020-09-19 13:54:05 -04:00 |
|
Imbris
|
f37968e877
|
Increase entity vs entity repulsion factor, add check to ensure entities don't collide with themselves, fix possession projectiles not working on entities in the same group
|
2020-09-19 13:54:05 -04:00 |
|
Imbris
|
3afd9455b6
|
Make chat bubbles show up even if nametags are not displayed
|
2020-09-19 13:54:05 -04:00 |
|
Imbris
|
910e648cb2
|
Use proper fps in voxygen graphics settings tab
|
2020-09-19 13:54:05 -04:00 |
|
Michael Droogleever Fortuyn
|
d0f5641e8a
|
Scene terrain worker refactor
Simplify ChunkMeshState's active worker tracking to a bool,
as the tick value was never being used.
|
2020-09-19 16:13:29 +02:00 |
|
Joshua Barretto
|
f5e8344af6
|
Merge branch 'scott-c/projectiles' into 'master'
align first person projectiles with first person camera and crosshair
See merge request veloren/veloren!1073
|
2020-09-19 12:04:14 +00:00 |
|
scott-c
|
d612f63d38
|
Improve first-person projectile aiming
|
2020-09-19 19:14:23 +08:00 |
|
Joshua Yanovski
|
3f451ae85e
|
Merge branch 'martin-t/dust' into 'master'
Fix typo: velorite dusk->dust
See merge request veloren/veloren!1390
|
2020-09-18 23:54:17 +00:00 |
|