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
2,387 Commits 151 Branches 18 Tags 2.1 GiB
97441cef39
Commit Graph

2387 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Shipsey
27f3bebe40 Char overhaul and asset update 2019-10-02 10:05:17 +00:00
Songtronix
c1a13ebe13 Merge branch 'shandley/gitignore-vscode' into 'master' 
Add additional .vscode/ entry to .gitignore as this was not working for some devs.

See merge request veloren/veloren!525
 2019-10-02 06:22:49 +00:00
Shane Handley
cb987ed850 Add additional .vscode/ entry to .gitignore as this was not working for som devs. 2019-10-02 15:17:16 +09:00
Joshua Barretto
9ef7036024 Merge branch 'imbris/mesh-speed' into 'master' 
Cache most recent chunk access in terrain meshing

See merge request veloren/veloren!522
 2019-10-01 08:23:25 +00:00
Imbris
83b5ca3335 Higher level cache abstraction 2019-10-01 02:10:28 -04:00
Imbris
89a1c45ac7 Cache most recent chunk access in terrain meshing 2019-10-01 02:10:28 -04:00
Monty Marz
ff82e77ec9 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
6f6fdd87af Function to cancel pending server connections in the login screen. 2019-09-29 19:12:26 +00:00
Forest Anderson
9b19fcc49b 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
a9771850d7 Prevent double zip with CI 2019-09-29 10:59:34 +00:00
Monty Marz
2ade20b347 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
11a022abb3 Better stepping sounds (and minor voxel model fixes) 2019-09-27 16:04:22 +00:00
Joshua Barretto
45fbd75907 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
8d2f1d470c Removed unnecessary code 2019-09-27 14:03:08 +01:00
Joshua Barretto
a90ceddde0 Fixed cold near oceans, faster meshing 2019-09-27 12:46:20 +01:00
Joshua Barretto
09197049cb Made meshing considerably faster 2019-09-27 11:06:32 +01:00
Imbris
315637c124 Merge branch 'imbris/aa' into 'master' 
Anti aliasing options

See merge request veloren/veloren!514
 2019-09-27 05:00:38 +00:00
Imbris
5ca65a6894 UI tweaks 2019-09-27 00:23:42 -04:00
Imbris
799e962663 AA mode UI improvements 2019-09-26 23:46:49 -04:00
Imbris
a3daa6065a Add aa modes, with ui interface to switch 2019-09-26 23:14:27 -04:00
Imbris
432e828517 Add MSAAx4 2019-09-26 23:14:27 -04:00
Joshua Barretto
b57031804e 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
ccc10a0447 Resolved warnings 2019-09-26 16:07:09 +01:00
Pfauenauge90
1a2b32b44b fixed merging issue, tooltip descriptions colour 2019-09-26 16:00:24 +02:00
Joshua Barretto
3a8b146687 Added item descriptions to tooltip 2019-09-26 14:41:04 +01:00
Pfauenauge90
de4af54928 test tooltips 2019-09-26 15:16:58 +02:00
Pfauenauge90
b62ae6f4a7 fix 2019-09-26 15:16:57 +02:00
timokoesters
1fc7c9b67b Fix rot_imgs and tooltip manager 2019-09-26 15:16:57 +02:00
Pfauenauge90
931e53ebbe added item tooltips 2019-09-26 15:16:57 +02:00
Joshua Barretto
bdf74cf151 Fixed typo 2019-09-26 14:03:41 +01:00
Joshua Barretto
81dc77c87b Resolved warnings 2019-09-26 13:34:15 +01:00
Joshua Barretto
b1d4ae7445 Fixed cliff generation layer bug 2019-09-26 12:19:21 +01:00
Joshua Barretto
59e6febb41 Fixed build placement bug, changed climb to LControl 2019-09-26 12:03:39 +01:00
Joshua Barretto
bef4f11536 Added sprite selection 2019-09-26 11:43:03 +01:00
Joshua Barretto
a6d5b82ef5 Prevented pickups with full inventory 2019-09-26 00:15:07 +01:00
Joshua Barretto
57a2313348 Don't consume unuseable items 2019-09-26 00:15:07 +01:00
Joshua Barretto
a2758b091c Added flower and grass items 2019-09-26 00:15:07 +01:00
Joshua Barretto
7f4e587215 Made velorite rarer 2019-09-26 00:15:07 +01:00
Joshua Barretto
dff67e1c41 Added block collection, improved controls for it 2019-09-26 00:15:07 +01:00
Joshua Barretto
e22fe81a2f Added velorite 2019-09-26 00:15:07 +01:00
Vechro
deec1e6bca Remove player shadow on death 2019-09-26 00:15:07 +01:00
Joshua Barretto
f57c2ec453 Made consumable items have an effect, better damage animation 2019-09-26 00:15:07 +01:00
Joshua Barretto
a961a267f1 Added apple and mushroom collection 2019-09-26 00:15:07 +01:00
Joshua Barretto
b0a1619698 Fixed shadow distance culling 2019-09-26 00:15:07 +01:00
Joshua Barretto
7e6eede740 Better sun halo colours 2019-09-26 00:15:07 +01:00
Joshua Barretto
6dbeda3267 Better light attenuation 2019-09-26 00:15:07 +01:00
Joshua Barretto
499344ccab Added entity shadows 2019-09-26 00:15:07 +01:00
Joshua Barretto
50daf185a8 Resolved warnings 2019-09-26 00:15:07 +01:00
Joshua Barretto
899a7c56ab Dark water 2019-09-26 00:15:07 +01:00
Joshua Barretto
207568a012 Better day/night cycle, less intense sun 2019-09-26 00:15:07 +01:00