1468 Commits

Author SHA1 Message Date
Joshua Barretto
56b8201a37 Smoothed temperate/savannah border 2019-07-09 00:35:59 +01:00
Joshua Barretto
79d968fb01 Made cliff detection more tolerant 2019-07-09 00:31:43 +01:00
Joshua Barretto
facb3a71f5 Better savannah colours 2019-07-09 00:09:04 +01:00
Joshua Barretto
cef921ff4a Improved sunset shaders 2019-07-08 22:38:31 +01:00
Joshua Barretto
fddb22223b Colour improvements 2019-07-08 22:10:48 +01:00
Joshua Barretto
8b3e92576f Fixed acacia colours 2019-07-08 20:28:48 +01:00
Joshua Barretto
03bc18503b Re-added oceans 2019-07-08 20:08:08 +01:00
Joshua Barretto
fc820cd73c Added large ribcages in deserts 2019-07-08 17:57:41 +01:00
Joshua Barretto
ddeead6770 Added acacia trees, desert bones, fixed minor worldgen issues 2019-07-08 17:41:20 +01:00
Joshua Barretto
579130297c Fixed tree clipping and several other minor issues 2019-07-08 17:00:50 +01:00
Joshua Barretto
5b4e95bb86 Improved worldgen performance with more precise z bound checks 2019-07-08 15:51:38 +01:00
Joshua Barretto
2d3d3cb09a Restructured mountain profile 2019-07-08 01:49:54 +01:00
Joshua Barretto
a1d8c9794b Rescaled mountains 2019-07-08 00:50:36 +01:00
Joshua Barretto
0d81243227 Added rare structures, totally refactored structure spawning 2019-07-08 00:50:36 +01:00
Joshua Barretto
4db088ab57 Made temperature biomes larger, added savannah ground 2019-07-08 00:50:36 +01:00
Joshua Barretto
c651807b70 Merge branch 'slipped/substates' into 'master'
substates

See merge request veloren/veloren!319
2019-07-07 23:38:04 +00:00
jshipsey
85b9cefda1 removed weapon_id attribs, replaced with matches 2019-07-07 19:24:20 -04:00
jshipsey
28731d62ca fmt 2019-07-07 18:06:29 -04:00
jshipsey
b4656a60a5 adds support for animation substates, animates run/idle/jump for hammer 2019-07-07 18:04:27 -04:00
Forest Anderson
4459d4674d Merge branch 'inventory-items' into 'master'
crosshair changes (WIP!), inventory visuals, camera changes, savannah trees

See merge request veloren/veloren!317
2019-07-07 15:42:50 +00:00
Forest Anderson
c4d6d94f29 Merge branch 'songtronix/veloren-discord-rich-presence' into 'master'
Added discord presence

See merge request veloren/veloren!214
2019-07-07 15:38:54 +00:00
Pfauenauge90
0843c48e18 fmt 2019-07-07 17:31:34 +02:00
Pfauenauge90
b83a89eb63 clean up 2019-07-07 16:19:20 +02:00
Pfauenauge90
6b9af80d54 fmt 2019-07-07 16:19:20 +02:00
Pfauenauge90
3c60d7f682 acacia trees 2019-07-07 16:19:20 +02:00
Pfauenauge90
f164679649 ui scaling relative to window size 2019-07-07 16:19:20 +02:00
Pfauenauge90
f792ac1568 less numbers for the indicator text 2019-07-07 16:19:20 +02:00
Pfauenauge90
96ffda2458 fix 2019-07-07 16:19:19 +02:00
Pfauenauge90
a96bbde606 Crosshair transp slider 2019-07-07 16:19:19 +02:00
Pfauenauge90
fab9fb417f crosshair correction 2019-07-07 16:19:19 +02:00
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
64b763d02a Stopped server from building 2019-07-07 16:16:08 +02:00
Forest Anderson
992152da1b Tried added Discord feature right to final builds 2019-07-07 16:16:08 +02:00