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,897 Commits 151 Branches 18 Tags
Commit Graph

1897 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Barretto
85b3b849bb Merge branch 'zesterer/instancing' into 'master' 
Instancing (block sprites)

See merge request veloren/veloren!450
 2019-08-22 11:10:57 +00:00
Pfauenauge90
a0dd7c295a colour tweaks 2019-08-21 20:43:38 +02:00
Joshua Barretto
ea8aaf6cae Added cacti 2019-08-21 19:18:16 +01:00
Joshua Barretto
deabbb8835 Better plant grouping distribution 2019-08-21 18:56:46 +01:00
Timo Koesters
425ff62fef Merge branch 'velocity-fix' into 'master' 
Fix velocity when stuck

See merge request veloren/veloren!453
 2019-08-21 17:42:02 +00:00
Vechro
83c4232279 Fix wielding jump issue 2019-08-21 20:34:21 +03:00
Joshua Barretto
7e924d89a9 Merge branch 'pfauenauge/plants_grass' into 'zesterer/instancing' 
Pfauenauge/plants grass

See merge request veloren/veloren!452
 2019-08-21 17:22:05 +00:00
Monty Marz
01eb26206f Pfauenauge/plants grass 2019-08-21 17:22:05 +00:00
Vechro
3ec1c7e738 Fix velocity when stuck 2019-08-21 20:17:19 +03:00
Joshua Barretto
59422c8c63 Better wind waving, improved sun ambiance 2019-08-21 17:03:03 +01:00
Joshua Barretto
a5876ece59 Random terrain sprite orientations 2019-08-21 16:22:49 +01:00
Joshua Barretto
e402bd9338 Added per-instance transformation matrix, variable wind swaying 2019-08-21 13:47:29 +01:00
Joshua Barretto
f2ab179e1c Fixed sprite mesh offsets 2019-08-20 16:54:12 +01:00
Joshua Barretto
e3cbbd2fbb Better sunset colours, stars no longer reflect in water 2019-08-20 16:26:12 +01:00
Joshua Barretto
f0fa7b7045 More grass 2019-08-20 12:06:41 +01:00
Joshua Barretto
e5865e3844 Sprite render distance tweaks and optimisations 2019-08-20 11:05:01 +01:00
Joshua Barretto
b9202f7264 Patchier plants, wind swaying 2019-08-20 11:05:01 +01:00
Demonic
2a700cacea Update flowers.vox 
made sunflowers smaller
 2019-08-19 20:09:48 -04:00
Joshua Barretto
e3f66f5ec6 Switched to singular flower 2019-08-20 00:53:22 +01:00
Demonic
acf117442e Seperated Flowers 2019-08-19 19:44:44 -04:00
Joshua Barretto
baf42f2203 Added multiple sprite block kind support 2019-08-20 00:31:11 +01:00
Joshua Barretto
7e5222e75b Sprite distance fading, grass 2019-08-19 22:54:16 +01:00
Joshua Barretto
9b647993f0 Added wheat and sprite rendering 2019-08-19 21:09:35 +01:00
Joshua Barretto
333c824402 Added Instances construct 2019-08-19 18:23:47 +01:00
Joshua Barretto
898579f693 Added sprite pipeline 2019-08-19 18:01:23 +01:00
Joshua Barretto
2ea30a0dfe Merge branch 'xacrimon/lotsafixes' into 'master' 
Eliminated unsafe and disabled it with lint levels.

See merge request veloren/veloren!449
 2019-08-19 13:25:55 +00:00
Acrimon
724d6dffb4 Disabled unsafe using lint level. 2019-08-19 14:39:23 +02:00
Acrimon
c6020257f1 Eliminated unsafe. 2019-08-19 14:33:31 +02:00
Marcel
786123602b Merge branch 'console-spam-hot-fix' into 'master' 
Fix low fps

See merge request veloren/veloren!448
 2019-08-19 08:03:20 +00:00
Monty Marz
31bd17c810 Fix low fps 2019-08-19 08:03:19 +00:00
Joshua Barretto
cdb2a8561b Merge branch 'pfauenauge/ui-additions' into 'master' 
Hotbar rework

See merge request veloren/veloren!438
 2019-08-18 18:07:21 +00:00
Monty Marz
01143930db hotbar changes 
completely switched to. vox files

easier to see design

gradient and numbers on the health/mana bar
 2019-08-18 18:07:21 +00:00
Joshua Barretto
af89cc321b Merge branch 'overclockx64/fluids' into 'master' 
Fluids

See merge request veloren/veloren!436
 2019-08-18 15:01:55 +00:00
Joshua Barretto
da91572a37 Renamed normal StructureBlock variant 2019-08-18 15:33:16 +01:00
Joshua Barretto
8c3ada36a7 Cleanup, comments 2019-08-18 10:33:18 +01:00
Joshua Barretto
02a01fd959 More interesting waves 2019-08-18 10:33:18 +01:00
Vechro
d185d8628a Dungeon fixes 2019-08-18 10:33:18 +01:00
Joshua Barretto
90630a4edc Added default block kind to structure loading 2019-08-18 10:33:18 +01:00
Vechro
4a92bfba73 Add water-based dungeons 2019-08-18 10:33:18 +01:00
Joshua Barretto
56bfefa477 Better reflections and water fog 2019-08-18 10:33:18 +01:00
Joshua Barretto
e02a2142cf Fixed water in caves, made water reflection vary with lighting 2019-08-18 10:33:18 +01:00
Joshua Barretto
3c214c62a8 Better reflection calculations 2019-08-18 10:33:18 +01:00
Vechro
24ad51a6fb Add green sludge special index 2019-08-18 10:33:18 +01:00
Vechro
3817db94cc Add water special index 2019-08-18 10:33:18 +01:00
Joshua Barretto
e249620446 Better waves 2019-08-18 10:33:18 +01:00
Joshua Barretto
072d14045f Better fluid meshing, disabled fluid backface culling and depth buffer writing 2019-08-18 10:33:18 +01:00
Joshua Barretto
c1f269930a Added translucent meshing pass, water reflections 2019-08-18 10:33:18 +01:00
Luc Fauvel
faa3664559 Copying terrain pipeline and shaders for fluids 2019-08-18 10:33:18 +01:00
Joshua Barretto
b12867e5cb Merge branch 'slipped-shoulders' into 'master' 
shoulder improvement

See merge request veloren/veloren!446
 2019-08-18 09:09:09 +00:00
jshipsey
c57b0c6038 removed wield slowdown by popular request 2019-08-18 03:26:52 -04:00