Pfauenauge90
|
77c5fa1e7d
|
fixed scaling of the slots
|
2019-07-07 16:19:15 +02:00 |
|
Pfauenauge90
|
209054a098
|
added active inventory slots
|
2019-07-07 16:19:15 +02:00 |
|
Forest Anderson
|
dad78466f6
|
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
|
c3dbdf7d36
|
Adjust volume on startup
|
2019-07-07 14:12:28 +00:00 |
|
Joshua Barretto
|
e29b48b58e
|
Merge branch 'zesterer/worldgen' into 'master'
Fixed tree trimming
See merge request veloren/veloren!316
|
2019-07-07 10:43:10 +00:00 |
|
Imbris
|
d4556c1132
|
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
|
76e19be799
|
Fix rustc warning
|
2019-07-07 04:37:22 +00:00 |
|
Forest Anderson
|
15d4245ebb
|
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
|
c9c66574e8
|
Force CI to block on rustc warnings
|
2019-07-07 03:24:22 +00:00 |
|
Joshua Barretto
|
ff4f7a3c89
|
Fixed tree trimming
|
2019-07-07 00:21:32 +01:00 |
|
Joshua Barretto
|
e3cf41571a
|
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
|
7cb7750018
|
Improved z caching
|
2019-07-06 20:00:17 +01:00 |
|
Joshua Barretto
|
d819d5f198
|
Initial implementation of z cache
|
2019-07-06 20:00:17 +01:00 |
|
Joshua Barretto
|
4a54224af1
|
fmt
|
2019-07-06 20:00:17 +01:00 |
|
Joshua Barretto
|
1776ddbe91
|
Added block picking
|
2019-07-06 20:00:17 +01:00 |
|
Joshua Barretto
|
9918a33c26
|
Made mesh scheduling fairer
|
2019-07-06 20:00:17 +01:00 |
|
Joshua Barretto
|
d0dd6d5945
|
fmt
|
2019-07-06 20:00:17 +01:00 |
|
Joshua Barretto
|
e9537d0d32
|
Improved remeshing performance
|
2019-07-06 20:00:17 +01:00 |
|
Joshua Barretto
|
377ab0f0c2
|
Made shadows darker
|
2019-07-06 20:00:17 +01:00 |
|
Joshua Barretto
|
796258d33f
|
Throttled mesh scheduling to improve remesh performance
|
2019-07-06 20:00:17 +01:00 |
|
Joshua Barretto
|
77c2977c44
|
Reenabled towns, lighter days
|
2019-07-06 20:00:17 +01:00 |
|
Joshua Barretto
|
b3691833de
|
Better grass colour
|
2019-07-06 20:00:17 +01:00 |
|
Joshua Barretto
|
d5c084a6b4
|
Added mesh worker queue limit to prevent throttling of meshing queue
|
2019-07-06 20:00:17 +01:00 |
|
Joshua Barretto
|
54abe1f6d3
|
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
|
3e327e6e49
|
Holding weapon while running/jumping/standing
|
2019-07-06 19:00:05 +00:00 |
|
Forest Anderson
|
9ffd9b0cb0
|
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
|
a081f64687
|
Fix CI problems
|
2019-07-06 18:03:29 +00:00 |
|
Timo Koesters
|
bb07cda91b
|
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
|
b7f35ed0d0
|
Show join message after selecting a character
|
2019-07-05 22:16:06 +02:00 |
|
Imbris
|
9584e93aff
|
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
|
b7c4f2dbce
|
Implement chat command key
|
2019-07-05 18:21:11 +02:00 |
|
Joshua Barretto
|
7f22c11ba0
|
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
|
7efe540b7a
|
Fix attacking bug
|
2019-07-04 20:14:14 +02:00 |
|
Piotr Korgól
|
5b97a62545
|
Resolve discussion
|
2019-07-04 19:33:59 +02:00 |
|
Piotr Korgól
|
973d582479
|
Fix not being able to respawn in build mode
|
2019-07-04 19:25:09 +02:00 |
|
Timo Koesters
|
d24c6dbf6e
|
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
|
00d02e6492
|
chat-cli fix
|
2019-07-04 11:08:48 -04:00 |
|
jshipsey
|
a9511ec44b
|
clearing animation warnings
|
2019-07-04 10:58:59 -04:00 |
|
Timo Koesters
|
74ab358da8
|
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
|
581e576572
|
comment out unused structs/functions in voxygen/audio
|
2019-07-04 14:27:28 +00:00 |
|
Joshua Barretto
|
8aa675c731
|
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
|
fdcbf163c8
|
Fix warnings all around voxygen
|
2019-07-04 14:08:01 +02:00 |
|
Timo Koesters
|
831f02bedc
|
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
|
a6ab37f29f
|
Clean up ui
|
2019-07-04 13:24:44 +02:00 |
|
Timo Koesters
|
7955f51635
|
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
|
1cefa53c5e
|
Even more cleanups
|
2019-07-03 22:46:43 +02:00 |
|
Piotr Korgól
|
e04a12af9a
|
Remove printlns
|
2019-07-03 22:38:28 +02:00 |
|
Piotr Korgól
|
0532341254
|
Small cleanup to block placing and breaking
|
2019-07-03 22:28:13 +02:00 |
|
Piotr Korgól
|
24dd56b215
|
Add block breaking
|
2019-07-03 21:56:54 +02:00 |
|
timokoesters
|
53ef8643c6
|
Fix building
|
2019-07-03 21:28:07 +02:00 |
|