Commit Graph

1250 Commits

Author SHA1 Message Date
Joshua Barretto
b5648f736d Fixed day horizon bug 2019-06-29 16:48:43 +01:00
Joshua Barretto
905b3d6f45 Prevented block-hopping when not on ground 2019-06-29 16:48:43 +01:00
Joshua Barretto
b1e882cb5d Merge branch 'cargo-update' into 'master'
upgrade dependencies

See merge request veloren/veloren!267
2019-06-29 15:48:19 +00:00
Songtronix
80f7a22182 upgrade dependencies 2019-06-29 17:25:58 +02:00
Timo Koesters
22af8cb9d5 Merge branch 'alt-tab-cursor' into 'master'
Show cursor when unfocussing the window

Closes #141 and #137

See merge request veloren/veloren!262
2019-06-29 10:16:51 +00:00
Mckol
9a0279fa5a Merge branch 'update-readme' into 'master'
Update readme

See merge request veloren/veloren!263
2019-06-29 10:05:17 +00:00
Mckol
d8c2a4b7d2 Clarify supported platforms in README 2019-06-29 11:45:10 +02:00
Mckol
34dd804bd4 Updated the "Get Veloren" section of README 2019-06-29 11:45:10 +02:00
timokoesters
af52cfea6a
Show cursor when unfocussing the window 2019-06-29 03:43:35 +02:00
Timo Koesters
305296090f 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
fe6f627d42
Clean up ecs actor body components 2019-06-29 01:49:33 +02:00
Joshua Barretto
cbcccbe4d0 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
b5db5b8d3d Added error logging 2019-06-28 20:22:43 +02:00
Mckol
f1b1c41d92 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
fd512597c4 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
5ffa79d07d 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
763c8db60b 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
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