|
|
cdb2a8561b
|
Merge branch 'pfauenauge/ui-additions' into 'master'
Hotbar rework
See merge request veloren/veloren!438
|
2019-08-18 18:07:21 +00:00 |
|
|
|
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 |
|
|
|
10f959b9dd
|
WIP for humidity.
|
2019-08-18 18:35:27 +02:00 |
|
|
|
af89cc321b
|
Merge branch 'overclockx64/fluids' into 'master'
Fluids
See merge request veloren/veloren!436
|
2019-08-18 15:01:55 +00:00 |
|
|
|
da91572a37
|
Renamed normal StructureBlock variant
|
2019-08-18 15:33:16 +01:00 |
|
|
|
8c3ada36a7
|
Cleanup, comments
|
2019-08-18 10:33:18 +01:00 |
|
|
|
02a01fd959
|
More interesting waves
|
2019-08-18 10:33:18 +01:00 |
|
|
|
d185d8628a
|
Dungeon fixes
|
2019-08-18 10:33:18 +01:00 |
|
|
|
90630a4edc
|
Added default block kind to structure loading
|
2019-08-18 10:33:18 +01:00 |
|
|
|
4a92bfba73
|
Add water-based dungeons
|
2019-08-18 10:33:18 +01:00 |
|
|
|
56bfefa477
|
Better reflections and water fog
|
2019-08-18 10:33:18 +01:00 |
|
|
|
e02a2142cf
|
Fixed water in caves, made water reflection vary with lighting
|
2019-08-18 10:33:18 +01:00 |
|
|
|
3c214c62a8
|
Better reflection calculations
|
2019-08-18 10:33:18 +01:00 |
|
|
|
24ad51a6fb
|
Add green sludge special index
|
2019-08-18 10:33:18 +01:00 |
|
|
|
3817db94cc
|
Add water special index
|
2019-08-18 10:33:18 +01:00 |
|
|
|
e249620446
|
Better waves
|
2019-08-18 10:33:18 +01:00 |
|
|
|
072d14045f
|
Better fluid meshing, disabled fluid backface culling and depth buffer writing
|
2019-08-18 10:33:18 +01:00 |
|
|
|
c1f269930a
|
Added translucent meshing pass, water reflections
|
2019-08-18 10:33:18 +01:00 |
|
|
|
faa3664559
|
Copying terrain pipeline and shaders for fluids
|
2019-08-18 10:33:18 +01:00 |
|
|
|
b12867e5cb
|
Merge branch 'slipped-shoulders' into 'master'
shoulder improvement
See merge request veloren/veloren!446
|
2019-08-18 09:09:09 +00:00 |
|
|
|
c57b0c6038
|
removed wield slowdown by popular request
|
2019-08-18 03:26:52 -04:00 |
|
|
|
7fed6586c4
|
added shoulder movement and fixed placement
|
2019-08-18 02:35:27 -04:00 |
|
|
|
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 |
|
|
|
86d8178f38
|
Removed unsafe.
|
2019-08-19 00:55:04 +02:00 |
|
|
|
e98a58d831
|
Cleaner solution.
|
2019-08-19 00:46:24 +02:00 |
|
|
|
a4c950424c
|
Ran fmt.
|
2019-08-19 00:20:56 +02:00 |
|
|
|
da31643b86
|
Fixed seed expansion for noise seeding.
|
2019-08-19 00:19:51 +02:00 |
|
|
|
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 |
|
|
|
84ad0a1a86
|
Add adminify command to temporarily give admin perms
|
2019-08-17 23:35:01 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
cf8f2e1abc
|
cargo fmt
|
2019-08-17 00:11:06 +08:00 |
|
|
|
06a912c2e5
|
unwrap_or instead of map_or
|
2019-08-17 00:08:09 +08:00 |
|
|
|
287cf5cb77
|
use entity scale as hitbox for frustrum culling
|
2019-08-16 23:39:07 +08:00 |
|
|
|
27824c636e
|
Replace view distance culling with frustum culling
|
2019-08-16 21:45:10 +08:00 |
|
|
|
685a31a747
|
remove palette dependency
|
2019-08-16 00:01:20 -04:00 |
|
|
|
bdbe967a88
|
Fix typo, move shaders back out of subfolders
|
2019-08-15 23:59:10 -04:00 |
|
|
|
1037dece2f
|
Lighter
|
2019-08-15 23:59:09 -04:00 |
|
|
|
093f6baa8d
|
Tweak lighting
|
2019-08-15 23:59:09 -04:00 |
|
|
|
ec28d628bd
|
Improve colors
|
2019-08-15 23:59:09 -04:00 |
|
|
|
8c99796e1d
|
Increase saturation of some colors
|
2019-08-15 23:56:15 -04:00 |
|
|
|
189a9058e2
|
update ci for new shader position
|
2019-08-15 23:56:14 -04:00 |
|
|
|
d1e017557b
|
move conversion to fragment shader
|
2019-08-15 23:56:14 -04:00 |
|
|
|
3988daed39
|
Add srgb converion in shaders
|
2019-08-15 23:56:14 -04:00 |
|
|
|
d71cc31e29
|
Handle errors in file watching
|
2019-08-15 23:56:13 -04:00 |
|
|
|
35d490bc1e
|
Move shaders, start asset reloading system
|
2019-08-15 23:56:12 -04:00 |
|
|
|
89b90ca79e
|
Merge branch 'xacrimon/fast-chan-mpsc-bad' into 'master'
Switch mpsc and std mutexes to faster alternatives.
See merge request veloren/veloren!440
|
2019-08-15 22:54:21 +00:00 |
|
|
|
7453e7f288
|
[Common] Switch mutexes and channels.
|
2019-08-16 00:19:54 +02:00 |
|
|
|
4c575c14ff
|
[Server] Switched mpsc for crossbeam::channel.
|
2019-08-16 00:10:46 +02:00 |
|
|
|
dc1e4d1ae8
|
[Voxygen] Switch mutexes to parking_lot and channels to crossbeam.
|
2019-08-16 00:07:09 +02:00 |
|
