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
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
Monty Marz
5fe79e1c6a
new loading screen bgs (part 1)
...
Add a basic random feature to char creation
loading screen bg (part 2)
loading screen changes, random button graphics
Random appearance also pick a random npc name
2020-09-18 23:17:47 +00:00
Martin Taibr
a9756607a3
fix typo: velorite dusk->dust
2020-09-19 00:43:29 +02:00
Justin Shipsey
6f2161c740
Merge branch 'slipped/betterthings' into 'master'
...
better quad anims, new animals, theropods, golem
See merge request veloren/veloren!1384
2020-09-18 18:10:28 +00:00
Snowram
f9fada87cf
Addresses comments
2020-09-18 18:45:03 +02:00
jshipsey
8330d087e6
clippy
2020-09-17 22:58:02 -04:00
jshipsey
90e5bbaac0
rebase
2020-09-17 22:41:40 -04:00
jshipsey
fff6a6fb0a
finish odonto
2020-09-17 22:32:11 -04:00
jshipsey
b0767cb7a5
minor anim fix
2020-09-17 22:32:11 -04:00
jshipsey
5bb45a4861
spawn tweaks, improved odonto
2020-09-17 22:32:11 -04:00
Snowram
fecc40ad8e
Better quadmed legs/feet ratio
2020-09-17 22:32:11 -04:00
jshipsey
8a43cba3b6
quadsmall manifest changes
2020-09-17 22:32:11 -04:00
Snowram
62f6a5799a
Initial quadmed feed animation
2020-09-17 22:32:10 -04:00
jshipsey
789d93b52f
new models, shockwave anim
2020-09-17 22:32:10 -04:00
jshipsey
03b7320b4b
general housekeeping
2020-09-17 22:32:10 -04:00
jshipsey
06b39b9072
species specific improvement
2020-09-17 22:32:10 -04:00
Snowram
6a16268ff0
Quadmed run anim tweaks and deers offsets tweaks
2020-09-17 22:32:10 -04:00
jshipsey
b781a1765b
theropod run
2020-09-17 22:32:10 -04:00
jshipsey
2589c0cfc6
thropod manifest changes
2020-09-17 22:32:10 -04:00
