Commit Graph

1918 Commits

Author SHA1 Message Date
656d881c6c Give xp depending on max hp and lvl of entity killed 2019-08-03 21:30:01 +02:00
5a2c24f8b0 Merge branch 'zesterer/small-fixes' into 'master'
Made orientation change with move_dir, added a small amount of knockback, orientation lerp, better enemy combat, improved healthbar placement

See merge request veloren/veloren!399
2019-08-03 18:54:21 +00:00
799bb872f9 Make ori more precise 2019-08-03 20:41:55 +02:00
9cde590574 Made nametag position change with scale 2019-08-03 19:40:20 +01:00
663be70e3f Better enemy attack rate 2019-08-03 19:40:20 +01:00
a3330f7d5b Use slerp for ori 2019-08-03 20:33:31 +02:00
baf0899d56 Made entity collisions z-dependent 2019-08-03 19:09:01 +01:00
06f964d49e Better orientation in the air 2019-08-03 18:30:48 +01:00
6dc48d3a23 Made orientation change with move_dir, added a small amount of knockback 2019-08-03 18:24:07 +01:00
3a036aa9bc Merge branch 'zesterer/small-fixes' into 'master'
Made enemies sometimes roll

See merge request veloren/veloren!398
2019-08-03 12:37:42 +00:00
e205a3b1db Made enemies sometimes roll 2019-08-03 13:31:40 +01:00
96029f6614 Merge branch 'animation-tweaks' into 'master'
animation and movement tweaks

See merge request veloren/veloren!389
2019-08-03 12:09:38 +00:00
cde72d6c49 Merge branch 'timo-no-ckback' into 'master'
no-ckback

See merge request veloren/veloren!391
2019-08-03 12:09:23 +00:00
929cd5ee29 Made enemies actually attack 2019-08-03 13:01:54 +01:00
5288ae2fcf Fix combat animations for non humanoids 2019-08-03 12:53:39 +01:00
4e59bb19c8 Make hostile npcs back away when too close 2019-08-03 12:53:39 +01:00
a7731c9b15 changed angle of attack, changed z offset on hit 2019-08-03 12:46:07 +01:00
d8f1e6b7dc Remove knockback 2019-08-03 12:46:07 +01:00
bb4e279a70 Merge branch 'zesterer/small-fixes' into 'master'
Added entity pushback

See merge request veloren/veloren!397
2019-08-03 11:33:56 +00:00
0a8985335e Added entity pushback 2019-08-03 12:26:05 +01:00
f8d1387b16 Merge branch 'qutrin/humanoids' into 'master'
Allow normal enemies to spawn as humanoids

See merge request veloren/veloren!395
2019-08-03 10:47:03 +00:00
0c75429837 Allow normal enemies to spawn as humanoids 2019-08-03 12:35:16 +02:00
9b8f55ed83 Merge branch 'zesterer/worldgen-npcs' into 'master'
NPC Spawning

See merge request veloren/veloren!393
2019-08-03 06:41:17 +00:00
3d8453c0c3 Shortened enemy sight distance 2019-08-02 21:35:03 +01:00
6066b40207 More interesting enemy spawning 2019-08-02 21:31:22 +01:00
a952e13687 Fixed enemy combat 2019-08-02 20:52:46 +01:00
b568c367c5 Better health accessors methods 2019-08-02 20:49:48 +01:00
759649f228 Better enemy AI 2019-08-02 20:41:38 +01:00
867978dd1d Added bosses, improved secret object spawn rates 2019-08-02 20:10:52 +01:00
132ed85e00 Removed NPCs that are outside the VD 2019-08-02 20:10:52 +01:00
b7a8dc3e54 Added worldgen npcs 2019-08-02 20:10:52 +01:00
5c4b637087 Merge branch 'timo-fix-hostile' into 'master'
Fix hostile npc's new target selection

See merge request veloren/veloren!392
2019-08-02 18:55:44 +00:00
01915aa555 Fix hostile npcs new target selection 2019-08-02 20:44:56 +02:00
1b6465ddfa Merge branch 'fixspecsidvs' into 'master'
fixed #211 - host specs-idvs on gitlab.com

Closes #211

See merge request veloren/veloren!390
2019-08-02 08:33:06 +00:00
1f6ee55555 fixed #211 - host specs-idvs on gitlab.com 2019-08-02 10:16:55 +02:00
e38a930f99 improved animations and movement 2019-08-01 23:57:26 -04:00
8066412ad0 Merge branch 'revert-f4fa0af3' into 'master'
Revert "Merge branch 'imbris/upgrade_specs' into 'master'"

See merge request veloren/veloren!388
2019-08-01 23:32:33 +00:00
48a4377bf8 Revert "Merge branch 'imbris/upgrade_specs' into 'master'"
This reverts merge request !375
2019-08-01 23:32:33 +00:00
2827bef770 Merge branch 'imbris/upgrade_specs' into 'master'
Upgrade specs to 0.15

See merge request veloren/veloren!375
2019-08-01 22:29:25 +00:00
bafea1884f Upgrade specs to 0.15 2019-08-01 18:09:13 -04:00
b118196447 Merge branch 'login-bg-for-0.3' into 'master'
0.3. login bg

See merge request veloren/veloren!386
2019-08-01 17:53:35 +00:00
e6196aa325 0.3. login bg 2019-08-01 17:53:34 +00:00
e6c80b185d Merge branch 'qutrin/last-minute-health' into 'master'
Add a health bonus for level ups, fix pets

See merge request veloren/veloren!387
2019-08-01 17:08:06 +00:00
597483e4e0 Add a health bonus for level ups, fix pets 2019-08-01 18:56:08 +02:00
0df8ce2517 Merge branch 'zesterer/inventories' into 'master'
Inventories

Closes #167 and #166

See merge request veloren/veloren!371
2019-08-01 15:21:29 +00:00
60b8728bc8 fmt 2019-08-01 17:07:42 +02:00
9d681eb028 Add a few extra items to the inventory by default 2019-08-01 09:13:34 +01:00
e86e469b6d Fixed absolute darkness 2019-08-01 09:12:00 +01:00
b625ffd8d3 Better item throwing 2019-08-01 09:12:00 +01:00
ac16ee945f Added entity pickup, changed item model 2019-08-01 09:12:00 +01:00