1242 Commits

Author SHA1 Message Date
Mckol
fd21b63e74 Updated the "Get Veloren" section of README 2019-06-29 11:45:10 +02:00
Timo Koesters
fa4f5121f5 Merge branch 'timo-cleanup-body' into 'master'
Clean up ecs actor body components

See merge request veloren/veloren!261
2019-06-29 00:25:53 +00:00
timokoesters
7381c6ed91
Clean up ecs actor body components 2019-06-29 01:49:33 +02:00
Joshua Barretto
14604035c2 Merge branch 'bandaid-audio-fix' into 'master'
Catch panics the audio system produces on linux sometimes

See merge request veloren/veloren!258
2019-06-28 18:29:09 +00:00
Mckol
53c7534ddc Added error logging 2019-06-28 20:22:43 +02:00
Mckol
be94c59e69 Added catching audio panics
You can still make it panic by poisoning some variable if you try to change the audio device in settings after launch`
2019-06-28 20:22:43 +02:00
Mckol
a47d49cfc7 Merge branch 'improve-asset-loading' into 'master'
Improve asset loading

See merge request veloren/veloren!260
2019-06-28 17:55:22 +00:00
Mckol
ea47215ed4 Added the standard linux asset path and an enviroment variable for configuring it
The variable is VELOREN_ASSETS
2019-06-28 19:50:11 +02:00
Joshua Barretto
789e8f3bbc Merge branch 'qutrin/spawn-amount-fix' into 'master'
Fix spawning few entities at once

See merge request veloren/veloren!259
2019-06-28 17:08:13 +00:00
Piotr Korgól
faca8a413e Fix spawning few entities at once 2019-06-28 18:58:47 +02:00
Joshua Barretto
dd72808b1d 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
5affd33b89 Char fixes 2019-06-28 14:45:02 +00:00
Joshua Barretto
c7785a26c0 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
b12f82b48a Prevent text clients from gaining position 2019-06-28 16:22:25 +02:00
Marcel
50ba752cff 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
0f98660c23 add git commit hash to debug window 2019-06-28 12:08:12 +00:00
Marcel
5332bc394e 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
1c09cee8c6 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
4928522166 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
345dc1b7a9 Made physics cheaper still 2019-06-27 15:37:33 +01:00
Joshua Barretto
b01d54c617 Made collision detection cheaper, fixed snapping bug, somewhat nerfed rolling 2019-06-27 15:21:41 +01:00
Mckol
c73f420bf7 Merge branch 'eclipse-gitignore' into 'master'
Update gitignore

See merge request veloren/veloren!253
2019-06-27 12:51:00 +00:00
Mckol
5b08532cab Added vim to gitignore 2019-06-27 14:38:19 +02:00
Mckol
1debf8500a Added Eclipse project file to gitignore 2019-06-27 13:13:55 +02:00
Joshua Barretto
2f7900164f 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
812609debe Made physics fps-independent 2019-06-26 22:43:47 +01:00
Joshua Barretto
f02852daaa Interp fix 2019-06-26 21:57:39 +01:00
Joshua Barretto
a4a1c697fd Attempted voxygen interpolation dt fix 2019-06-26 21:57:39 +01:00
Forest Anderson
6127fe61fc Merge branch 'zesterer/cities' into 'master'
Worldgen improvements

See merge request veloren/veloren!245
2019-06-26 20:17:44 +00:00
Joshua Barretto
20ca85b5b3 Disabled cities until a later MR 2019-06-26 19:32:26 +01:00
Joshua Barretto
cf7abdb9ce fmt 2019-06-26 19:14:12 +01:00
Joshua Barretto
dc8584fbda Added settlement generation 2019-06-26 19:14:12 +01:00
Joshua Barretto
9928617d2f fmt 2019-06-26 19:14:12 +01:00
Joshua Barretto
4d761e27da Denser stars 2019-06-26 19:14:12 +01:00
Joshua Barretto
19f129b386 Rewrote sky shaders, added stars 2019-06-26 19:14:12 +01:00
Joshua Barretto
2226baa844 Grass improvements 2019-06-26 19:14:12 +01:00
Joshua Barretto
86651561a4 Made postprocessing brighter 2019-06-26 19:14:12 +01:00
Joshua Barretto
cd70941918 Better path noise, better shadows 2019-06-26 19:14:12 +01:00
Joshua Barretto
2b36b833ba Added path colouring 2019-06-26 19:14:12 +01:00
Joshua Barretto
eba5183f41 Wavy paths 2019-06-26 19:14:12 +01:00
Joshua Barretto
bd1418f125 Better paths 2019-06-26 19:14:12 +01:00
Joshua Barretto
13d90429ee Paths and smoother region borders 2019-06-26 19:14:12 +01:00
Joshua Barretto
f25dd0755b Improved hash RNG function instability and speed 2019-06-26 19:14:12 +01:00
Joshua Barretto
e9a75d23ee Removed RefCell from column cache 2019-06-26 19:14:12 +01:00
Pfauenauge90
af1fa751ff oak size changes 2019-06-26 19:14:12 +01:00
Pfauenauge90
112d34f038 changes restore 2019-06-26 19:14:12 +01:00
Pfauenauge
805e2f4ea6 char selection time freeze to prevent it from being dark 2019-06-26 19:14:12 +01:00
Joshua Barretto
5d102408f8 Stronger shadows, fewer cliffs in oceans 2019-06-26 19:14:12 +01:00
Joshua Barretto
9b5bc30184 Smoother cliffs 2019-06-26 19:14:12 +01:00
Joshua Barretto
63e86cee59 Worldgen performance improvements, better sun 2019-06-26 19:14:12 +01:00