Commit Graph

1918 Commits

Author SHA1 Message Date
df2eb30898 Total chaos. 2019-08-22 21:03:42 +02:00
9973c72692 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/jungle 2019-08-22 17:47:10 +02:00
111eac3eda Fix density computation. 2019-08-22 17:45:47 +02:00
85b3b849bb Merge branch 'zesterer/instancing' into 'master'
Instancing (block sprites)

See merge request veloren/veloren!450
2019-08-22 11:10:57 +00:00
c9e9356b0c Adding more jungle trees. 2019-08-22 01:33:47 +02:00
861bc567b3 Restore old chaos. 2019-08-22 01:01:13 +02:00
7bb649bda2 Fixing colors. 2019-08-22 00:15:24 +02:00
0104ae7447 Fixing a few visual issues. 2019-08-21 23:36:43 +02:00
dc6f95cc09 Putting back splotchy mud. 2019-08-21 20:59:26 +02:00
7bb74b8905 Get rid of extraneous things. 2019-08-21 20:48:51 +02:00
a0dd7c295a colour tweaks 2019-08-21 20:43:38 +02:00
58ee11e3d4 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/jungle 2019-08-21 20:41:54 +02:00
a4606143ba Fixing jungle. 2019-08-21 20:41:32 +02:00
ea8aaf6cae Added cacti 2019-08-21 19:18:16 +01:00
deabbb8835 Better plant grouping distribution 2019-08-21 18:56:46 +01:00
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
83c4232279 Fix wielding jump issue 2019-08-21 20:34:21 +03:00
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
01eb26206f Pfauenauge/plants grass 2019-08-21 17:22:05 +00:00
3ec1c7e738 Fix velocity when stuck 2019-08-21 20:17:19 +03:00
59422c8c63 Better wind waving, improved sun ambiance 2019-08-21 17:03:03 +01:00
a5876ece59 Random terrain sprite orientations 2019-08-21 16:22:49 +01:00
e402bd9338 Added per-instance transformation matrix, variable wind swaying 2019-08-21 13:47:29 +01:00
5a39e78557 Distribution "fun." 2019-08-20 22:48:22 +02:00
f2ab179e1c Fixed sprite mesh offsets 2019-08-20 16:54:12 +01:00
e3cbbd2fbb Better sunset colours, stars no longer reflect in water 2019-08-20 16:26:12 +01:00
f0fa7b7045 More grass 2019-08-20 12:06:41 +01:00
e5865e3844 Sprite render distance tweaks and optimisations 2019-08-20 11:05:01 +01:00
b9202f7264 Patchier plants, wind swaying 2019-08-20 11:05:01 +01:00
2a700cacea Update flowers.vox
made sunflowers smaller
2019-08-19 20:09:48 -04:00
e3f66f5ec6 Switched to singular flower 2019-08-20 00:53:22 +01:00
acf117442e Seperated Flowers 2019-08-19 19:44:44 -04:00
baf42f2203 Added multiple sprite block kind support 2019-08-20 00:31:11 +01:00
7e5222e75b Sprite distance fading, grass 2019-08-19 22:54:16 +01:00
9b647993f0 Added wheat and sprite rendering 2019-08-19 21:09:35 +01:00
3056007924 Smoother blending into sand. 2019-08-19 19:46:47 +02:00
333c824402 Added Instances construct 2019-08-19 18:23:47 +01:00
46f588bc39 t merge Merge branch 'master' of gitlab.com:veloren/veloren into sharp/jungle 2019-08-19 19:21:05 +02:00
86d48f3c39 Fixing visual issues. 2019-08-19 19:20:54 +02:00
898579f693 Added sprite pipeline 2019-08-19 18:01:23 +01:00
2ea30a0dfe Merge branch 'xacrimon/lotsafixes' into 'master'
Eliminated unsafe and disabled it with lint levels.

See merge request veloren/veloren!449
2019-08-19 13:25:55 +00:00
724d6dffb4 Disabled unsafe using lint level. 2019-08-19 14:39:23 +02:00
c6020257f1 Eliminated unsafe. 2019-08-19 14:33:31 +02:00
fdddb6c637 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/jungle 2019-08-19 11:04:09 +02:00
786123602b Merge branch 'console-spam-hot-fix' into 'master'
Fix low fps

See merge request veloren/veloren!448
2019-08-19 08:03:20 +00:00
31bd17c810 Fix low fps 2019-08-19 08:03:19 +00:00
2bb8a59118 Smoothed some things out. 2019-08-19 05:22:39 +02:00
08646cd9a4 Billow tweaks. 2019-08-19 03:41:32 +02:00
7036ca88d4 Fixing some colors. 2019-08-19 03:01:11 +02:00
bdbe3d2f42 Making jungles work. 2019-08-19 01:52:26 +02:00