timokoesters
5ab03abbdd
Remove animation warnings
2019-08-26 13:12:36 +02:00
timokoesters
799c73d43a
Fix characterstate in movement.rs, not phys.rs
2019-08-26 13:12:35 +02:00
timokoesters
808467c616
Reset controller after each tick
2019-08-26 13:12:35 +02:00
timokoesters
4d6a32e00f
Allow non player entites to be removed again
2019-08-26 13:12:35 +02:00
timokoesters
90c81b4759
Reset controller after each tick
2019-08-26 13:12:34 +02:00
timokoesters
5d5ccd7b99
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
2211f79d28
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
c02f2a7f9e
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
61546239a8
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
958a40b8c0
Fix clean code lints.
2019-08-25 18:17:51 +02:00
Joshua Yanovski
6f12a240de
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
47380090fa
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
f02b571f7f
fmt
2019-08-24 15:32:07 -04:00
Joshua Yanovski
25a02ae6e0
Make humidity ignore ocean chunks.
2019-08-24 21:13:32 +02:00
Joshua Barretto
f7f0958d41
Merge branch 'sharp/jungle' into 'master'
...
Sharp/jungle
See merge request veloren/veloren!447
2019-08-22 23:40:46 +00:00
Joshua Barretto
8635982173
Merge branch 'sharp/jungle' of gitlab.com:veloren/veloren into sharp/jungle
2019-08-23 00:33:33 +01:00
Joshua Barretto
0db797744b
Better snow noise
2019-08-23 00:31:27 +01:00
Joshua Yanovski
f687c591ca
Remove out of date comment.
2019-08-23 01:16:15 +02:00
Joshua Yanovski
d7f567a862
Merge remote-tracking branch 'origin/sharp/jungle' into sharp/jungle
2019-08-23 01:10:48 +02:00
Joshua Barretto
6136edd631
Merge branch 'sharp/jungle' of gitlab.com:veloren/veloren into sharp/jungle
2019-08-23 00:09:45 +01:00
Joshua Barretto
b6cfc84810
More interesting terrain chaos
2019-08-23 00:09:14 +01:00
Joshua Yanovski
b69020b68e
Fine, removing box syntax.
2019-08-23 01:08:47 +02:00
Joshua Yanovski
398c18359d
Addressing concerns, for real.
2019-08-23 00:57:42 +02:00
Joshua Yanovski
688563accf
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/jungle
2019-08-22 23:48:22 +02:00
Joshua Yanovski
2ff192021c
Addressing PR issues.
2019-08-22 23:48:13 +02:00
Joshua Barretto
ba1a146cd5
Better snow, colours, more chaos
2019-08-22 22:25:17 +01:00
Joshua Barretto
2c6caa6110
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
0f0a28d87a
Small changes to velocity
2019-08-22 22:26:35 +03:00
Joshua Yanovski
40192da977
Closest attempt.
2019-08-22 21:10:04 +02:00
Joshua Yanovski
dbeec66b2d
Total chaos.
2019-08-22 21:03:42 +02:00
Vechro
2077548d5c
Simplify debug info
2019-08-22 21:53:46 +03:00
Joshua Barretto
8653c3e60a
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
840e2cbfbf
Build script: check if git-lfs works
2019-08-22 19:18:47 +02:00
Joshua Yanovski
38443c173c
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/jungle
2019-08-22 17:47:10 +02:00
Joshua Yanovski
5caed42e4f
Fix density computation.
2019-08-22 17:45:47 +02:00
Joshua Barretto
d9854ad682
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
aa4464d8f4
Adding more jungle trees.
2019-08-22 01:33:47 +02:00
Joshua Yanovski
139933194c
Restore old chaos.
2019-08-22 01:01:13 +02:00
Joshua Yanovski
16ad7ba042
Fixing colors.
2019-08-22 00:15:24 +02:00
Joshua Yanovski
d174dd99b4
Fixing a few visual issues.
2019-08-21 23:36:43 +02:00
Joshua Yanovski
bd8a0be0fb
Putting back splotchy mud.
2019-08-21 20:59:26 +02:00
Joshua Yanovski
91ea62a5c9
Get rid of extraneous things.
2019-08-21 20:48:51 +02:00
Pfauenauge90
8654622bfa
colour tweaks
2019-08-21 20:43:38 +02:00
Joshua Yanovski
cc269afa38
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/jungle
2019-08-21 20:41:54 +02:00
Joshua Yanovski
05d501632e
Fixing jungle.
2019-08-21 20:41:32 +02:00
Joshua Barretto
7ceccfecc3
Added cacti
2019-08-21 19:18:16 +01:00
Joshua Barretto
6ff264d982
Better plant grouping distribution
2019-08-21 18:56:46 +01:00
Timo Koesters
1bb969ef36
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
c6b2303890
Fix wielding jump issue
2019-08-21 20:34:21 +03:00
Joshua Barretto
75107e55b5
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
