Commit Graph

12214 Commits

Author SHA1 Message Date
tygyh
25e20b5fa0 Remove unecesssary lifetimes 2022-07-15 16:20:15 +02:00
tygyh
fb7bdd8bf8 Fix deprecated imports 2022-07-15 16:17:19 +02:00
tygyh
cbe4d9d807 Remove unused imports 2022-07-15 16:00:27 +02:00
tygyh
fefe745508 Reorder impl member order to match trait member order 2022-07-15 15:54:32 +02:00
tygyh
997a572647 Simplify assertions 2022-07-15 15:52:52 +02:00
Joshua Barretto
5b8bdb9c9c Cave entity spawns 2022-07-15 14:15:42 +01:00
tygyh
5e5698249b Remove unnecessarily qualified paths 2022-07-15 14:49:46 +02:00
Joshua Barretto
4ca1c9ddf4 Gems and ores 2022-07-15 08:43:35 +01:00
Joshua Barretto
1a3b1e48da Better cave shape variety 2022-07-15 08:43:35 +01:00
Joshua Barretto
3c5de2991b More consistent texturing code 2022-07-15 08:43:35 +01:00
Joshua Barretto
f4e50d18df Better ice 2022-07-15 08:43:35 +01:00
Joshua Barretto
a9c9a9d0d2 Ice caves 2022-07-15 08:43:35 +01:00
Joshua Barretto
e97d58011e Made trees and cave entrances play better 2022-07-15 08:43:35 +01:00
Joshua Barretto
629c4dbdb7 Prevented cave/water intersection 2022-07-15 08:43:35 +01:00
Joshua Barretto
f3cfff424d Distinct mushroom and leafy biomes 2022-07-15 08:43:34 +01:00
Joshua Barretto
7353c6f02b Better mushroom placement 2022-07-15 08:43:34 +01:00
Joshua Barretto
a39901d24c Better cave entrance locations 2022-07-15 08:43:34 +01:00
Joshua Barretto
9ad32b37e7 More efficient texture fetches 2022-07-15 08:43:34 +01:00
Joshua Barretto
07fc53f9bc No walls outside caves 2022-07-15 08:43:34 +01:00
Joshua Barretto
61792d4135 Apply AO 2022-07-15 08:43:34 +01:00
Joshua Barretto
2694f5f917 Fixed lava 2022-07-15 08:43:34 +01:00
Joshua Barretto
07ba4dcc33 Fixed particles for non-body entities, AO for non-volumetric illumination 2022-07-15 08:43:34 +01:00
Joshua Barretto
b5662163f0 Better lighting and verticality in caves 2022-07-15 08:43:33 +01:00
Joshua Barretto
59655451c9 Made particle spawning use interpolated position 2022-07-15 08:42:56 +01:00
Joshua Barretto
7463acc641 Moonbells in caves 2022-07-15 08:42:56 +01:00
Joshua Barretto
af10a3e6da No biomes near cave entrance 2022-07-15 08:42:56 +01:00
Joshua Barretto
b40095d867 Better mushroom cave biome 2022-07-15 08:42:56 +01:00
Joshua Barretto
1f979e4133 More biomes 2022-07-15 08:42:56 +01:00
Joshua Barretto
418839ee20 Biome improvements 2022-07-15 08:42:56 +01:00
Joshua Barretto
c6564e2c59 Better cave biomes 2022-07-15 08:42:56 +01:00
Joshua Barretto
2cce44fc36 Began work on caves2 2022-07-15 08:42:56 +01:00
Joshua Barretto
61573a7800 Merge branch 'zesterer-master-patch-60194' into 'master'
Fixed unrolling issue in rain shader

See merge request veloren/veloren!3479
2022-07-15 07:29:29 +00:00
Joshua Barretto
62d2982990 Made rainbows ultra only 2022-07-15 07:08:30 +00:00
Joshua Barretto
e34f080c91 Fixed unrolling issue in rain shader 2022-07-15 07:06:11 +00:00
Marcel
dc082f64de Merge branch 'zesterer-master-patch-44077' into 'master'
Fixed lightning point glow

See merge request veloren/veloren!3477
2022-07-14 22:41:25 +00:00
Joshua Barretto
964b315fc5 Fixed lightning point glow 2022-07-14 22:12:34 +00:00
Marcel
0ed066bd1d Merge branch 'xMAC94x/update_cache_image' into 'master'
update docker-ci-image to a newer version

See merge request veloren/veloren!3476
2022-07-14 20:39:21 +00:00
Marcel Märtens
3ac8c1c833 update docker-ci-image to a newer version 2022-07-14 22:23:24 +02:00
Christof Petig
2dce472d1f Merge branch 'christof/modular-weapon-prices' into 'master'
Implement material (de-)composition for modular weapons, add tusk+crest+pincer to price list

See merge request veloren/veloren!3469
2022-07-14 18:24:21 +00:00
Isse
5c7ed1e712 Merge branch 'vfoulon80/boat-loading-animation' into 'master'
Add a boat loading animation

See merge request veloren/veloren!3474
2022-07-14 07:17:30 +00:00
Treeco
68dd128b07 Merge branch 'DaforLynx/extra-stuff' into 'master'
Music, ambience tweaks, and more

See merge request veloren/veloren!3471
2022-07-14 00:55:35 +00:00
DaforLynx
194b1866c6 Music, ambience tweaks, and more 2022-07-14 00:55:35 +00:00
Isse
1e3b5383cf Merge branch 'zesterer/better-rain' into 'master'
Better rain

See merge request veloren/veloren!3464
2022-07-13 23:25:33 +00:00
Christof Petig
bb952fe755 rustfmt the last cleanup 2022-07-13 23:38:11 +02:00
Christof Petig
edfe6d887e final polish 2022-07-13 23:32:20 +02:00
Christof Petig
eab062450a clippy helped to get rid of one level of indirection 2022-07-13 23:27:17 +02:00
Christof Petig
d2aa9028ec clippy is right about this flat_map 2022-07-13 23:17:22 +02:00
Christof Petig
197f84a360 returning a vec creates much more readable code 2022-07-13 23:03:58 +02:00
Isse
4bcf7c7010 Merge branch 'isse/agent-aggro-fix' into 'master'
Fix agent aggression when not recieving damage from attack

Closes #1597

See merge request veloren/veloren!3473
2022-07-13 21:01:26 +00:00
Christof Petig
3bdeb77268 Full support for modular weapon in loot table read 2022-07-13 22:56:52 +02:00