Imbris
|
3a245f1fba
|
Make bows give experience via giving projectiles an owner field
|
2019-10-11 19:33:01 -04:00 |
|
Imbris
|
dde81c38b2
|
Add new debug item
|
2019-10-11 19:32:46 -04:00 |
|
Marcel
|
19ac3ba623
|
Merge branch 'moreadmins' into 'master'
Make all CoreDevelopers and Admins server admins for now till we have a working auth system
See merge request veloren/veloren!587
|
2019-10-11 14:10:03 +00:00 |
|
Marcel Märtens
|
522f24fa1d
|
Make all CoreDevelopers and Admins server admins for now till we have a working auth system
|
2019-10-11 15:13:02 +02:00 |
|
Marcel
|
8ccca5ad37
|
Merge branch 'fix-metrics' into 'master'
Fix bug that metrics took a random port always introduced in !584
See merge request veloren/veloren!586
|
2019-10-11 12:50:18 +00:00 |
|
Marcel Märtens
|
bf0492d697
|
Fix bug that metrics took a random port always introduced in !584
also removed the duplicate port from the server creation process, using the server settings struct now
|
2019-10-11 14:19:55 +02:00 |
|
Acrimon
|
916fa1336d
|
Merge branch 'wusyong/metrics_port' into 'master'
Bind random port for ServerMetrics
Closes #321
See merge request veloren/veloren!584
|
2019-10-11 09:06:34 +00:00 |
|
Wu Yu Wei
|
8e13827888
|
Bind random port for ServerMetrics
|
2019-10-11 09:06:34 +00:00 |
|
Acrimon
|
0c15fc9a59
|
Merge branch 'kyozm/load-structures-from-ron' into 'master'
Load structures from ron files
Closes #287
See merge request veloren/veloren!570
|
2019-10-11 05:11:45 +00:00 |
|
KyoZM
|
7f24391187
|
format code
|
2019-10-10 21:00:19 -03:00 |
|
KyoZM
|
dbca8e3b09
|
refactor code to be smaller and clearer
|
2019-10-10 20:53:13 -03:00 |
|
KyoZM
|
e8d8179899
|
remove unecessary comments
|
2019-10-10 20:53:13 -03:00 |
|
KyoZM
|
703ea57f6a
|
load structures from ron files / transfer static structure lists to ron files
|
2019-10-10 20:53:13 -03:00 |
|
Acrimon
|
b65bbeba76
|
Merge branch 'overclockx64/near-plane-increase' into 'master'
Increased near plane value, fixing character flickering on macOS
See merge request veloren/veloren!575
|
2019-10-10 22:45:06 +00:00 |
|
Imbris
|
f6bf524497
|
Adjust far plane and bring near plane back in a bit
|
2019-10-10 22:24:24 +00:00 |
|
Forest Anderson
|
6d5f13b323
|
Merge branch 'angelonfira/rename-ci-caches' into 'master'
Angelonfira/rename ci caches
See merge request veloren/veloren!581
|
2019-10-10 20:56:26 +00:00 |
|
Forest
|
5326fb7d54
|
rename all caches to prevent busting
|
2019-10-10 16:53:26 -04:00 |
|
Forest Anderson
|
86cea290e8
|
Merge branch 'angelonfira/fix-git-checkout-override' into 'master'
Fixed target
See merge request veloren/veloren!580
|
2019-10-10 20:47:40 +00:00 |
|
Forest Anderson
|
d20f1dd304
|
Fixed target
|
2019-10-10 20:47:40 +00:00 |
|
Marcel
|
791ca2ddd3
|
Merge branch 'xMAC94x/release-numbers' into 'master'
Change the version number to 0.4
See merge request veloren/veloren!579
|
2019-10-10 14:05:18 +00:00 |
|
Marcel Märtens
|
5e0d7081ba
|
Change the version number to 0.4
|
2019-10-10 15:48:01 +02:00 |
|
Joshua Barretto
|
ad2fa414e3
|
Merge branch 'zesterer/small-fixes' into 'master'
Balanced chest spawning
See merge request veloren/veloren!576
|
2019-10-10 11:37:58 +00:00 |
|
Joshua Barretto
|
0d1542100b
|
Balanced chest spawning
|
2019-10-10 10:11:46 +01:00 |
|
Luc Fauvel
|
7b2c1271fb
|
Increased near plane value
|
2019-10-09 22:23:09 -04:00 |
|
Forest Anderson
|
11d23d5157
|
Merge branch 'angelonfira/dont-copy-assets' into 'master'
Don't copy assets
See merge request veloren/veloren!574
|
2019-10-10 00:39:15 +00:00 |
|
Forest Anderson
|
07e8bf841e
|
Don't copy assets
|
2019-10-09 19:18:59 -04:00 |
|
Forest Anderson
|
318e83cb83
|
Merge branch 'angelonfira/verify-assets' into 'master'
md5sum assets
See merge request veloren/veloren!571
|
2019-10-09 22:42:39 +00:00 |
|
Forest Anderson
|
87b4ceccb4
|
md5sum assets
|
2019-10-09 22:42:39 +00:00 |
|
Monty Marz
|
e40ffa4b02
|
Merge branch 'imbris/item-images' into 'master'
Item icons, chests and more
See merge request veloren/veloren!573
|
2019-10-09 19:28:05 +00:00 |
|
Monty Marz
|
42a3ebeb21
|
Item icons, chests and more
|
2019-10-09 19:28:05 +00:00 |
|
Timo Koesters
|
545c94152f
|
Merge branch 'timo-tweeks' into 'master'
fix: all enemies start with lvl 1 hp
See merge request veloren/veloren!572
|
2019-10-09 15:54:25 +00:00 |
|
timokoesters
|
bd085cbe9f
|
fix: all enemies start with lvl 1 hp
|
2019-10-09 17:09:25 +02:00 |
|
Marcel
|
171ffd2bd6
|
Merge branch 'timo-tweeks' into 'master'
Timo tweeks
See merge request veloren/veloren!569
|
2019-10-08 20:27:28 +00:00 |
|
timokoesters
|
54d71848d2
|
fix: blocking now ends in wielded
This makes blocking more viable because while blocking you can wait for
the enemy to attack and then quickly exit the block and attack yourself.
|
2019-10-08 21:19:48 +02:00 |
|
timokoesters
|
e33af5e29a
|
fix: tweek hp
|
2019-10-08 20:36:46 +02:00 |
|
Forest Anderson
|
aca945250d
|
Merge branch 'angelonfira/ci-hotfixes-arifacts' into 'master'
Angelonfira/ci hotfixes arifacts
See merge request veloren/veloren!568
|
2019-10-08 17:03:00 +00:00 |
|
Forest Anderson
|
f57afdd509
|
Angelonfira/ci hotfixes arifacts
|
2019-10-08 17:03:00 +00:00 |
|
timokoesters
|
8680648ac6
|
fix: server side fall damage
This avoids flickering health
|
2019-10-08 18:55:30 +02:00 |
|
timokoesters
|
7d0efbcfd0
|
fix: set minimum speed for fall damage and balance it
|
2019-10-08 18:55:30 +02:00 |
|
timokoesters
|
462bb50879
|
fix: spawnpoint nearer to the floor
We can change this back when we have a proper spawn location system or
random seeds.
|
2019-10-08 18:55:29 +02:00 |
|
timokoesters
|
ce3921c345
|
fix: fix level and health distribution
|
2019-10-08 18:12:08 +02:00 |
|
Joshua Barretto
|
c48dc1bbe5
|
Merge branch 'zesterer/small-fixes' into 'master'
Small Fixes
See merge request veloren/veloren!566
|
2019-10-08 12:34:43 +00:00 |
|
Acrimon
|
67842705ed
|
Merge branch 'ci-artifact-placing' into 'master'
Fixed ci artifact placement.
See merge request veloren/veloren!567
|
2019-10-08 12:00:14 +00:00 |
|
Acrimon
|
0830e01389
|
Fixed ci artifact placement.
|
2019-10-08 14:39:52 +02:00 |
|
Joshua Barretto
|
9d41ce8d39
|
More opaque water surface
|
2019-10-08 12:21:05 +01:00 |
|
Joshua Barretto
|
c48979fc8f
|
Fixed block snapping ground clip
|
2019-10-08 12:21:05 +01:00 |
|
Acrimon
|
3367715eaf
|
Fixed a typo on the ci config. Fixes master pipelines.
|
2019-10-08 12:46:40 +02:00 |
|
Acrimon
|
b55b7d73af
|
Merge branch 'fix-pipeline' into 'master'
Fixed a typo on the ci config. Fixes master pipelines.
See merge request veloren/veloren!565
|
2019-10-08 10:15:54 +00:00 |
|
Acrimon
|
44a455c2c2
|
Merge branch 'update-docker-image222' into 'master'
Update dockerimage.
See merge request veloren/veloren!564
|
2019-10-08 09:04:17 +00:00 |
|
Acrimon
|
04c5747583
|
Update dockerimage.
|
2019-10-08 11:14:46 +02:00 |
|