James Melkonian
04bdcf2924
Add cubic bezier curve function
2022-01-31 16:13:45 -08:00
James Melkonian
b41f86ab99
More CSG primitives
2022-01-31 16:13:45 -08:00
Justin Shipsey
612f084831
Merge branch 'slipped/bipeds' into 'master'
...
Slipped/bipeds
See merge request veloren/veloren!3163
2022-01-31 17:08:01 +00:00
Joshua Barretto
1b9488186e
Merge branch 'treeco/realign-workshop' into 'master'
...
Realign workshops
See merge request veloren/veloren!3168
2022-01-30 23:27:50 +00:00
Treeco
ba7251c7e3
Realign workshops
2022-01-30 22:45:56 +00:00
Marcel Märtens
201a5ac2c7
stricten some rules and fix some clippy warnings
2022-01-30 20:16:21 +01:00
Avi Weinstock
f3f08936d8
Decrease too-many-arguments-threshold and type-complexity-threshold.
2022-01-30 20:16:21 +01:00
Avi Weinstock
5f8957d8ef
Globally allow the clippy lints {new_without_default, many_single_char_names, identity_op, type_complexity, too_many_arguments}.
2022-01-30 20:16:20 +01:00
jshipsey
7cac4b4001
myrmidon fix
2022-01-30 02:02:23 -05:00
jshipsey
7827797106
weapon tweaks
2022-01-30 01:10:13 -05:00
Samuel Keiffer
fe532cf536
Merge branch 'isse/repeat-primitive' into 'master'
...
Repeat CSG primitive and float line segment
See merge request veloren/veloren!3158
2022-01-28 20:04:45 +00:00
Isidor Nielsen
6f99e70cca
Repeat CSG primitive and float line segment
2022-01-28 20:04:45 +00:00
Joshua Barretto
d8c4284a32
Merge branch 'zesterer/worldgen' into 'master'
...
Improvements to site2
See merge request veloren/veloren!3159
2022-01-28 17:14:07 +00:00
Joshua Barretto
15c5f2f969
Better paths in snow
2022-01-28 16:45:58 +00:00
Joshua Barretto
5b3d826396
Better hazard checks
2022-01-28 15:17:56 +00:00
Joshua Barretto
cb45cea6a0
Merge branch 'fix-dungeon-collision' into 'master'
...
Fix dungeon collision
See merge request veloren/veloren!3131
2022-01-28 14:07:01 +00:00
Joshua Barretto
69436db64c
Added wall lamps
2022-01-28 13:58:41 +00:00
threadexception
9822abf9ba
Fix dungeon collision
2022-01-28 13:59:49 +01:00
Joshua Barretto
e991ff7d6d
More precise path placement
2022-01-28 11:56:07 +00:00
jshipsey
4fbd3027a1
new mobs
2022-01-28 02:50:15 -05:00
juliancoffee
6ae25d5956
Require rng from EntityInfo::with_asset_expect
2022-01-28 00:02:34 +02:00
juliancoffee
79a04c3533
fmt
2022-01-28 00:02:34 +02:00
juliancoffee
5a370cb6f7
Loadout Update: Use
...
Delete guard and villager lazy_loadout and use LoadoutKind::Extended
with potions instead
2022-01-28 00:02:34 +02:00
Joshua Barretto
e329100455
Prevent workshops destroying their neighbours
2022-01-27 19:37:24 +00:00
Joshua Barretto
548591b561
Merge branch 'more_biome_namegen_bricks' into 'master'
...
more biome namegen bricks
See merge request veloren/veloren!3148
2022-01-27 12:02:31 +00:00
Joshua Barretto
692855198e
Improved terrain in sites
2022-01-27 11:48:41 +00:00
floppy
d2e84fb936
- use common fn generate_from_parts to generate biome-names
...
- arrays for bricks instead of vecs
2022-01-27 12:29:34 +01:00
floppy
52c4c170fc
- use common fn generate_from_parts to generate biome-names
...
- arrays for bricks instead of vecs
2022-01-27 12:25:17 +01:00
infrandomness
1a1acfae2c
Fix RUSTSEC-2022-0006
2022-01-26 22:08:38 +01:00
juliancoffee
4fe5fdad4a
Move world to 2021 edition
2022-01-26 16:03:27 +02:00
floppy
87ea7a906a
more biome namegen bricks
2022-01-26 14:58:48 +01:00
InfRandomness
52c92ba0d4
Give names to site2 sites
2022-01-26 11:42:35 +00:00
Dominik Broński
ca7b048184
Merge branch 'SeaCrocodile' into 'master'
...
Sea crocodile
See merge request veloren/veloren!3146
2022-01-26 01:26:38 +00:00
Joshua Barretto
59ac3b1d4f
Fixed site2 economies
2022-01-25 16:31:12 +00:00
floppy
ea6f09ec88
change SeaCrocodile spawn
2022-01-25 10:27:25 +01:00
floppy
fb316e8f66
SeaCrocodile spawning in tropical Oceans
2022-01-24 19:36:13 +01:00
Joshua Barretto
9601462f6c
Merge branch 'name_areas_based_on_biome' into 'master'
...
fix Swamp-naming
See merge request veloren/veloren!3124
2022-01-20 21:17:13 +00:00
floppy
d47e06baac
- fix Swamp-naming
2022-01-20 21:46:51 +01:00
Joshua Barretto
4f181c936d
Merge branch 'name_areas_based_on_biome' into 'master'
...
name_areas_based_on_biome
See merge request veloren/veloren!3115
2022-01-20 19:50:57 +00:00
floppy
8f0ad56d25
change algorithm for biome-naming to weigh chunks evenly
2022-01-20 20:08:59 +01:00
floppy
9f0664c73b
civ/mod.rs - replace duplicate code
2022-01-20 16:17:40 +01:00
Snowram
a6e396e29a
Stunned and jump anims, stats, spawns, more IA work
2022-01-20 00:53:29 +01:00
Snowram
f6d7ba33ef
Arthropods spawns and loots
2022-01-19 19:01:16 +01:00
floppy
ceb3507e50
-remove line breaks from biome names
...
-disable Wilderness world message in unspecified mini-biomes
-remove duplicate name in Grasslands name pattern
2022-01-18 11:27:55 +01:00
IsseW
40580578a0
Don't add unnecessary biome pois
2022-01-18 10:07:40 +01:00
floppy
4a8c428a3f
update/add namegen-bricks for forest and grassland
2022-01-18 08:36:40 +01:00
floppy
1a5c1ae319
length comparison to zero in /civ/mod.rs
...
warning: length comparison to zero
--> world/src/civ/mod.rs:482:15
|
482 | while to_explore.len() > 0 {
| ^^^^^^^^^^^^^^^^^^^^ help: using `!is_empty` is clearer and more explicit: `!to_explore.is_empty()`
|
= note: `#[warn(clippy::len_zero)]` on by default
= help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#len_zero
warning: length comparison to zero
--> world/src/civ/mod.rs:489:19
|
489 | while to_floodfill.len() > 0 {
| ^^^^^^^^^^^^^^^^^^^^^^ help: using `!is_empty` is clearer and more explicit: `!to_floodfill.is_empty()`
|
= help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#len_zero
2022-01-18 00:41:59 +01:00
floppy
0c97a6e91a
add synonyms for biomes
2022-01-17 20:14:16 +01:00
floppy
88a39476bc
tweak fn generate_biome in namegen
2022-01-17 19:03:15 +01:00
floppy
609d23ae4f
- make individual size thresholds for biome name generation to include small lakes
...
- add original Lake naming pattern, partly (no water_alt check)
2022-01-17 16:02:52 +01:00
