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
Commit Graph

1426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pfauenauge90
d467108370 colour and camera corrections 2019-07-07 16:19:19 +02:00
Pfauenauge90
2c94720977 camera changes and nametag colour 2019-07-07 16:19:18 +02:00
Pfauenauge
8daabb2f67 Added crosshair TODO 2019-07-07 16:19:18 +02:00
Pfauenauge
ec305fbd30 Sharp crosshair (no multisampling) 2019-07-07 16:19:18 +02:00
Pfauenauge90
e60ae2dbdc more test items 2019-07-07 16:19:18 +02:00
Pfauenauge90
5cfcd15864 fix fonts 2019-07-07 16:19:18 +02:00
Pfauenauge90
7df995731d 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
ccb34a0189 Bag window expands with available space 2019-07-07 16:19:17 +02:00
Pfauenauge90
5ef93d1831 fmt 2019-07-07 16:19:17 +02:00
Pfauenauge
5242fe9d30 smaller border for available slots, item image size changed 2019-07-07 16:19:17 +02:00
Pfauenauge
8ff9f8ef69 fmt 2019-07-07 16:19:16 +02:00
Pfauenauge
b3d8a6b187 Comments on example item, removed printing of available inventory space No. 2019-07-07 16:19:16 +02:00
Pfauenauge90
f2f8d285af added visual test item 2019-07-07 16:19:16 +02:00
Pfauenauge90
98d24f0e24 fixed scaling of the slots 2019-07-07 16:19:16 +02:00
Pfauenauge90
2f91af6ea8 added active inventory slots 2019-07-07 16:19:16 +02:00
Pfauenauge90
0fbe0c562d added visual test item 2019-07-07 16:19:15 +02:00
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