deadd665c8
tweaks animations to better align with true positions
2019-10-12 14:19:55 -04:00
8f7b4afafd
Manifest file is now used to load armor.
...
Redid how pants renders so they can use underlying skin model/coloring,
same as chest armor.
Redid how belts render so they can use the underly skin color,
same as shoulder or foot.
Converted a manifest variable name to snake case.
2019-10-12 08:31:42 -04:00
a5db28113f
Redid the mainfest files to remove race/gender.
...
Now based on armor slot enum.
Added color to the manifest files.
Manifest files aren't yet being used, but will load.
2019-10-12 08:31:42 -04:00
a2b2d0d493
Created Spec structs for each armor type.
...
Moved mesh creating code for each armor type
into matching struct.
Each Spec struct now loads the matching manifest file.
Manifest file is NOT used yet.
Warning thrown due to adding new parameter to the mesh function
for use reading the manifest file.
2019-10-12 08:31:42 -04:00
da54cf76bc
Armor names now end with left/right.
...
Armor names no longer include their armor part.
This should be inferred from their folder.
2019-10-12 08:31:42 -04:00
be53492e69
Added manifest files per armor type using the existing vox names.
2019-10-12 08:31:42 -04:00
f29b672640
Merge branch 'imbris/projectile-exp' into 'master'
...
Make projectiles give experience
See merge request veloren/veloren!588
2019-10-12 00:50:50 +00:00
028d010624
Make bows give experience via giving projectiles an owner field
2019-10-11 19:33:01 -04:00
2f9d8ee2e6
Add new debug item
2019-10-11 19:32:46 -04:00
0066a546a5
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
09bb908072
Make all CoreDevelopers and Admins server admins for now till we have a working auth system
2019-10-11 15:13:02 +02:00
691a894c7b
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
30c9fcc911
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
0afa0b394f
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
4b80f88085
Bind random port for ServerMetrics
2019-10-11 09:06:34 +00:00
4c82610504
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
5390b1b36c
format code
2019-10-10 21:00:19 -03:00
83a4454be5
refactor code to be smaller and clearer
2019-10-10 20:53:13 -03:00
6b42b1c762
remove unecessary comments
2019-10-10 20:53:13 -03:00
1998ed2fdd
load structures from ron files / transfer static structure lists to ron files
2019-10-10 20:53:13 -03:00
a70f3cfd68
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
2651cb9179
Adjust far plane and bring near plane back in a bit
2019-10-10 22:24:24 +00:00
cd11b48875
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
7d2b3bca0f
rename all caches to prevent busting
2019-10-10 16:53:26 -04:00
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
212c3a1720
Fixed target
2019-10-10 20:47:40 +00:00
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
20c520a044
Change the version number to 0.4
2019-10-10 15:48:01 +02:00
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
bf01069f44
Balanced chest spawning
2019-10-10 10:11:46 +01:00
b3697e1ea7
Increased near plane value
2019-10-09 22:23:09 -04:00
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
32f296d581
Don't copy assets
2019-10-09 19:18:59 -04:00
76a47bcc1f
Merge branch 'angelonfira/verify-assets' into 'master'
...
md5sum assets
See merge request veloren/veloren!571
2019-10-09 22:42:39 +00:00
e7b97e0c66
md5sum assets
2019-10-09 22:42:39 +00:00
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
d82ec6715a
Item icons, chests and more
2019-10-09 19:28:05 +00:00
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
be5d79b123
fix: all enemies start with lvl 1 hp
2019-10-09 17:09:25 +02:00
0e7a922d78
Merge branch 'timo-tweeks' into 'master'
...
Timo tweeks
See merge request veloren/veloren!569
2019-10-08 20:27:28 +00:00
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
095e66fc01
fix: tweek hp
2019-10-08 20:36:46 +02:00
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
8fa4ffdfd9
Angelonfira/ci hotfixes arifacts
2019-10-08 17:03:00 +00:00
051a964798
fix: server side fall damage
...
This avoids flickering health
2019-10-08 18:55:30 +02:00
b20cf6c62b
fix: set minimum speed for fall damage and balance it
2019-10-08 18:55:30 +02:00
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
4e87f125a2
fix: fix level and health distribution
2019-10-08 18:12:08 +02:00
05cecf5ee2
Merge branch 'zesterer/small-fixes' into 'master'
...
Small Fixes
See merge request veloren/veloren!566
2019-10-08 12:34:43 +00:00
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
