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 |
|
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 |
|
Joshua Barretto
|
cb8e3b9805
|
Fixed absolute darkness
|
2019-08-01 09:12:00 +01:00 |
|
Joshua Barretto
|
2d0569c3d9
|
Better item throwing
|
2019-08-01 09:12:00 +01:00 |
|
Joshua Barretto
|
39fc1d6b71
|
Added entity pickup, changed item model
|
2019-08-01 09:12:00 +01:00 |
|
Joshua Barretto
|
331b6c8b3a
|
Altered Item structure
|
2019-08-01 09:12:00 +01:00 |
|
Joshua Barretto
|
995090d2d4
|
Added item drops
|
2019-08-01 09:12:00 +01:00 |
|
Joshua Barretto
|
b3cae2f3dd
|
Added better item manipulation
|
2019-08-01 09:09:26 +01:00 |
|
Joshua Barretto
|
fc49293874
|
Clickthrough on items
|
2019-08-01 09:09:26 +01:00 |
|
Pfauenauge90
|
37ee5b2802
|
fixed UI layering leading to unresponsive slots
|
2019-08-01 09:09:26 +01:00 |
|
Joshua Barretto
|
31f8794c39
|
Started work on inventory manipulation
|
2019-08-01 09:09:26 +01:00 |
|
Joshua Barretto
|
123a78552a
|
Fixed block-hopping on edges, added correct inventory slots
|
2019-08-01 09:09:26 +01:00 |
|
Joshua Barretto
|
5bb7998d5a
|
Added inventory sync messages and InventoryUpdate component
|
2019-08-01 09:09:26 +01:00 |
|
Joshua Barretto
|
a7fc872f1c
|
Added Default impl for Inventory
|
2019-08-01 09:08:59 +01:00 |
|
Joshua Barretto
|
fde6ec35cd
|
Fixed Inventory::remove method
|
2019-08-01 09:08:59 +01:00 |
|
Timo Koesters
|
e557fabdeb
|
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
|
040aa897c1
|
Fix needing all components to update physics at all
|
2019-07-31 20:10:52 +02:00 |
|
Joshua Barretto
|
a591ac7dd5
|
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
|
3f85f35084
|
Fix lockfile.
|
2019-07-31 11:45:23 +02:00 |
|
Acrimon
|
dadcf27098
|
Fixed missing import.
|
2019-07-31 11:41:29 +02:00 |
|
Acrimon
|
9fbf710cc9
|
Swapped some rarely use storages.
|
2019-07-31 11:41:29 +02:00 |
|
Acrimon
|
c2f8dbc2d7
|
Updated specs-idvs.
|
2019-07-31 11:41:29 +02:00 |
|
Acrimon
|
005a1b6640
|
Update specs-idvs
|
2019-07-31 11:41:29 +02:00 |
|
Acrimon
|
c75925c5a3
|
Updated specs-idvs
|
2019-07-31 11:41:29 +02:00 |
|
Acrimon
|
579651c862
|
Update lockfile.
|
2019-07-31 11:41:29 +02:00 |
|
Acrimon
|
8be62be980
|
Formatted code.
|
2019-07-31 11:40:58 +02:00 |
|
Acrimon
|
03253d3cc0
|
Switch everything to IDVStorage (No tuning yet.)
|
2019-07-31 11:40:58 +02:00 |
|
Joshua Barretto
|
35bf253081
|
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
|
0107cc96f5
|
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
|
a5b19935a2
|
Use named generator in worldgen.
|
2019-07-30 16:10:59 +02:00 |
|
timokoesters
|
b695a63e98
|
Send different physics components individually
|
2019-07-30 13:35:16 +02:00 |
|
timokoesters
|
16b445c828
|
Fix bugs with Last<T>
|
2019-07-30 10:49:41 +02:00 |
|
timokoesters
|
03a82030ec
|
Fix commands
|
2019-07-30 10:10:58 +02:00 |
|
timokoesters
|
c6034bf450
|
Use Last<C> to check if a physics component changed
|
2019-07-30 08:32:03 +02:00 |
|
Forest Anderson
|
fbb00601fb
|
Merge branch 'small-chat-fixes' into 'master'
Small chat fixes
See merge request veloren/veloren!379
|
2019-07-29 14:40:47 +00:00 |
|
Monty Marz
|
5cfc60da50
|
Small chat fixes
|
2019-07-29 14:40:46 +00:00 |
|
Joshua Barretto
|
6cad01324a
|
Merge branch 'imbris/tooltip' into 'master'
Tooltips
See merge request veloren/veloren!378
|
2019-07-29 14:06:13 +00:00 |
|