Commit Graph

5312 Commits

Author SHA1 Message Date
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
Michael Droogleever Fortuyn
7fd50f36ef Add interaction hint #615
Add text above dropped items hinting at
the use of the interaction control

e.g. pressing E
2020-09-19 20:38:48 +02: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
Snowram
9308cabeb8 add deer, beaver and porcupine npcs 2020-09-17 22:32:10 -04:00
jshipsey
3eeaf7e8c9 idle for theropod, corrections to swimming 2020-09-17 22:32:10 -04:00
Snowram
ee95550355 Tweak offsets for theropods 2020-09-17 22:32:10 -04:00
jshipsey
cd6e1ad45f haul out the critter skele, add theropod 2020-09-17 22:32:10 -04:00
jshipsey
aa440c02bb proper cycles on quadmed movement 2020-09-17 22:32:09 -04:00
Snowram
1097dbcc25 Improve adaptative quadmed run 2020-09-17 22:32:09 -04:00
jshipsey
883aa1754b refining pace setup. refined species anim variables 2020-09-17 22:32:09 -04:00
jshipsey
47d5c635de first attempt at adaptive stride system 2020-09-17 22:32:09 -04:00
jshipsey
b514fb4159 fix for animal attack motion bug 2020-09-17 22:32:09 -04:00
jshipsey
ecae71c016 gliders as items. anim improvements 2020-09-17 22:32:09 -04:00
jshipsey
7525479a4c fit dt issue 2020-09-17 22:18:49 -04:00
jshipsey
412495e5fc assets/manifests 2020-09-17 22:18:49 -04:00
jshipsey
bd1984bf28 golem addition, fix for axe attack 2020-09-17 22:18:49 -04:00
Joshua Yanovski
4e07258319 Merge branch 'xvar/item-persistence' into 'master'
Persistence overhaul

Closes #678

See merge request veloren/veloren!1342
2020-09-17 23:02:14 +00:00
Ben Wallis
712f2e9c97 * Moved migrations to beginning of server initialisation
* Added migrations for entity ID changes to existing tables
2020-09-17 23:02:14 +00:00