Commit Graph

15585 Commits

Author SHA1 Message Date
d186c4031e Sharp crosshair (no multisampling) 2019-07-07 16:19:18 +02:00
7455155198 more test items 2019-07-07 16:19:18 +02:00
89cadf27be fix fonts 2019-07-07 16:19:18 +02:00
50e15333cd set the inventory space test button to false by default and increased the starting inventory size to 10 2019-07-07 16:19:17 +02:00
b99bd4a20a Bag window expands with available space 2019-07-07 16:19:17 +02:00
381b9cabd1 fmt 2019-07-07 16:19:17 +02:00
e66419b396 smaller border for available slots, item image size changed 2019-07-07 16:19:17 +02:00
991e4b15e5 fmt 2019-07-07 16:19:16 +02:00
03894cb2ab Comments on example item, removed printing of available inventory space No. 2019-07-07 16:19:16 +02:00
3ab01bd86b added visual test item 2019-07-07 16:19:16 +02:00
ff7fb032a4 fixed scaling of the slots 2019-07-07 16:19:16 +02:00
be64662b14 added active inventory slots 2019-07-07 16:19:16 +02:00
f4499e26af added visual test item 2019-07-07 16:19:15 +02:00
626978213f fixed scaling of the slots 2019-07-07 16:19:15 +02:00
12e7d749ec added active inventory slots 2019-07-07 16:19:15 +02:00
933063a8f4 Stopped server from building 2019-07-07 16:16:08 +02:00
8786b7b4b7 Tried added Discord feature right to final builds 2019-07-07 16:16:08 +02:00
377c80192f Test add Discord feature to build 2019-07-07 16:16:07 +02:00
07754b0a79 fmt 2019-07-07 16:16:07 +02:00
b4fe69be22 Fix warnings 2019-07-07 16:16:07 +02:00
8220564fa6 Fix rebasing issues 2019-07-07 16:16:07 +02:00
6fa086b964 remove expects, warnings, code duplication 2019-07-07 16:16:06 +02:00
2338084af0 Add Linux support 2019-07-07 16:16:06 +02:00
5ea624674d add comment and logging error 2019-07-07 16:16:06 +02:00
1be8f5e422 Update status according the play state 2019-07-07 16:16:05 +02:00
1e40bd09ba working discord presence 2019-07-07 16:16:05 +02:00
60500d9235 add discord feature with dependencies 2019-07-07 16:16:05 +02:00
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
9007f4aa5a Adjust volume on startup 2019-07-07 14:12:28 +00:00
6b7606bf98 Merge branch 'zesterer/worldgen' into 'master'
Fixed tree trimming

See merge request veloren/veloren!316
2019-07-07 10:43:10 +00:00
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
0ed35d3ef4 Fix rustc warning 2019-07-07 04:37:22 +00:00
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
5442bbfe62 Force CI to block on rustc warnings 2019-07-07 03:24:22 +00:00
1d8656cb7d Fixed tree trimming 2019-07-07 00:21:32 +01:00
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
abd07aea09 Improved z caching 2019-07-06 20:00:17 +01:00
3623871775 Initial implementation of z cache 2019-07-06 20:00:17 +01:00
6a484ce162 fmt 2019-07-06 20:00:17 +01:00
33b7e729c9 Added block picking 2019-07-06 20:00:17 +01:00
d2ccbafe59 Made mesh scheduling fairer 2019-07-06 20:00:17 +01:00
0c9843999b fmt 2019-07-06 20:00:17 +01:00
51ad1f1995 Improved remeshing performance 2019-07-06 20:00:17 +01:00
6709b18cb6 Made shadows darker 2019-07-06 20:00:17 +01:00
ef973faadf Throttled mesh scheduling to improve remesh performance 2019-07-06 20:00:17 +01:00
6fc2096dae Reenabled towns, lighter days 2019-07-06 20:00:17 +01:00
61568eac7c Better grass colour 2019-07-06 20:00:17 +01:00
1641c4f788 Added mesh worker queue limit to prevent throttling of meshing queue 2019-07-06 20:00:17 +01:00
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
1c10ff756f Holding weapon while running/jumping/standing 2019-07-06 19:00:05 +00:00