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 |
|
Piotr Korgól
|
42a4cc8095
|
Add block breaking
|
2019-07-03 21:56:54 +02:00 |
|
timokoesters
|
a702f7258a
|
Fix building
|
2019-07-03 21:28:07 +02:00 |
|
Piotr Korgól
|
fbdc1d954a
|
Handle block placing.
|
2019-07-03 21:28:07 +02:00 |
|
Piotr Korgól
|
e212d4d6f9
|
Fix comment
|
2019-07-03 21:28:07 +02:00 |
|
Piotr Korgól
|
7cf299503d
|
Add crosshair
|
2019-07-03 21:28:07 +02:00 |
|
Piotr Korgól
|
7f08377001
|
Sync CanBuild component, fix /build messages
|
2019-07-03 21:28:07 +02:00 |
|
Piotr Korgól
|
bf748ae742
|
Add CanBuild component, Block placing client messages and build mode command
|
2019-07-03 21:28:07 +02:00 |
|
Joshua Barretto
|
9977322ba6
|
Merge branch 'desttinghim/no-audio-settings' into 'master'
Add field to disable audio into settings
See merge request veloren/veloren!302
|
2019-07-03 19:19:00 +00:00 |
|
Louis Pearson
|
67bfc6c4cf
|
Add field to turn off audio in settings
|
2019-07-03 13:13:38 -06:00 |
|