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

2086 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 Yanovski
3056007924 Smoother blending into sand. 2019-08-19 19:46:47 +02:00
Joshua Barretto
333c824402 Added Instances construct 2019-08-19 18:23:47 +01:00
Joshua Yanovski
46f588bc39 t merge Merge branch 'master' of gitlab.com:veloren/veloren into sharp/jungle 2019-08-19 19:21:05 +02:00
Joshua Yanovski
86d48f3c39 Fixing visual issues. 2019-08-19 19:20:54 +02: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
Joshua Yanovski
fdddb6c637 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/jungle 2019-08-19 11:04:09 +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 Yanovski
2bb8a59118 Smoothed some things out. 2019-08-19 05:22:39 +02:00
Joshua Yanovski
08646cd9a4 Billow tweaks. 2019-08-19 03:41:32 +02:00
Joshua Yanovski
7036ca88d4 Fixing some colors. 2019-08-19 03:01:11 +02:00
Joshua Yanovski
bdbe3d2f42 Making jungles work. 2019-08-19 01:52:26 +02: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 Yanovski
10f959b9dd WIP for humidity. 2019-08-18 18:35:27 +02: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
jshipsey
7fed6586c4 added shoulder movement and fixed placement 2019-08-18 02:35:27 -04:00
Joshua Barretto
e4edb1d5e6 Merge branch 'xacrimon/fix-worldgen-seed-expansion' into 'master' 
Fixed seed expansion for noise seeding.

See merge request veloren/veloren!445
 2019-08-17 23:10:59 +00:00
Acrimon
86d8178f38 Removed unsafe. 2019-08-19 00:55:04 +02:00
Acrimon
e98a58d831 Cleaner solution. 2019-08-19 00:46:24 +02:00
Acrimon
a4c950424c Ran fmt. 2019-08-19 00:20:56 +02:00
Acrimon
da31643b86 Fixed seed expansion for noise seeding. 2019-08-19 00:19:51 +02:00
Joshua Barretto
e074de9336 Merge branch 'qutrin/adminify-command' into 'master' 
Add adminify command to temporarily give admin perms

See merge request veloren/veloren!444
 2019-08-17 21:46:02 +00:00
Piotr Korgól
84ad0a1a86 Add adminify command to temporarily give admin perms 2019-08-17 23:35:01 +02:00
Imbris
0d6e1999ff Merge branch 'imbris/srgb' into 'master' 
Handle srgb values more accurately, Load shaders at runtime + hotloading

Closes #79

See merge request veloren/veloren!412
 2019-08-16 22:44:14 +00:00
Joshua Barretto
bf27fa724a Merge branch 'scott-c/cull-entities-outside-viewport' into 'master' 
Scott c/cull entities outside viewport

Closes #207

See merge request veloren/veloren!442
 2019-08-16 16:47:02 +00:00
scott-c
cf8f2e1abc cargo fmt 2019-08-17 00:11:06 +08:00