bcbec3f9d0
Move computations to terrain fragment shaders
2019-10-16 15:05:45 +01:00
75842895c5
Don't render water that isn't there, improved chunk render order
2019-10-16 12:40:18 +01:00
7c0fd6217d
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
663d535bd9
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
584e2b45c7
Code cleanup, formatting changes, and fixed the cloth belt's offset.
2019-10-16 00:42:57 -04:00
08c0ed836c
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
75c021f141
Smoother movement, Space for climbing
2019-10-14 11:22:48 +01:00
8235876a41
Faster meshing, better dusk
2019-10-14 10:48:40 +01:00
8b6e97eed9
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
b3254a1d1c
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
d3397a2ef7
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
a4f67d9141
proper message on permission check failure for commands
2019-10-12 18:24:44 -03:00
99fb1ceef6
Merge branch 'slipped/shadowfix' into 'master'
...
shadow bug fix
See merge request veloren/veloren!591
2019-10-12 18:51:43 +00:00
8690bf31b8
tweaks animations to better align with true positions
2019-10-12 14:19:55 -04:00
4f46f4b942
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
03adbc4340
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
aaffb958a7
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
8a4aedda78
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
7089039ede
Added manifest files per armor type using the existing vox names.
2019-10-12 08:31:42 -04:00
5e5b569a84
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
3a245f1fba
Make bows give experience via giving projectiles an owner field
2019-10-11 19:33:01 -04:00
dde81c38b2
Add new debug item
2019-10-11 19:32:46 -04:00
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
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
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
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
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
8e13827888
Bind random port for ServerMetrics
2019-10-11 09:06:34 +00:00
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
7f24391187
format code
2019-10-10 21:00:19 -03:00
dbca8e3b09
refactor code to be smaller and clearer
2019-10-10 20:53:13 -03:00
e8d8179899
remove unecessary comments
2019-10-10 20:53:13 -03:00
703ea57f6a
load structures from ron files / transfer static structure lists to ron files
2019-10-10 20:53:13 -03:00
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
f6bf524497
Adjust far plane and bring near plane back in a bit
2019-10-10 22:24:24 +00:00
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
5326fb7d54
rename all caches to prevent busting
2019-10-10 16:53:26 -04:00
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
d20f1dd304
Fixed target
2019-10-10 20:47:40 +00:00
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
5e0d7081ba
Change the version number to 0.4
2019-10-10 15:48:01 +02:00
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
0d1542100b
Balanced chest spawning
2019-10-10 10:11:46 +01:00
7b2c1271fb
Increased near plane value
2019-10-09 22:23:09 -04:00
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
07e8bf841e
Don't copy assets
2019-10-09 19:18:59 -04:00
318e83cb83
Merge branch 'angelonfira/verify-assets' into 'master'
...
md5sum assets
See merge request veloren/veloren!571
2019-10-09 22:42:39 +00:00
87b4ceccb4
md5sum assets
2019-10-09 22:42:39 +00:00
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
42a3ebeb21
Item icons, chests and more
2019-10-09 19:28:05 +00:00
