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 |
|
Marcel
|
bf52b09e86
|
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
|
035949b0f7
|
CI improvements
|
2019-10-08 08:13:40 +00:00 |
|
Forest Anderson
|
cbcf02a477
|
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
|
1d224e5274
|
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
|
7363224997
|
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
|
0beaf26192
|
fix: reduce amount of network related ghosts
|
2019-10-07 15:15:29 +02:00 |
|
Joshua Barretto
|
6006270c93
|
Merge branch 'zesterer/small-fixes' into 'master'
Minor Tweaks
See merge request veloren/veloren!560
|
2019-10-07 08:21:44 +00:00 |
|
Acrimon
|
567ce08c1b
|
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
|
6c8c512f60
|
Proper tree colour variation
|
2019-10-07 09:05:18 +01:00 |
|
Joshua Barretto
|
6839a8b0c6
|
Better grass colours, made flora more common
|
2019-10-07 08:49:02 +01:00 |
|
KyoZM
|
39b5f091fc
|
consume vector without calling the iterator
|
2019-10-07 01:49:56 -03:00 |
|
KyoZM
|
782d757c48
|
cargo format
|
2019-10-07 01:38:28 -03:00 |
|
KyoZM
|
34ff9e0e2c
|
removelights no longer deletes players with lanterns
|
2019-10-07 01:03:53 -03:00 |
|
KyoZM
|
aabce1274f
|
create /removelights command
|
2019-10-07 00:19:46 -03:00 |
|
Joshua Barretto
|
b1ec0dc822
|
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
|
7f3a0c3771
|
fix: orientation now supports z rotation
|
2019-10-06 22:03:29 +02:00 |
|
timokoesters
|
ffe63acfdd
|
feat(bow): arrow spawn height
|
2019-10-06 21:21:33 +02:00 |
|
Monty Marz
|
a2e165b783
|
Merge branch 'pfau/help-window' into 'master'
Help window, UI fixes, asset fixes
See merge request veloren/veloren!556
|
2019-10-06 19:19:09 +00:00 |
|
Monty Marz
|
39acda60f0
|
Help window, UI fixes, asset fixes
|
2019-10-06 19:19:08 +00:00 |
|
Monty Marz
|
58a8e2351a
|
Merge branch 'timo-msg' into 'master'
fix: error message for give_exp
See merge request veloren/veloren!557
|
2019-10-06 19:03:57 +00:00 |
|
timokoesters
|
da7a9c1970
|
fix: error message for give_exp
|
2019-10-06 20:52:26 +02:00 |
|
Joshua Barretto
|
2c03587a84
|
Merge branch 'timo-arrow-despawn' into 'master'
feat(bow): arrows despawn after some time
See merge request veloren/veloren!554
|
2019-10-06 17:48:27 +00:00 |
|
timokoesters
|
aad78d3a1f
|
feat(bow): arrows despawn after some time
|
2019-10-06 19:32:46 +02:00 |
|
Timo Koesters
|
745f84c1a4
|
Merge branch 'timo-logout' into 'master'
Fix bugs causing duplicate login/logout messages
See merge request veloren/veloren!553
|
2019-10-06 17:05:23 +00:00 |
|
timokoesters
|
7ac8869cd1
|
fix: selecting another character no longer shows a new login message
|
2019-10-06 18:26:51 +02:00 |
|