Sam
|
abcd0af1e3
|
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
|
a18c23025e
|
stage 2 and 3 anim
|
2020-09-21 17:38:46 -05:00 |
|
Sam
|
847bddbd89
|
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
|
2ba9d1e54f
|
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
|
2451a64b97
|
stage 2 animation
|
2020-09-21 17:38:44 -05:00 |
|
Sam
|
0ba5740265
|
Added enum for stage section instead of using 4 bools.
|
2020-09-21 17:38:43 -05:00 |
|
Sam
|
440e45f2bc
|
Did stuff to support addition of keyframes for combo melee animation.
|
2020-09-21 17:38:43 -05:00 |
|
Sam
|
aab56ea636
|
Animation time for combo melee now resets between stages.
|
2020-09-21 17:38:42 -05:00 |
|
Sam
|
cf573a42bd
|
Initial implementation of combo melee attack.
|
2020-09-21 17:38:41 -05:00 |
|
Joshua Barretto
|
b3117feea6
|
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
|
0ca42857fa
|
Addressed review issues
|
2020-09-21 21:10:32 +01:00 |
|
Joshua Barretto
|
aa8d9d5998
|
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
|
84239906f7
|
Delete the extra println
|
2020-09-21 21:13:00 +05:30 |
|
Joshua Barretto
|
388a899a7f
|
Added make_sprite command
|
2020-09-21 16:39:20 +01:00 |
|
Joshua Barretto
|
1e900e8c6a
|
Removed unused sprite manifests
|
2020-09-21 16:07:38 +01:00 |
|
Joshua Barretto
|
112b11c951
|
Fixed broken arrow physics
|
2020-09-20 11:56:57 +01:00 |
|
Joshua Barretto
|
49d1b3df6d
|
Improved docs
|
2020-09-20 11:46:12 +01:00 |
|
Joshua Barretto
|
ee3781d168
|
Updated lockfile
|
2020-09-20 11:46:12 +01:00 |
|
Joshua Barretto
|
ee26ad662e
|
Updated changelog
|
2020-09-20 11:46:12 +01:00 |
|
Joshua Barretto
|
ece4a01867
|
Improved representation of Block for better performance, more features, and better backwards-compatibility
|
2020-09-20 11:46:12 +01:00 |
|
Samuel Keiffer
|
b2f42a117c
|
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
|
7b43752785
|
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
|
6deeb7fcfe
|
Addressed another comment.
|
2020-09-19 14:40:22 -05:00 |
|
Sam
|
45fef87f32
|
Addressed comments
|
2020-09-19 14:40:21 -05:00 |
|
Sam
|
e39770d1d9
|
Golem now spawns in dungeon.
|
2020-09-19 14:40:20 -05:00 |
|
Sam
|
99aba78422
|
Added healing healthsource logic to shockwave system.
|
2020-09-19 14:40:19 -05:00 |
|
Sam
|
6a1acd47a1
|
Added maximum vertical angle for shockwave.
|
2020-09-19 14:40:19 -05:00 |
|
Sam
|
d0f068ba63
|
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
|
6327dd18b6
|
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
|
819fb8ee77
|
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
|
1f2ed53c42
|
Tweak particle effects
|
2020-09-19 14:40:15 -05:00 |
|
Sam
|
0c48efd445
|
Added particles dedicated for shockwave.
|
2020-09-19 14:40:15 -05:00 |
|
Sam
|
3e4615daea
|
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
|
23fa3c2f8d
|
Added particles to shockwave attack.
|
2020-09-19 14:40:14 -05:00 |
|
Sam
|
f5dad20899
|
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
|
829d8a20d1
|
Add shockwave system to handle shockwaves colliding with other entities
|
2020-09-19 14:40:10 -05:00 |
|
Sam
|
717142d5ea
|
Started to implement shockwave system.
|
2020-09-19 14:29:06 -05:00 |
|
Sam
|
68ecfba291
|
Projectile speed is no longer hard-coded.
|
2020-09-19 14:29:05 -05:00 |
|
Sam
|
66b0fee3c7
|
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
|
43398afa0c
|
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
|
9464fd49a9
|
Unify healthbar showing calculation, move bubble acquisition into closure
|
2020-09-19 13:54:05 -04:00 |
|
Imbris
|
6cd6a96b64
|
Fix projectile/water interaction
|
2020-09-19 13:54:05 -04:00 |
|
Imbris
|
017d4a3c16
|
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
|
ca2aad0080
|
Make chat bubbles show up even if nametags are not displayed
|
2020-09-19 13:54:05 -04:00 |
|
Imbris
|
b31df2f34e
|
Use proper fps in voxygen graphics settings tab
|
2020-09-19 13:54:05 -04:00 |
|
Michael Droogleever Fortuyn
|
a3c4040063
|
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
|
f22ee945ec
|
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
|
2686598f1f
|
Improve first-person projectile aiming
|
2020-09-19 19:14:23 +08:00 |
|
Joshua Yanovski
|
b2dc95239d
|
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 |
|
Monty Marz
|
d50b63c103
|
Merge branch 'pfau/char_creation_additions' into 'master'
Multiple UI Additions
See merge request veloren/veloren!1389
|
2020-09-18 23:17:47 +00:00 |
|