Commit Graph

1412 Commits

Author SHA1 Message Date
Songtronix
5ea624674d add comment and logging error 2019-07-07 16:16:06 +02:00
Songtronix
1be8f5e422 Update status according the play state 2019-07-07 16:16:05 +02:00
Songtronix
1e40bd09ba working discord presence 2019-07-07 16:16:05 +02:00
Songtronix
60500d9235 add discord feature with dependencies 2019-07-07 16:16:05 +02:00
Forest Anderson
d9ab3ef76c Merge branch 'songtronix/adjust-audio-on-startup' into 'master'
Adjust volume on startup

Closes #182

See merge request veloren/veloren!318
2019-07-07 14:12:28 +00:00
Songtronix
9007f4aa5a Adjust volume on startup 2019-07-07 14:12:28 +00:00
Joshua Barretto
6b7606bf98 Merge branch 'zesterer/worldgen' into 'master'
Fixed tree trimming

See merge request veloren/veloren!316
2019-07-07 10:43:10 +00:00
Imbris
9b99666953 Merge branch 'fa/hotfix-ci-failure' into 'master'
Fix rustc warning

See merge request veloren/veloren!314
2019-07-07 04:37:22 +00:00
Forest Anderson
0ed35d3ef4 Fix rustc warning 2019-07-07 04:37:22 +00:00
Forest Anderson
32af5b39a1 Merge branch 'angelonfira/force-ci-deny-on-warnings' into 'master'
Force CI to block on rustc warnings

See merge request veloren/veloren!313
2019-07-07 03:24:22 +00:00
Forest Anderson
5442bbfe62 Force CI to block on rustc warnings 2019-07-07 03:24:22 +00:00
Joshua Barretto
1d8656cb7d Fixed tree trimming 2019-07-07 00:21:32 +01:00
Joshua Barretto
9e90c89844 Merge branch 'zesterer/worldgen' into 'master'
Better mesh scheduling, block picking, worldgen speedup

See merge request veloren/veloren!298
2019-07-06 19:22:27 +00:00
Joshua Barretto
abd07aea09 Improved z caching 2019-07-06 20:00:17 +01:00
Joshua Barretto
3623871775 Initial implementation of z cache 2019-07-06 20:00:17 +01:00
Joshua Barretto
6a484ce162 fmt 2019-07-06 20:00:17 +01:00
Joshua Barretto
33b7e729c9 Added block picking 2019-07-06 20:00:17 +01:00
Joshua Barretto
d2ccbafe59 Made mesh scheduling fairer 2019-07-06 20:00:17 +01:00
Joshua Barretto
0c9843999b fmt 2019-07-06 20:00:17 +01:00
Joshua Barretto
51ad1f1995 Improved remeshing performance 2019-07-06 20:00:17 +01:00
Joshua Barretto
6709b18cb6 Made shadows darker 2019-07-06 20:00:17 +01:00
Joshua Barretto
ef973faadf Throttled mesh scheduling to improve remesh performance 2019-07-06 20:00:17 +01:00
Joshua Barretto
6fc2096dae Reenabled towns, lighter days 2019-07-06 20:00:17 +01:00
Joshua Barretto
61568eac7c Better grass colour 2019-07-06 20:00:17 +01:00
Joshua Barretto
1641c4f788 Added mesh worker queue limit to prevent throttling of meshing queue 2019-07-06 20:00:17 +01:00
Joshua Barretto
064832fe87 Merge branch 'slipped/wielding' into 'master'
Holding weapon while running/jumping/standing

See merge request veloren/veloren!312
2019-07-06 19:00:05 +00:00
Justin Shipsey
1c10ff756f Holding weapon while running/jumping/standing 2019-07-06 19:00:05 +00:00
Forest Anderson
2309d63c3f Merge branch 'angelonfira/fix-ci' into 'master'
Fix CI problems

See merge request veloren/veloren!311
2019-07-06 18:03:29 +00:00
Forest Anderson
d847fc2fc6 Fix CI problems 2019-07-06 18:03:29 +00:00
Timo Koesters
6a5331e8ab Merge branch 'timo-join-message' into 'master'
Show join message after selecting a character

See merge request veloren/veloren!309
2019-07-05 20:35:30 +00:00
timokoesters
0236e2e8f2
Show join message after selecting a character 2019-07-05 22:16:06 +02:00
Imbris
ab2c2dd940 Merge branch 'command-chat-key' into 'master'
Open chat with '/' when pressing Key::Command (default is '/')

See merge request veloren/veloren!128
2019-07-05 17:19:11 +00:00
timokoesters
215693137b
Implement chat command key 2019-07-05 18:21:11 +02:00
Joshua Barretto
a78e55ceac Merge branch 'qutrin/build-mode-respawn-fix' into 'master'
Fix not being able to respawn in build mode

See merge request veloren/veloren!307
2019-07-04 19:17:03 +00:00
timokoesters
203b3d4e76
Fix attacking bug 2019-07-04 20:14:14 +02:00
Piotr Korgól
e267ac7ed4 Resolve discussion 2019-07-04 19:33:59 +02:00
Piotr Korgól
356f5cb47a Fix not being able to respawn in build mode 2019-07-04 19:25:09 +02:00
Timo Koesters
5dfdcbf1ea Merge branch 'slipped-animation-warnings' into 'master'
Slipped animation warnings

See merge request veloren/veloren!306
2019-07-04 15:26:54 +00:00
jshipsey
da2ab20563 chat-cli fix 2019-07-04 11:08:48 -04:00
jshipsey
02ac56d84d clearing animation warnings 2019-07-04 10:58:59 -04:00
Timo Koesters
4c63af94de Merge branch 'songtronix/clean-audio' into 'master'
comment out unused structs/functions in voxygen/audio

See merge request veloren/veloren!305
2019-07-04 14:27:28 +00:00
Songtronix
61d0474e6c comment out unused structs/functions in voxygen/audio 2019-07-04 14:27:28 +00:00
Joshua Barretto
d1ccd88fab Merge branch 'timo-voxygen-warnings' into 'master'
Fix warnings all around voxygen

See merge request veloren/veloren!304
2019-07-04 12:11:30 +00:00
timokoesters
d7c159a4e1
Fix warnings all around voxygen 2019-07-04 14:08:01 +02:00
Timo Koesters
aed096c721 Merge branch 'timo-cleanup-ui' into 'master'
Clean up ui

See merge request veloren/veloren!303
2019-07-04 11:29:57 +00:00
timokoesters
c2f7f69a69
Clean up ui 2019-07-04 13:24:44 +02:00
Timo Koesters
4de3a64d7b Merge branch 'build-mode' into 'master'
Build mode and crosshair

See merge request veloren/veloren!290
2019-07-03 20:50:28 +00:00
Piotr Korgól
1f381cd99b Even more cleanups 2019-07-03 22:46:43 +02:00
Piotr Korgól
04d3c077d0 Remove printlns 2019-07-03 22:38:28 +02:00
Piotr Korgól
e79f763226 Small cleanup to block placing and breaking 2019-07-03 22:28:13 +02:00