1705 Commits

Author SHA1 Message Date
Joshua Barretto
cde72d6c49 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
929cd5ee29 Made enemies actually attack 2019-08-03 13:01:54 +01:00
timokoesters
5288ae2fcf Fix combat animations for non humanoids 2019-08-03 12:53:39 +01:00
timokoesters
4e59bb19c8 Make hostile npcs back away when too close 2019-08-03 12:53:39 +01:00
Pfauenauge90
a7731c9b15 changed angle of attack, changed z offset on hit 2019-08-03 12:46:07 +01:00
timokoesters
d8f1e6b7dc Remove knockback 2019-08-03 12:46:07 +01:00
Joshua Barretto
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
Joshua Barretto
0a8985335e Added entity pushback 2019-08-03 12:26:05 +01:00
Joshua Barretto
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
Piotr Korgól
0c75429837 Allow normal enemies to spawn as humanoids 2019-08-03 12:35:16 +02:00
Joshua Barretto
9b8f55ed83 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
3d8453c0c3 Shortened enemy sight distance 2019-08-02 21:35:03 +01:00
Joshua Barretto
6066b40207 More interesting enemy spawning 2019-08-02 21:31:22 +01:00
Joshua Barretto
a952e13687 Fixed enemy combat 2019-08-02 20:52:46 +01:00
Joshua Barretto
b568c367c5 Better health accessors methods 2019-08-02 20:49:48 +01:00
Joshua Barretto
759649f228 Better enemy AI 2019-08-02 20:41:38 +01:00
Joshua Barretto
867978dd1d Added bosses, improved secret object spawn rates 2019-08-02 20:10:52 +01:00
Joshua Barretto
132ed85e00 Removed NPCs that are outside the VD 2019-08-02 20:10:52 +01:00
Joshua Barretto
b7a8dc3e54 Added worldgen npcs 2019-08-02 20:10:52 +01:00
Joshua Barretto
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
timokoesters
01915aa555 Fix hostile npcs new target selection 2019-08-02 20:44:56 +02:00
Marcel
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
Marcel Märtens
1f6ee55555 fixed #211 - host specs-idvs on gitlab.com 2019-08-02 10:16:55 +02:00
Dominik Broński
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
Dominik Broński
48a4377bf8 Revert "Merge branch 'imbris/upgrade_specs' into 'master'"
This reverts merge request !375
2019-08-01 23:32:33 +00:00
Dominik Broński
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
Imbris
bafea1884f Upgrade specs to 0.15 2019-08-01 18:09:13 -04:00
Dominik Broński
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
Monty Marz
e6196aa325 0.3. login bg 2019-08-01 17:53:34 +00:00
Timo Koesters
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
Piotr Korgól
597483e4e0 Add a health bonus for level ups, fix pets 2019-08-01 18:56:08 +02:00
Timo Koesters
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
Songtronix
60b8728bc8 fmt 2019-08-01 17:07:42 +02:00
Joshua Barretto
9d681eb028 Add a few extra items to the inventory by default 2019-08-01 09:13:34 +01:00
Joshua Barretto
e86e469b6d Fixed absolute darkness 2019-08-01 09:12:00 +01:00
Joshua Barretto
b625ffd8d3 Better item throwing 2019-08-01 09:12:00 +01:00
Joshua Barretto
ac16ee945f Added entity pickup, changed item model 2019-08-01 09:12:00 +01:00
Joshua Barretto
7a40346096 Altered Item structure 2019-08-01 09:12:00 +01:00
Joshua Barretto
fe751f7f4e Added item drops 2019-08-01 09:12:00 +01:00
Joshua Barretto
ae1eaabcaa Added better item manipulation 2019-08-01 09:09:26 +01:00
Joshua Barretto
75b83a39c7 Clickthrough on items 2019-08-01 09:09:26 +01:00
Pfauenauge90
91d7cdcd71 fixed UI layering leading to unresponsive slots 2019-08-01 09:09:26 +01:00
Joshua Barretto
757f96ea4a Started work on inventory manipulation 2019-08-01 09:09:26 +01:00
Joshua Barretto
13aaacad82 Fixed block-hopping on edges, added correct inventory slots 2019-08-01 09:09:26 +01:00
Joshua Barretto
5dea179846 Added inventory sync messages and InventoryUpdate component 2019-08-01 09:09:26 +01:00
Joshua Barretto
07eae02c32 Added Default impl for Inventory 2019-08-01 09:08:59 +01:00
Joshua Barretto
ce6ff71507 Fixed Inventory::remove method 2019-08-01 09:08:59 +01:00
Timo Koesters
41757a66f9 Merge branch 'phys-fix' into 'master'
Fix needing all components to update physics at all

See merge request veloren/veloren!384
2019-08-01 05:57:13 +00:00
timokoesters
98c00ad9bb Fix needing all components to update physics at all 2019-07-31 20:10:52 +02:00
Joshua Barretto
50853f974c Merge branch 'xacrimon/revised-specs-storage' into 'master'
Rework specs storage types

See merge request veloren/veloren!382
2019-07-31 09:57:07 +00:00