Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,490 Commits 151 Branches 18 Tags 2.1 GiB
2215f9abd7
Commit Graph

2490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Monty Marz
fade04d44e Pfauenauge/plants grass 2019-08-21 17:22:05 +00:00
Vechro
c40e15f070 Fix velocity when stuck 2019-08-21 20:17:19 +03:00
Joshua Barretto
55350d8f5f Better wind waving, improved sun ambiance 2019-08-21 17:03:03 +01:00
Joshua Barretto
0fcb3a174d Random terrain sprite orientations 2019-08-21 16:22:49 +01:00
Joshua Barretto
75e1ee3cd7 Added per-instance transformation matrix, variable wind swaying 2019-08-21 13:47:29 +01:00
Joshua Yanovski
8c644e2bb1 Distribution "fun." 2019-08-20 22:48:22 +02:00
Joshua Barretto
590ce1a987 Fixed sprite mesh offsets 2019-08-20 16:54:12 +01:00
Joshua Barretto
6a0be5dc35 Better sunset colours, stars no longer reflect in water 2019-08-20 16:26:12 +01:00
Joshua Barretto
60544531dd More grass 2019-08-20 12:06:41 +01:00
Joshua Barretto
4ed21a2e59 Sprite render distance tweaks and optimisations 2019-08-20 11:05:01 +01:00