timokoesters
0f5bd4f9de
Remove animation warnings
2019-08-26 13:12:36 +02:00
timokoesters
a7a8037a43
Fix characterstate in movement.rs, not phys.rs
2019-08-26 13:12:35 +02:00
timokoesters
4773950ca0
Reset controller after each tick
2019-08-26 13:12:35 +02:00
timokoesters
36c88e0b91
Allow non player entites to be removed again
2019-08-26 13:12:35 +02:00
timokoesters
139628257a
Reset controller after each tick
2019-08-26 13:12:34 +02:00
timokoesters
019ce11d5d
Move from state components to single CharaterState struct
...
This makes split animations easy and improves overall code quality
2019-08-26 13:12:34 +02:00
Joshua Barretto
1bccf3361d
Merge branch 'sharp/worldgen_tweaks' into 'master'
...
Fixes to worldgen and adding a debug command.
See merge request veloren/veloren!462
2019-08-26 10:27:25 +00:00
Joshua Yanovski
608685ef36
Fixes to worldgen and adding a debug command.
...
Humidity and temperature are now indexed to uniform altitude *over land
chunks* (and water chunks adjacent to land) rather than over the whole
range of altitude. This is necessary in order to satisfy the uniformity
conditions of the formula for weighted sum CDF.
Additionally, fixes the computation of whether a tree should be
generated or not. Previously, it was using a source of randomness
scaled to use much less than the full 0-1 range; this has been resolved.
This makes for much nicer and more gradual transitions between densities
and reduces the amount of completely barren landscapes, while also
making forests larger.
Finally, this commit adds a server command, debug_column, which returns
some useful debug information about a column given an x and y
coordinate. This is useful for debugging worldgen.
2019-08-26 11:52:25 +02:00
Joshua Barretto
7da4d6c9c5
Merge branch 'sharp/temperature_free_chaos' into 'master'
...
Chaos doesn't depend on temperature anymore.
See merge request veloren/veloren!461
2019-08-25 17:10:15 +00:00
Joshua Yanovski
6cb33ba004
Fix clean code lints.
2019-08-25 18:17:51 +02:00
Joshua Yanovski
5dfbf86d87
Chaos doesn't depend on temperature anymore.
...
Also fix some things to use a consistent coordinate system and bump up
tree density and variation around tree density in hopes of creating more
aesthetically pleasing jungles. However, this does change worldgen a
bit, so please make sure you look through it before merging.
2019-08-25 17:49:33 +02:00
Joshua Barretto
dee742bf66
Merge branch 'sharp/humidity_ignores_ocean' into 'master'
...
Make humidity ignore ocean chunks.
See merge request veloren/veloren!460
2019-08-24 19:47:22 +00:00
jshipsey
d926965e7c
fmt
2019-08-24 15:32:07 -04:00
Joshua Yanovski
798e8d7e8f
Make humidity ignore ocean chunks.
2019-08-24 21:13:32 +02:00
Joshua Barretto
8ec64ff148
Merge branch 'sharp/jungle' into 'master'
...
Sharp/jungle
See merge request veloren/veloren!447
2019-08-22 23:40:46 +00:00
Joshua Barretto
65a7c725a8
Merge branch 'sharp/jungle' of gitlab.com:veloren/veloren into sharp/jungle
2019-08-23 00:33:33 +01:00
Joshua Barretto
7ffe8979a2
Better snow noise
2019-08-23 00:31:27 +01:00
Joshua Yanovski
27ea09d24e
Remove out of date comment.
2019-08-23 01:16:15 +02:00
Joshua Yanovski
ba9c5533dc
Merge remote-tracking branch 'origin/sharp/jungle' into sharp/jungle
2019-08-23 01:10:48 +02:00
Joshua Barretto
802bb601f3
Merge branch 'sharp/jungle' of gitlab.com:veloren/veloren into sharp/jungle
2019-08-23 00:09:45 +01:00
Joshua Barretto
1de8132ffb
More interesting terrain chaos
2019-08-23 00:09:14 +01:00
Joshua Yanovski
000a200b65
Fine, removing box syntax.
2019-08-23 01:08:47 +02:00
Joshua Yanovski
4e0966fa85
Addressing concerns, for real.
2019-08-23 00:57:42 +02:00
Joshua Yanovski
f4b13967e4
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/jungle
2019-08-22 23:48:22 +02:00
Joshua Yanovski
2d88cd8c8b
Addressing PR issues.
2019-08-22 23:48:13 +02:00
Joshua Barretto
0e001e263b
Better snow, colours, more chaos
2019-08-22 22:25:17 +01:00
Joshua Barretto
9e6862dbbb
Merge branch 'vechro/simpler-debug' into 'master'
...
Simplify debug info
See merge request veloren/veloren!456
2019-08-22 19:35:14 +00:00
Vechro
1b4187fd30
Small changes to velocity
2019-08-22 22:26:35 +03:00
Joshua Yanovski
fbdf7dc235
Closest attempt.
2019-08-22 21:10:04 +02:00
Joshua Yanovski
df2eb30898
Total chaos.
2019-08-22 21:03:42 +02:00
Vechro
9e08f085fd
Simplify debug info
2019-08-22 21:53:46 +03:00
Joshua Barretto
c1eb64c438
Merge branch 'cauthmann/git-lfs-checks' into 'master'
...
Build script: check if git-lfs works
See merge request veloren/veloren!455
2019-08-22 18:18:51 +00:00
Christian Authmann
77b8744649
Build script: check if git-lfs works
2019-08-22 19:18:47 +02:00
Joshua Yanovski
9973c72692
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/jungle
2019-08-22 17:47:10 +02:00
Joshua Yanovski
111eac3eda
Fix density computation.
2019-08-22 17:45:47 +02:00
Joshua Barretto
85b3b849bb
Merge branch 'zesterer/instancing' into 'master'
...
Instancing (block sprites)
See merge request veloren/veloren!450
2019-08-22 11:10:57 +00:00
Joshua Yanovski
c9e9356b0c
Adding more jungle trees.
2019-08-22 01:33:47 +02:00
Joshua Yanovski
861bc567b3
Restore old chaos.
2019-08-22 01:01:13 +02:00
Joshua Yanovski
7bb649bda2
Fixing colors.
2019-08-22 00:15:24 +02:00
Joshua Yanovski
0104ae7447
Fixing a few visual issues.
2019-08-21 23:36:43 +02:00
Joshua Yanovski
dc6f95cc09
Putting back splotchy mud.
2019-08-21 20:59:26 +02:00
Joshua Yanovski
7bb74b8905
Get rid of extraneous things.
2019-08-21 20:48:51 +02:00
Pfauenauge90
a0dd7c295a
colour tweaks
2019-08-21 20:43:38 +02:00
Joshua Yanovski
58ee11e3d4
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/jungle
2019-08-21 20:41:54 +02:00
Joshua Yanovski
a4606143ba
Fixing jungle.
2019-08-21 20:41:32 +02:00
Joshua Barretto
ea8aaf6cae
Added cacti
2019-08-21 19:18:16 +01:00
Joshua Barretto
deabbb8835
Better plant grouping distribution
2019-08-21 18:56:46 +01:00
Timo Koesters
425ff62fef
Merge branch 'velocity-fix' into 'master'
...
Fix velocity when stuck
See merge request veloren/veloren!453
2019-08-21 17:42:02 +00:00
Vechro
83c4232279
Fix wielding jump issue
2019-08-21 20:34:21 +03:00
Joshua Barretto
7e924d89a9
Merge branch 'pfauenauge/plants_grass' into 'zesterer/instancing'
...
Pfauenauge/plants grass
See merge request veloren/veloren!452
2019-08-21 17:22:05 +00:00
