1221 Commits

Author SHA1 Message Date
jshipsey
13ee9b52fc
groundwork for role, crun, cidle 2019-06-16 19:57:04 +02:00
Cody
244b27cb29
Removes input sys, moves code to combat and phys 2019-06-16 19:57:03 +02:00
timokoesters
facbb622d6
Improve organization of controls 2019-06-16 19:57:03 +02:00
timokoesters
f5a2dcb98e
Revamp control system 2019-06-16 19:57:03 +02:00
Joshua Barretto
ae528f12e0 Merge branch 'zesterer-worldgen-stuff' into 'master'
Worldgen stuff

See merge request veloren/veloren!217
2019-06-16 10:46:59 +00:00
Joshua Barretto
b7d3cc952c Merge branch '134-merge-all-spawning-commands-into-one' into 'master'
Resolve "Merge all spawning commands into one"

Closes #134

See merge request veloren/veloren!237
2019-06-16 10:45:54 +00:00
Joshua Barretto
5e22185884 Added clouds 2019-06-15 18:23:01 +01:00
liids
914d897b38 small fixes 2019-06-15 17:23:53 +02:00
Joshua Barretto
1f36f6d5e8 Fixed world viewer stack overflow on Windows 2019-06-15 15:50:54 +01:00
liids
e13f57979f make it more laconic 2019-06-15 15:42:39 +02:00
liids
e4e6cbb995 fix formatting 2019-06-15 14:55:06 +02:00
Joshua Barretto
42e9144eca Stopped printing chunk location every frame 2019-06-15 13:44:50 +01:00
Joshua Barretto
f9127b6a81 Updated and fixed world viewer example 2019-06-15 13:34:28 +01:00
liids
847bcbee88 make minimum spawn amount higher than 0 2019-06-15 14:30:05 +02:00
liids
dcce12e5ce fix formatting 2019-06-15 13:48:14 +02:00
Joshua Barretto
226ac08ee3 Adjusted tree colour variation 2019-06-15 11:36:26 +01:00
liids
883d66f166 fix negative spawn amounts 2019-06-15 11:32:07 +02:00
liids
62ff7c5024 Merge branch 'master' of https://gitlab.com/liids/veloren 2019-06-15 11:15:10 +02:00
liids
928c613794 make amount optional 2019-06-15 10:22:36 +02:00
liids
c2d0f17f92 Merge all spawn commands into one 2019-06-15 09:56:27 +02:00
Joshua Barretto
5bfc012be3 Merge branch 'toolchain-file' into 'master'
Automatic nightly toolchain selection

See merge request veloren/veloren!236
2019-06-14 12:49:29 +00:00
Mckol
6f39f30630 Added the rust-toolchain file which automatically sets the toolchain to nightly for cargo users 2019-06-14 14:38:43 +02:00
Joshua Barretto
7a5a7b102c Added dynamic tree colours 2019-06-13 11:59:05 +01:00
Joshua Barretto
dbae541f7f Fixed missing assets 2019-06-13 11:59:05 +01:00
Monty Marz
cf4a73505c palette changes 2019-06-13 11:59:05 +01:00
Joshua Barretto
32ddcd2ab3 Added grass blending 2019-06-13 11:59:05 +01:00
Joshua Barretto
48921c4730 Added dirt/stone gradient 2019-06-13 11:59:05 +01:00
Joshua Barretto
2cb57b9456 Merged stumps, adjusted scale code 2019-06-13 11:59:05 +01:00
Pfauenauge90
4fd3caee6e small fixes 2019-06-13 11:59:05 +01:00
Pfauenauge90
22e0dbe227 tree stumps, shorter pines 2019-06-13 11:59:05 +01:00
Joshua Barretto
00e970bbeb Tweaked lighting and AO 2019-06-13 11:59:05 +01:00
Joshua Barretto
777e3242fd Bluer snow, altered rock colour 2019-06-13 11:59:05 +01:00
Joshua Barretto
9f31c01f43 Added more terrain noise, better snow 2019-06-13 11:59:05 +01:00
Joshua Barretto
f7572723a1 More trees, adjusted camera tilt 2019-06-13 11:59:05 +01:00
Joshua Barretto
dea90646e9 Simpler cliffs, camera tilt 2019-06-13 11:59:05 +01:00
Monty Marz
0ea0fafc52 Tree fixes 2019-06-13 11:59:05 +01:00
Joshua Barretto
ee74c99177 Crazy cliffs 2019-06-13 11:59:05 +01:00
Joshua Barretto
caacf78708 Reduced peak scale 2019-06-13 11:59:05 +01:00
Joshua Barretto
b428c2c22e Adjusted mountain steepness 2019-06-13 11:59:05 +01:00
Joshua Barretto
6cf5ea4db1 Rescaled mountains 2019-06-13 11:59:05 +01:00
Joshua Barretto
41b02e6a43 Fixed frustum culling efficiency bug 2019-06-13 11:59:05 +01:00
Joshua Barretto
6e66c1a23f Major worldgen structural refactor 2019-06-13 11:59:05 +01:00
Joshua Barretto
4d1d730ebf Fixed usize size issue for 32-bit platforms 2019-06-13 11:59:05 +01:00
Joshua Barretto
4d7972a046 Added sampler clearing 2019-06-13 11:59:05 +01:00
Joshua Barretto
a8ee4418b7 Set default case for block type opacity 2019-06-13 11:59:05 +01:00
Joshua Barretto
2317098e25 Prevented rock smearing 2019-06-13 11:59:05 +01:00
Joshua Barretto
b0f415c2a2 Separated sampler code from simulation code 2019-06-13 11:59:05 +01:00
Imbris
58cb0c10d4 Merge branch 'slipped-animation-warnings' into 'master'
cleared out unused animation variables

See merge request veloren/veloren!233
2019-06-13 05:40:24 +00:00
jshipsey
44481cf0b7 cleared out unused animation variables 2019-06-13 00:14:06 -04:00
Marcel
6a4fe52a85 Merge branch 'midge/mouse-sensitivity' into 'master'
Better Settings

Closes #142 and #132

See merge request veloren/veloren!216
2019-06-12 13:12:46 +00:00