Benoît du Garreau
aca088388b
Update assets_manager to 0.7
2021-12-12 22:11:47 +01:00
Jonathan Berglin
596307c9b7
Remove unused clippy suppressions
2021-12-05 17:59:02 +00:00
Dr. Dystopia
c002e5e749
Resolve all '#[allow(clippy::eval_order_dependence)]' error supressions
2021-12-03 19:44:41 +01:00
Dr. Dystopia
5d1d510d54
Resolve all '#[allow(clippy::redundant_static_lifetimes)]' error supressions
2021-12-03 10:43:09 +01:00
Jonathan Berglin
d9dd49552b
Tygyh/resolve all '# allow(clippy needless update)]' error supressions
2021-11-29 09:32:55 +00:00
Imbris
7760210824
Remove redundant closures
2021-11-28 12:24:57 -05:00
Treeco
3a998ca5b9
Merge branch 'isse/primitive-fixes' into 'master'
...
Primitive fixes
See merge request veloren/veloren!3016
2021-11-27 19:02:12 +00:00
Marcel
724e3bcdfd
Merge branch 'capucho/tracing-bump' into 'master'
...
Bump tracing-subscriber to 0.3.2
See merge request veloren/veloren!3032
2021-11-27 11:11:47 +00:00
João Capucho
8b89903d57
Bump tracing-subscriber to 0.3.2
...
We were pulling two versions of it. Causing some compilation errors
2021-11-26 17:41:51 +00:00
Marcel Märtens
ef40ebe0c8
update toolchain to nightly-2021-11-24
2021-11-24 10:09:22 +01:00
Marcel Märtens
aa93b4b53c
update other binaries
2021-11-20 20:19:48 +01:00
Marcel Märtens
e29ede7c97
updating dependencies,
...
cannot update the following dependencies:
- vek: Sharps SIMD isnt upstream
- tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes,
- refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql
- equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update
- wgpu: cant update due new version doesnt support DX11
Got quinn updated which now require some dependencies to be explicit.
2021-11-20 20:17:49 +01:00
IsseW
7eaddcafad
Ok just call it without
2021-11-20 13:13:21 +01:00
Treeco
3018942291
Merge branch 'juliancoffee/resizeable_map' into 'master'
...
Add size parameter to map_file opts
See merge request veloren/veloren!2975
2021-11-19 22:50:24 +00:00
IsseW
88840fe58d
Change "and_not" and "diff" to "subtract"
2021-11-19 23:38:33 +01:00
IsseW
4b6f3ddeea
Intersect instad of union in pyramid
2021-11-17 14:32:07 +01:00
IsseW
07da6a9271
Rename 'and' to 'intersect' and 'or' to 'union'
2021-11-17 14:11:20 +01:00
Joshua Barretto
db741fe4c0
Added waypoints to towns
2021-11-13 17:13:09 +00:00
DemonicOnPc
b7ac542ebb
fixes to branch after my whoops
2021-11-08 17:09:19 -05:00
DemonicOnPc
a9cedee277
Update scatter.rs
2021-11-08 17:09:17 -05:00
DemonicOnPc
7fc57c027b
Fixes to jungle sprites and lillypads
2021-11-08 17:09:15 -05:00
DemonicOnPc
9514cd71c6
Jungle and River update
...
-Added Lillypads to rivers
-Added new types of reeds
-Added reeds to water
-Added more Ferns/Flowers/Plants to jungles
2021-11-08 17:09:11 -05:00
Joshua Barretto
6b4abddc4e
Added floating scatter
2021-11-08 17:04:45 -05:00
Joshua Barretto
de087ae992
Added site2 worldgen feature
2021-11-01 22:53:38 +00:00
Joshua Barretto
16889b2b3e
Fixed house supports
2021-11-01 22:19:49 +00:00
Joshua Barretto
0cb88139c9
Made merchants work in new sites
2021-11-01 22:19:49 +00:00
Joshua Barretto
4b8bf94320
Used correct entity configs
2021-11-01 22:19:49 +00:00
Joshua Barretto
4acffb9cfb
New CSG API for site2
2021-11-01 22:19:49 +00:00
Joshua Barretto
e3ab8fc8ce
Added rtsim merchants to site2
2021-11-01 22:19:49 +00:00
Joshua Barretto
bacb2aa504
Better town layout
2021-11-01 22:19:49 +00:00
Joshua Barretto
4a9581b54d
Fixed house entrances
2021-11-01 22:19:49 +00:00
Joshua Barretto
8e2ca9cdec
Added rtsim villagers to site2 towns
2021-11-01 22:19:49 +00:00
Samuel Keiffer
e692f49463
Merge branch 'sam/potion-tweaks' into 'master'
...
Potion tweaks
See merge request veloren/veloren!2976
2021-10-31 21:12:08 +00:00
jshipsey
f69e3c9fbc
more hats
2021-10-30 23:42:17 -04:00
Treeco
e380425001
Add continent_scale_hack setting
2021-10-30 16:40:37 +01:00
Sam
ad257410e9
Merchants now have less potion stock.
2021-10-29 19:58:38 -04:00
juliancoffee
84e04fa906
Add size parameter to map_file opts
2021-10-30 01:06:40 +03:00
Monty Marz
727295aec1
text and alignment WIP
2021-10-27 17:02:35 -04:00
Monty Marz
7aae35f286
bench
2021-10-27 17:02:31 -04:00
DemonicOnPc
a74af55c46
Gemu's Revamped vox models added.
2021-10-26 05:28:05 -04:00
DemonicOnPc
8f26c451ae
Added shrub density within specific regions
2021-10-25 16:20:49 -04:00
DemonicOnPc
b1476071b1
Added new Spots, Shrubs and Ships.
...
Spots
- Gnarling Tree
- Troll Cave
- Underwater Shipwreck second variation.
Shrubs added to biomes
- Savannah Shrubs
- Taiga Shrubs
- Temperate Shrubs
Galleon ship added
2021-10-24 08:10:44 -04:00
Joshua Barretto
3357008601
Merge branch 'zesterer/small-fixes' into 'master'
...
Caverns
See merge request veloren/veloren!2763
2021-10-16 09:33:57 +00:00
Joshua Barretto
f9b661fc61
Corrected historical typo
2021-10-15 22:47:43 +01:00
MohammadHasanKargar
c82b3859e0
Deleting extra grasses on the air
2021-10-15 19:09:36 +03:30
Joshua Barretto
e660aafed3
Nicer lake borders
2021-10-10 13:41:57 +01:00
Joshua Barretto
1473029204
Added ability to toggle world features
2021-10-10 13:41:57 +01:00
Joshua Barretto
bee922156e
Added radial pattern to shrooms
2021-10-10 13:41:57 +01:00
Joshua Barretto
d09f1e1c4a
Added noise to blocks
2021-10-10 13:41:57 +01:00
Joshua Barretto
086097cd56
Better vines and lighting
2021-10-10 13:41:57 +01:00
