1688 Commits

Author SHA1 Message Date
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
Acrimon
5bf068ab63 Fix lockfile. 2019-07-31 11:45:23 +02:00
Acrimon
f958e31278 Fixed missing import. 2019-07-31 11:41:29 +02:00
Acrimon
5fe8eaecec Swapped some rarely use storages. 2019-07-31 11:41:29 +02:00
Acrimon
3fbd8f5444 Updated specs-idvs. 2019-07-31 11:41:29 +02:00
Acrimon
ec706c61d4 Update specs-idvs 2019-07-31 11:41:29 +02:00
Acrimon
c35c9bd062 Updated specs-idvs 2019-07-31 11:41:29 +02:00
Acrimon
9fbdafcd3a Update lockfile. 2019-07-31 11:41:29 +02:00
Acrimon
15445cf471 Formatted code. 2019-07-31 11:40:58 +02:00
Acrimon
1f7ca82d8e Switch everything to IDVStorage (No tuning yet.) 2019-07-31 11:40:58 +02:00
Joshua Barretto
ea675b1633 Merge branch 'timo-dont-send-nothing-changed' into 'master'
Don't send empty physics updates and fix commands

See merge request veloren/veloren!380
2019-07-31 09:15:05 +00:00
Forest Anderson
2c5219a1f3 Merge branch 'xacrimon/named-rng-wgen' into 'master'
Use named generator in worldgen

See merge request veloren/veloren!381
2019-07-30 21:40:29 +00:00
Acrimon
eb4d7556a0 Use named generator in worldgen. 2019-07-30 16:10:59 +02:00
timokoesters
6d47e1fd43 Send different physics components individually 2019-07-30 13:35:16 +02:00
timokoesters
f131211b5e Fix bugs with Last<T> 2019-07-30 10:49:41 +02:00
timokoesters
8676675b80 Fix commands 2019-07-30 10:10:58 +02:00
timokoesters
05980def09 Use Last<C> to check if a physics component changed 2019-07-30 08:32:03 +02:00
Forest Anderson
e0b7483aa8 Merge branch 'small-chat-fixes' into 'master'
Small chat fixes

See merge request veloren/veloren!379
2019-07-29 14:40:47 +00:00