Joshua Barretto
c9f1a793db
Merge branch 'timo-kill-xp' into 'master'
...
Give xp depending on max hp and lvl of entity killed
See merge request veloren/veloren!400
2019-08-03 20:57:06 +00:00
timokoesters
86e10c914c
Adjust xp gains
2019-08-03 22:27:48 +02:00
timokoesters
74b7613cd9
Get rid of unwraps
2019-08-03 22:08:19 +02:00
timokoesters
7365dbe9e6
Give xp depending on max hp and lvl of entity killed
2019-08-03 21:30:01 +02:00
Joshua Barretto
295674d95a
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
timokoesters
6b69b24185
Make ori more precise
2019-08-03 20:41:55 +02:00
Joshua Barretto
fe0097c085
Made nametag position change with scale
2019-08-03 19:40:20 +01:00
Joshua Barretto
5fc6ab2126
Better enemy attack rate
2019-08-03 19:40:20 +01:00
timokoesters
91b8b69186
Use slerp for ori
2019-08-03 20:33:31 +02:00
Joshua Barretto
c33892e8af
Made entity collisions z-dependent
2019-08-03 19:09:01 +01:00
Joshua Barretto
71bf09d3b7
Better orientation in the air
2019-08-03 18:30:48 +01:00
Joshua Barretto
e52250a193
Made orientation change with move_dir, added a small amount of knockback
2019-08-03 18:24:07 +01:00
Joshua Barretto
eaee0f263d
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
Joshua Barretto
5e3e87f9c5
Made enemies sometimes roll
2019-08-03 13:31:40 +01:00
Joshua Barretto
51fa4f3cfc
Merge branch 'animation-tweaks' into 'master'
...
animation and movement tweaks
See merge request veloren/veloren!389
2019-08-03 12:09:38 +00:00
Joshua Barretto
66a8ed58db
Merge branch 'timo-no-ckback' into 'master'
...
no-ckback
See merge request veloren/veloren!391
2019-08-03 12:09:23 +00:00
Joshua Barretto
cab898a91f
Made enemies actually attack
2019-08-03 13:01:54 +01:00
timokoesters
6f598681fb
Fix combat animations for non humanoids
2019-08-03 12:53:39 +01:00
timokoesters
3a43150bc5
Make hostile npcs back away when too close
2019-08-03 12:53:39 +01:00
Pfauenauge90
c919b68346
changed angle of attack, changed z offset on hit
2019-08-03 12:46:07 +01:00
timokoesters
e39324a9d2
Remove knockback
2019-08-03 12:46:07 +01:00
Joshua Barretto
4415393ec6
Merge branch 'zesterer/small-fixes' into 'master'
...
Added entity pushback
See merge request veloren/veloren!397
2019-08-03 11:33:56 +00:00
Joshua Barretto
3063546a58
Added entity pushback
2019-08-03 12:26:05 +01:00
Joshua Barretto
b90206bf28
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
Piotr Korgól
8f86f5c483
Allow normal enemies to spawn as humanoids
2019-08-03 12:35:16 +02:00
Joshua Barretto
62dea9ee7b
Merge branch 'zesterer/worldgen-npcs' into 'master'
...
NPC Spawning
See merge request veloren/veloren!393
2019-08-03 06:41:17 +00:00
Joshua Barretto
e6fe07dd3d
Shortened enemy sight distance
2019-08-02 21:35:03 +01:00
Joshua Barretto
6ba5cf3224
More interesting enemy spawning
2019-08-02 21:31:22 +01:00
Joshua Barretto
8aa7af781e
Fixed enemy combat
2019-08-02 20:52:46 +01:00
Joshua Barretto
23cfe50455
Better health accessors methods
2019-08-02 20:49:48 +01:00
Joshua Barretto
5e4f383952
Better enemy AI
2019-08-02 20:41:38 +01:00
Joshua Barretto
677c5781ba
Added bosses, improved secret object spawn rates
2019-08-02 20:10:52 +01:00
Joshua Barretto
6ff75dcf0b
Removed NPCs that are outside the VD
2019-08-02 20:10:52 +01:00
Joshua Barretto
b5d10bfb3e
Added worldgen npcs
2019-08-02 20:10:52 +01:00
Joshua Barretto
595f2bf1f1
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
timokoesters
55079c3d1e
Fix hostile npcs new target selection
2019-08-02 20:44:56 +02:00
Marcel
12170c08f0
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
Marcel Märtens
e4a9721588
fixed #211 - host specs-idvs on gitlab.com
2019-08-02 10:16:55 +02:00
jshipsey
13310ab9ca
improved animations and movement
2019-08-01 23:57:26 -04:00
Dominik Broński
a22e4b719c
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
Dominik Broński
f644b6ab89
Revert "Merge branch 'imbris/upgrade_specs' into 'master'"
...
This reverts merge request !375
2019-08-01 23:32:33 +00:00
Dominik Broński
f4fa0af3fa
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
Imbris
5f56657f6c
Upgrade specs to 0.15
2019-08-01 18:09:13 -04:00
Dominik Broński
dbf3ea6694
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
Monty Marz
a5926eb40a
0.3. login bg
2019-08-01 17:53:34 +00:00
Timo Koesters
b1ca4fa13d
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
Piotr Korgól
ec550620ad
Add a health bonus for level ups, fix pets
2019-08-01 18:56:08 +02:00
Timo Koesters
6f73d27431
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
Songtronix
52ffa02467
fmt
2019-08-01 17:07:42 +02:00
Joshua Barretto
9bc006dee1
Add a few extra items to the inventory by default
2019-08-01 09:13:34 +01:00
