5128 Commits

Author SHA1 Message Date
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
Monty Marz
2edf2b497a 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
481d1487f2 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
39a1cbf286 fix typo: velorite dusk->dust 2020-09-19 00:43:29 +02:00
Justin Shipsey
d53fa20911 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
69f14b564d Addresses comments 2020-09-18 18:45:03 +02:00
jshipsey
abc678695b clippy 2020-09-17 22:58:02 -04:00
jshipsey
58bca3636e rebase 2020-09-17 22:41:40 -04:00
jshipsey
8433f37e90 finish odonto 2020-09-17 22:32:11 -04:00
jshipsey
ee4f57fc3c minor anim fix 2020-09-17 22:32:11 -04:00
jshipsey
1f8329c98a spawn tweaks, improved odonto 2020-09-17 22:32:11 -04:00
Snowram
a06d75d5a2 Better quadmed legs/feet ratio 2020-09-17 22:32:11 -04:00
jshipsey
672ff7c523 quadsmall manifest changes 2020-09-17 22:32:11 -04:00
Snowram
62b929120b Initial quadmed feed animation 2020-09-17 22:32:10 -04:00
jshipsey
a0d30dc608 new models, shockwave anim 2020-09-17 22:32:10 -04:00
jshipsey
3e322952a4 general housekeeping 2020-09-17 22:32:10 -04:00
jshipsey
98fae00017 species specific improvement 2020-09-17 22:32:10 -04:00
Snowram
57d05c7818 Quadmed run anim tweaks and deers offsets tweaks 2020-09-17 22:32:10 -04:00
jshipsey
31a04b9384 theropod run 2020-09-17 22:32:10 -04:00