fe4a61354a
change(menu): display version with hash and date
2019-10-18 15:51:07 +02:00
5b716515bb
change(githash): provide date and hash
2019-10-18 15:32:55 +02:00
39656e92be
Merge branch '276-hotloading-armor' into 'master'
...
Resolve "Enable hotloading of different offsets for armors/weapons"
Closes #276
See merge request veloren/veloren!545
2019-10-18 00:29:09 +00:00
c41627d75f
Removed the recolor property from the armor ron files.
2019-10-17 19:45:29 -04:00
687473c5e6
Merge branch 'pfau/assets' into 'master'
...
Initial staff implementation
See merge request veloren/veloren!602
2019-10-17 20:59:37 +00:00
fdfab6a807
refactor: create_projectile doesn't take a light
...
It returns a builder so the caller can just do it
2019-10-17 20:59:36 +00:00
1f39659a54
Merge branch 'zesterer/small-fixes' into 'master'
...
Performance Improvements
See merge request veloren/veloren!597
2019-10-17 20:56:37 +00:00
dcf8655202
Fixed srgb normal bug
2019-10-17 17:35:17 +01:00
04c64dc122
Better (and faster) water shaders
2019-10-17 17:11:55 +01:00
57e7925418
Merge branch 'songtronix/include-license' into 'master'
...
Include LICENSE file in artifacts
Closes #343
See merge request veloren/veloren!601
2019-10-17 14:22:41 +00:00
1a47cadc24
fix(CI): remove unneeded copy
2019-10-17 15:35:14 +02:00
cde310fa5a
change(CI): include LICENSE in artifacts
2019-10-17 15:06:20 +02:00
013afafba8
Made rolling less violent when changing directions
2019-10-17 12:21:22 +01:00
b090a1b5cd
Merge branch 'shandley/title-music-single-play' into 'master'
...
Title music fix
Closes #342
See merge request veloren/veloren!600
2019-10-17 07:58:58 +00:00
ab59d1f262
Title music fix ( fixes #342 )
...
Fix issue with title music restarting and playing in multiple channels
when the player chooses a play state but then returns to the main menu.
2019-10-17 16:14:16 +09:00
3279a278b7
Move computations to terrain fragment shaders
2019-10-16 15:05:45 +01:00
c01e19fc05
Don't render water that isn't there, improved chunk render order
2019-10-16 12:40:18 +01:00
cc6ad7d6e2
Merge branch 'sharp/erosion' into 'master'
...
Add erosion, rivers, and lakes.
See merge request veloren/veloren!593
2019-10-16 11:39:41 +00:00
8ae2692b6e
Allow canceling chunk generation.
...
Currently we only do this when no players are in range of the chunk. We
also send the first client who posted the chunk a message indicating
that it's canceled, the hope being that this will be a performance win
in single player mode since you don't have to wait three seconds to
realize that the server won't generate the chunk for you.
We now check an atomic flag for every column sample in a chunk. We
could probably do this less frequently, but since it's a relaxed load it
has essentially no performance impact on Intel architectures.
2019-10-16 11:39:41 +00:00
3a4c307d38
Code cleanup, formatting changes, and fixed the cloth belt's offset.
2019-10-16 00:42:57 -04:00
6cd78dcb4c
Merge branch 'zesterer/small-fixes' into 'master'
...
Small fixes: Faster meshing, smoother movement, better interpolation, and a return to space for climbing
See merge request veloren/veloren!596
2019-10-14 12:32:42 +00:00
707b79f2c8
Smoother movement, Space for climbing
2019-10-14 11:22:48 +01:00
4bbc340f52
Faster meshing, better dusk
2019-10-14 10:48:40 +01:00
d719c69fca
Merge branch 'heydabop/bug/324-modulo-panic' into 'master'
...
fixes #324 - changes possible modulo range from 0-29 to 1-29 to prevent mod by 0
Closes #324
See merge request veloren/veloren!595
2019-10-14 03:14:29 +00:00
522ab2cd98
fixes #324 - changes possible modulo range from 0-29 to 1-29 to prevent mod by 0
2019-10-13 21:39:37 -05:00
8d272c8234
Merge branch 'kyozm/proper-lack-of-permission-messages' into 'master'
...
proper message on permission check failure for commands
Closes #303
See merge request veloren/veloren!592
2019-10-13 08:39:30 +00:00
5be28178bd
proper message on permission check failure for commands
2019-10-12 18:24:44 -03:00
36265e5710
Merge branch 'slipped/shadowfix' into 'master'
...
shadow bug fix
See merge request veloren/veloren!591
2019-10-12 18:51:43 +00:00
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
