Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,426 Commits 151 Branches 18 Tags 2.1 GiB
de1cf1371c
Commit Graph

1426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pfauenauge90
de1cf1371c colour and camera corrections 2019-07-07 16:19:19 +02:00
Pfauenauge90
d4a6f0c202 camera changes and nametag colour 2019-07-07 16:19:18 +02:00
Pfauenauge
bd94baa125 Added crosshair TODO 2019-07-07 16:19:18 +02:00
Pfauenauge
d186c4031e Sharp crosshair (no multisampling) 2019-07-07 16:19:18 +02:00
Pfauenauge90
7455155198 more test items 2019-07-07 16:19:18 +02:00
Pfauenauge90
89cadf27be fix fonts 2019-07-07 16:19:18 +02:00
Pfauenauge90
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
Pfauenauge90
b99bd4a20a Bag window expands with available space 2019-07-07 16:19:17 +02:00
Pfauenauge90
381b9cabd1 fmt 2019-07-07 16:19:17 +02:00
Pfauenauge
e66419b396 smaller border for available slots, item image size changed 2019-07-07 16:19:17 +02:00
Pfauenauge
991e4b15e5 fmt 2019-07-07 16:19:16 +02:00
Pfauenauge
03894cb2ab Comments on example item, removed printing of available inventory space No. 2019-07-07 16:19:16 +02:00
Pfauenauge90
3ab01bd86b added visual test item 2019-07-07 16:19:16 +02:00
Pfauenauge90
ff7fb032a4 fixed scaling of the slots 2019-07-07 16:19:16 +02:00
Pfauenauge90
be64662b14 added active inventory slots 2019-07-07 16:19:16 +02:00
Pfauenauge90
f4499e26af added visual test item 2019-07-07 16:19:15 +02:00
Pfauenauge90
626978213f fixed scaling of the slots 2019-07-07 16:19:15 +02:00
Pfauenauge90
12e7d749ec added active inventory slots 2019-07-07 16:19:15 +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