Commit Graph

1583 Commits

Author SHA1 Message Date
Piotr Korgól
44862d0acc Fix spawning few entities at once 2019-06-28 18:58:47 +02:00
Joshua Barretto
89fbc86eb5 Merge branch 'pfauenauge-char-fixes' into 'master'
Char fixes

See merge request veloren/veloren!257
2019-06-28 14:45:02 +00:00
Monty Marz
cef52a0440 Char fixes 2019-06-28 14:45:02 +00:00
Joshua Barretto
523c1b0b03 Merge branch 'qutrin/boringstuff' into 'master'
Prevent text clients from gaining position.

Closes #144

See merge request veloren/veloren!256
2019-06-28 14:27:53 +00:00
Piotr Korgól
888faadfab Prevent text clients from gaining position 2019-06-28 16:22:25 +02:00
Marcel
947a473435 Merge branch 'songtronix/add-githash-to-debug-window' into 'master'
add git commit hash to debug window

See merge request veloren/veloren!255
2019-06-28 12:08:12 +00:00
Songtronix
eb28ba94f6 add git commit hash to debug window 2019-06-28 12:08:12 +00:00
Marcel
42c5e671a1 Merge branch 'cities-charcreation-frankenbranch' into 'master'
Alternate heads

See merge request veloren/veloren!252
2019-06-28 08:24:14 +00:00
Justin Shipsey
4ac7307f8f minor main menu changes
made the settings button's text grey and removed hover/press image as long as it's not functional

changed server list placement and spacing
2019-06-28 08:24:13 +00:00
Joshua Barretto
47041de1a0 Merge branch 'zesterer/phys-fixes' into 'master'
Made collision detection cheaper, fixed snapping bug, somewhat nerfed rolling

See merge request veloren/veloren!254
2019-06-27 14:43:49 +00:00
Joshua Barretto
acb184e15d Made physics cheaper still 2019-06-27 15:37:33 +01:00
Joshua Barretto
6444ba1933 Made collision detection cheaper, fixed snapping bug, somewhat nerfed rolling 2019-06-27 15:21:41 +01:00
Mckol
45dacaf7bb Merge branch 'eclipse-gitignore' into 'master'
Update gitignore

See merge request veloren/veloren!253
2019-06-27 12:51:00 +00:00
Mckol
e534ad279f Added vim to gitignore 2019-06-27 14:38:19 +02:00
Mckol
4ea29f91ee Added Eclipse project file to gitignore 2019-06-27 13:13:55 +02:00
Joshua Barretto
d7af11e9c1 Merge branch 'zesterer/interp-fix' into 'master'
Interpolation fix

See merge request veloren/veloren!251
2019-06-26 21:52:21 +00:00
Joshua Barretto
cdb405d7b8 Made physics fps-independent 2019-06-26 22:43:47 +01:00
Joshua Barretto
d4beeacc88 Interp fix 2019-06-26 21:57:39 +01:00
Joshua Barretto
cfe7b0d8b6 Attempted voxygen interpolation dt fix 2019-06-26 21:57:39 +01:00
Forest Anderson
e3cf9cdfdc Merge branch 'zesterer/cities' into 'master'
Worldgen improvements

See merge request veloren/veloren!245
2019-06-26 20:17:44 +00:00
Joshua Barretto
5839990a28 Disabled cities until a later MR 2019-06-26 19:32:26 +01:00
Joshua Barretto
e414b82d2f fmt 2019-06-26 19:14:12 +01:00
Joshua Barretto
b40d19ad0e Added settlement generation 2019-06-26 19:14:12 +01:00
Joshua Barretto
f781aca8e9 fmt 2019-06-26 19:14:12 +01:00
Joshua Barretto
397c909bd4 Denser stars 2019-06-26 19:14:12 +01:00
Joshua Barretto
ad2bc635f8 Rewrote sky shaders, added stars 2019-06-26 19:14:12 +01:00
Joshua Barretto
325fa41d7e Grass improvements 2019-06-26 19:14:12 +01:00
Joshua Barretto
0734529ef6 Made postprocessing brighter 2019-06-26 19:14:12 +01:00
Joshua Barretto
46fce696a2 Better path noise, better shadows 2019-06-26 19:14:12 +01:00
Joshua Barretto
41f647e862 Added path colouring 2019-06-26 19:14:12 +01:00
Joshua Barretto
ba4b425e99 Wavy paths 2019-06-26 19:14:12 +01:00
Joshua Barretto
53d5cada93 Better paths 2019-06-26 19:14:12 +01:00
Joshua Barretto
216c2583fb Paths and smoother region borders 2019-06-26 19:14:12 +01:00
Joshua Barretto
86f13af8cb Improved hash RNG function instability and speed 2019-06-26 19:14:12 +01:00
Joshua Barretto
b94c0ace8c Removed RefCell from column cache 2019-06-26 19:14:12 +01:00
Pfauenauge90
d75160e2f8 oak size changes 2019-06-26 19:14:12 +01:00
Pfauenauge90
b5d529f824 changes restore 2019-06-26 19:14:12 +01:00
Pfauenauge
1dfc85a75b char selection time freeze to prevent it from being dark 2019-06-26 19:14:12 +01:00
Joshua Barretto
b987bda9ce Stronger shadows, fewer cliffs in oceans 2019-06-26 19:14:12 +01:00
Joshua Barretto
6f1d77648a Smoother cliffs 2019-06-26 19:14:12 +01:00
Joshua Barretto
d0b38e9875 Worldgen performance improvements, better sun 2019-06-26 19:14:12 +01:00
Joshua Barretto
9279611d6d Added longer day/night cycle, /time command 2019-06-26 19:14:12 +01:00
Joshua Barretto
f3adf6ab5f Improved mountain rock transition 2019-06-26 19:14:12 +01:00
Joshua Barretto
693d59cc93 Removed old cliff code 2019-06-26 19:14:12 +01:00
Joshua Barretto
fffef7c739 Better rivers, rewrote cliffs 2019-06-26 19:14:12 +01:00
Joshua Barretto
1642988615 First attempt at rivers 2019-06-26 19:14:12 +01:00
Joshua Barretto
c86c4d0b2b fmt 2019-06-26 19:14:12 +01:00
Joshua Barretto
704e65cb41 Attempted rivers 2019-06-26 19:14:12 +01:00
Joshua Barretto
3e56c65e86 Make name generation seed-dependent again 2019-06-26 19:14:12 +01:00
Piotr Korgól
5f09e75541 Stop printing out chunk location 2019-06-26 19:14:12 +01:00