Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,115 Commits 151 Branches 18 Tags
Commit Graph

5115 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
jshipsey
6be95b3051 thropod manifest changes 2020-09-17 22:32:10 -04:00
Snowram
5cf680bca5 add deer, beaver and porcupine npcs 2020-09-17 22:32:10 -04:00
jshipsey
54f4c3c048 idle for theropod, corrections to swimming 2020-09-17 22:32:10 -04:00
Snowram
d61d0e3c36 Tweak offsets for theropods 2020-09-17 22:32:10 -04:00
jshipsey
0895ddaffb haul out the critter skele, add theropod 2020-09-17 22:32:10 -04:00
jshipsey
36c5b3d8b4 proper cycles on quadmed movement 2020-09-17 22:32:09 -04:00
Snowram
0dd9b71404 Improve adaptative quadmed run 2020-09-17 22:32:09 -04:00
jshipsey
3641932573 refining pace setup. refined species anim variables 2020-09-17 22:32:09 -04:00
jshipsey
ee9044e68c first attempt at adaptive stride system 2020-09-17 22:32:09 -04:00
jshipsey
c2e364abb5 fix for animal attack motion bug 2020-09-17 22:32:09 -04:00
jshipsey
7593ea6000 gliders as items. anim improvements 2020-09-17 22:32:09 -04:00
jshipsey
4a89c7d3c1 fit dt issue 2020-09-17 22:18:49 -04:00
jshipsey
aadb934935 assets/manifests 2020-09-17 22:18:49 -04:00