Forest Anderson
|
dfcda63880
|
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
|
212c3a1720
|
Fixed target
|
2019-10-10 20:47:40 +00:00 |
|
Marcel
|
ee5142c6d1
|
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
|
20c520a044
|
Change the version number to 0.4
|
2019-10-10 15:48:01 +02:00 |
|
Joshua Barretto
|
eac90af8af
|
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
|
bf01069f44
|
Balanced chest spawning
|
2019-10-10 10:11:46 +01:00 |
|
Luc Fauvel
|
b3697e1ea7
|
Increased near plane value
|
2019-10-09 22:23:09 -04:00 |
|
Forest Anderson
|
11a90f7ef1
|
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
|
32f296d581
|
Don't copy assets
|
2019-10-09 19:18:59 -04:00 |
|
Forest Anderson
|
76a47bcc1f
|
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
|
e7b97e0c66
|
md5sum assets
|
2019-10-09 22:42:39 +00:00 |
|
Monty Marz
|
4742c4bffb
|
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
|
d82ec6715a
|
Item icons, chests and more
|
2019-10-09 19:28:05 +00:00 |
|
Timo Koesters
|
c0732d7787
|
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
|
be5d79b123
|
fix: all enemies start with lvl 1 hp
|
2019-10-09 17:09:25 +02:00 |
|
Marcel
|
0e7a922d78
|
Merge branch 'timo-tweeks' into 'master'
Timo tweeks
See merge request veloren/veloren!569
|
2019-10-08 20:27:28 +00:00 |
|
timokoesters
|
45f756343d
|
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
|
095e66fc01
|
fix: tweek hp
|
2019-10-08 20:36:46 +02:00 |
|
Forest Anderson
|
ea055d4ed9
|
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
|
8fa4ffdfd9
|
Angelonfira/ci hotfixes arifacts
|
2019-10-08 17:03:00 +00:00 |
|
timokoesters
|
051a964798
|
fix: server side fall damage
This avoids flickering health
|
2019-10-08 18:55:30 +02:00 |
|
timokoesters
|
b20cf6c62b
|
fix: set minimum speed for fall damage and balance it
|
2019-10-08 18:55:30 +02:00 |
|
timokoesters
|
f76f74b411
|
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
|
4e87f125a2
|
fix: fix level and health distribution
|
2019-10-08 18:12:08 +02:00 |
|
Joshua Barretto
|
05cecf5ee2
|
Merge branch 'zesterer/small-fixes' into 'master'
Small Fixes
See merge request veloren/veloren!566
|
2019-10-08 12:34:43 +00:00 |
|
Acrimon
|
a2651dc692
|
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
|
2835caf778
|
Fixed ci artifact placement.
|
2019-10-08 14:39:52 +02:00 |
|
Joshua Barretto
|
889fd678c6
|
More opaque water surface
|
2019-10-08 12:21:05 +01:00 |
|
Joshua Barretto
|
2171e77fe5
|
Fixed block snapping ground clip
|
2019-10-08 12:21:05 +01:00 |
|
Acrimon
|
4af15bcba2
|
Fixed a typo on the ci config. Fixes master pipelines.
|
2019-10-08 12:46:40 +02:00 |
|
Acrimon
|
9bc2a99557
|
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
|
61b2b87eba
|
Merge branch 'update-docker-image222' into 'master'
Update dockerimage.
See merge request veloren/veloren!564
|
2019-10-08 09:04:17 +00:00 |
|
Acrimon
|
0d01480b7a
|
Update dockerimage.
|
2019-10-08 11:14:46 +02:00 |
|
Marcel
|
576d39aa71
|
Merge branch 'xacrimon/fix-ci-this-retarded' into 'master'
CI improvements
Closes #274
See merge request veloren/veloren!552
|
2019-10-08 08:13:40 +00:00 |
|
Acrimon
|
4f52a88c27
|
CI improvements
|
2019-10-08 08:13:40 +00:00 |
|
Forest Anderson
|
f95561f9df
|
Merge branch 'wusyong/fix_ipv6' into 'master'
Fix singleplayer not working if IPv6 is not available
Closes #281
See merge request veloren/veloren!561
|
2019-10-07 15:35:20 +00:00 |
|
Wu Yu Wei
|
75df4600bd
|
Switch portpicker dependemcy to git
A pull request to fix has been created on original repository. But
since 0.4 is coming out pretty soon, let's swithc to this fork
temporary.
|
2019-10-07 15:35:20 +00:00 |
|
Marcel
|
97441cef39
|
Merge branch 'songtronix/partially-fix-ghosting' into 'master'
reduce amount of network related ghosts
See merge request veloren/veloren!562
|
2019-10-07 14:03:49 +00:00 |
|
Songtronix
|
03f0024607
|
fix: reduce amount of network related ghosts
|
2019-10-07 15:15:29 +02:00 |
|
Joshua Barretto
|
6e59571637
|
Merge branch 'zesterer/small-fixes' into 'master'
Minor Tweaks
See merge request veloren/veloren!560
|
2019-10-07 08:21:44 +00:00 |
|
Acrimon
|
8cc8caf4d4
|
Merge branch 'kyozm/removelights' into 'master'
create /removelights command
Closes #270
See merge request veloren/veloren!559
|
2019-10-07 08:05:51 +00:00 |
|
Joshua Barretto
|
087bfffc8a
|
Proper tree colour variation
|
2019-10-07 09:05:18 +01:00 |
|
Joshua Barretto
|
6fc6864e7c
|
Better grass colours, made flora more common
|
2019-10-07 08:49:02 +01:00 |
|
KyoZM
|
9ac089ae26
|
consume vector without calling the iterator
|
2019-10-07 01:49:56 -03:00 |
|
KyoZM
|
5abe88ecee
|
cargo format
|
2019-10-07 01:38:28 -03:00 |
|
KyoZM
|
064f33666a
|
removelights no longer deletes players with lanterns
|
2019-10-07 01:03:53 -03:00 |
|
KyoZM
|
ea82115656
|
create /removelights command
|
2019-10-07 00:19:46 -03:00 |
|
Joshua Barretto
|
1a9408c397
|
Merge branch 'timo-arrowheight' into 'master'
timo arrow spawn height
See merge request veloren/veloren!558
|
2019-10-06 20:19:01 +00:00 |
|
timokoesters
|
25cc1f0103
|
fix: orientation now supports z rotation
|
2019-10-06 22:03:29 +02:00 |
|
timokoesters
|
3078591060
|
feat(bow): arrow spawn height
|
2019-10-06 21:21:33 +02:00 |
|