2482 Commits

Author SHA1 Message Date
Imbris
4137835750 Cache most recent chunk access in terrain meshing 2019-10-01 02:10:28 -04:00
Monty Marz
43d49aa6ce Merge branch 'Carbonhell/serverCancel' into 'master'
Adds a way to cancel a pending connection to a server.

Closes #254

See merge request veloren/veloren!521
2019-09-29 19:12:26 +00:00
Carbonhell
cf8c85006e Function to cancel pending server connections in the login screen. 2019-09-29 19:12:26 +00:00
Forest Anderson
64ce49daeb Merge branch 'angelonfira/remove-artifact-download-extra-zip' into 'master'
Prevent double zip with CI

Closes #232

See merge request veloren/veloren!519
2019-09-29 10:59:34 +00:00
Forest Anderson
f9f2df44d6 Prevent double zip with CI 2019-09-29 10:59:34 +00:00
Monty Marz
5f9ad89cb4 Merge branch 'pfauenauge/assets' into 'master'
Better stepping sounds (and minor voxel model fixes)

See merge request veloren/veloren!518
2019-09-27 16:04:22 +00:00
Monty Marz
15e9bf0ab5 Better stepping sounds (and minor voxel model fixes) 2019-09-27 16:04:22 +00:00
Joshua Barretto
87aa9d5e08 Merge branch 'zesterer/small-fixes' into 'master'
Zesterer/small fixes

See merge request veloren/veloren!517
2019-09-27 13:09:55 +00:00
Joshua Barretto
279685f84b Removed unnecessary code 2019-09-27 14:03:08 +01:00
Joshua Barretto
760daa551f Fixed cold near oceans, faster meshing 2019-09-27 12:46:20 +01:00
Joshua Barretto
bded33f1fa Made meshing considerably faster 2019-09-27 11:06:32 +01:00
Imbris
ea5233b793 Merge branch 'imbris/aa' into 'master'
Anti aliasing options

See merge request veloren/veloren!514
2019-09-27 05:00:38 +00:00
Imbris
60645612ac UI tweaks 2019-09-27 00:23:42 -04:00
Imbris
daf42cfef8 AA mode UI improvements 2019-09-26 23:46:49 -04:00
Imbris
01c446b496 Add aa modes, with ui interface to switch 2019-09-26 23:14:27 -04:00
Imbris
8397725cd2 Add MSAAx4 2019-09-26 23:14:27 -04:00
Joshua Barretto
3108f48eba Merge branch 'zesterer/worldgen' into 'master'
Lighting, worldgen, smooth shadows, colour blending

See merge request veloren/veloren!511
2019-09-26 16:10:11 +00:00
Joshua Barretto
7f33cf3a07 Resolved warnings 2019-09-26 16:07:09 +01:00
Pfauenauge90
258ffbca18 fixed merging issue, tooltip descriptions colour 2019-09-26 16:00:24 +02:00
Joshua Barretto
a8dcd8aba5 Added item descriptions to tooltip 2019-09-26 14:41:04 +01:00
Pfauenauge90
968ab48ede test tooltips 2019-09-26 15:16:58 +02:00
Pfauenauge90
d882024c57 fix 2019-09-26 15:16:57 +02:00
timokoesters
281a55a7a9 Fix rot_imgs and tooltip manager 2019-09-26 15:16:57 +02:00
Pfauenauge90
6d1293b439 added item tooltips 2019-09-26 15:16:57 +02:00
Joshua Barretto
98ed7416f7 Fixed typo 2019-09-26 14:03:41 +01:00
Joshua Barretto
6bf68e77e2 Resolved warnings 2019-09-26 13:34:15 +01:00
Joshua Barretto
35d6eeb491 Fixed cliff generation layer bug 2019-09-26 12:19:21 +01:00
Joshua Barretto
4997b5a685 Fixed build placement bug, changed climb to LControl 2019-09-26 12:03:39 +01:00
Joshua Barretto
91bcf09bb6 Added sprite selection 2019-09-26 11:43:03 +01:00
Joshua Barretto
d473a00957 Prevented pickups with full inventory 2019-09-26 00:15:07 +01:00
Joshua Barretto
44b82ae441 Don't consume unuseable items 2019-09-26 00:15:07 +01:00
Joshua Barretto
6409d35f9e Added flower and grass items 2019-09-26 00:15:07 +01:00
Joshua Barretto
ab639a151c Made velorite rarer 2019-09-26 00:15:07 +01:00
Joshua Barretto
07568eb0d2 Added block collection, improved controls for it 2019-09-26 00:15:07 +01:00
Joshua Barretto
04de98286e Added velorite 2019-09-26 00:15:07 +01:00
Vechro
882a4d18eb Remove player shadow on death 2019-09-26 00:15:07 +01:00
Joshua Barretto
97d27e8a36 Made consumable items have an effect, better damage animation 2019-09-26 00:15:07 +01:00
Joshua Barretto
d14c9ca1bb Added apple and mushroom collection 2019-09-26 00:15:07 +01:00
Joshua Barretto
11950f475f Fixed shadow distance culling 2019-09-26 00:15:07 +01:00
Joshua Barretto
5512dfbc02 Better sun halo colours 2019-09-26 00:15:07 +01:00
Joshua Barretto
f1b88f9e46 Better light attenuation 2019-09-26 00:15:07 +01:00
Joshua Barretto
23264db3bc Added entity shadows 2019-09-26 00:15:07 +01:00
Joshua Barretto
8d9e29e13b Resolved warnings 2019-09-26 00:15:07 +01:00
Joshua Barretto
83c38a82ff Dark water 2019-09-26 00:15:07 +01:00
Joshua Barretto
fbea91a924 Better day/night cycle, less intense sun 2019-09-26 00:15:07 +01:00
Pfauenauge90
25947a6bfd char selection time and VD changed 2019-09-26 00:15:07 +01:00
Joshua Barretto
bf1a6396c4 Fractional FXAA scaling 2019-09-26 00:15:07 +01:00
Joshua Barretto
65e04bcca3 Added persistent ambiance back 2019-09-26 00:15:07 +01:00
Joshua Barretto
84c89e8652 Grounded houses more 2019-09-26 00:15:07 +01:00
Joshua Barretto
7cb6b8429c Shorter houses 2019-09-26 00:15:07 +01:00