1931 Commits

Author SHA1 Message Date
Joshua Barretto
7ffe8979a2 Better snow noise 2019-08-23 00:31:27 +01: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
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
Monty Marz
01eb26206f Pfauenauge/plants grass 2019-08-21 17:22:05 +00:00
Vechro
3ec1c7e738 Fix velocity when stuck 2019-08-21 20:17:19 +03:00
Joshua Barretto
59422c8c63 Better wind waving, improved sun ambiance 2019-08-21 17:03:03 +01:00
Joshua Barretto
a5876ece59 Random terrain sprite orientations 2019-08-21 16:22:49 +01:00
Joshua Barretto
e402bd9338 Added per-instance transformation matrix, variable wind swaying 2019-08-21 13:47:29 +01:00
Joshua Yanovski
5a39e78557 Distribution "fun." 2019-08-20 22:48:22 +02:00
Joshua Barretto
f2ab179e1c Fixed sprite mesh offsets 2019-08-20 16:54:12 +01:00
Joshua Barretto
e3cbbd2fbb Better sunset colours, stars no longer reflect in water 2019-08-20 16:26:12 +01:00
Joshua Barretto
f0fa7b7045 More grass 2019-08-20 12:06:41 +01:00
Joshua Barretto
e5865e3844 Sprite render distance tweaks and optimisations 2019-08-20 11:05:01 +01:00
Joshua Barretto
b9202f7264 Patchier plants, wind swaying 2019-08-20 11:05:01 +01:00
Demonic
2a700cacea Update flowers.vox
made sunflowers smaller
2019-08-19 20:09:48 -04:00
Joshua Barretto
e3f66f5ec6 Switched to singular flower 2019-08-20 00:53:22 +01:00
Demonic
acf117442e Seperated Flowers 2019-08-19 19:44:44 -04:00
Joshua Barretto
baf42f2203 Added multiple sprite block kind support 2019-08-20 00:31:11 +01:00
Joshua Barretto
7e5222e75b Sprite distance fading, grass 2019-08-19 22:54:16 +01:00
Joshua Barretto
9b647993f0 Added wheat and sprite rendering 2019-08-19 21:09:35 +01:00
Joshua Yanovski
3056007924 Smoother blending into sand. 2019-08-19 19:46:47 +02:00
Joshua Barretto
333c824402 Added Instances construct 2019-08-19 18:23:47 +01:00