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
12,389 Commits 151 Branches 18 Tags 2.1 GiB
58e74a26cd
Commit Graph

1504 Commits

Author SHA1 Message Date
Isidor Nielsen
f8916f878a Primitive group transformation and RotateAround primitive 2022-03-01 23:38:05 +00:00
infrandomness
1d44247efe
Enable return_self_not_must_use lint 2022-03-01 10:53:57 +01:00
floppy
b0ba5b9979 fix SeaCrocodiles spawning in lakes 2022-02-25 18:13:47 +01:00
Tormod G. Hellen
5df1ee6382 Prevent castles being assailable from above. 2022-02-22 22:11:01 +01:00
Tormod G. Hellen
609b26ce20 Prevent trees being placed in barren regions. 2022-02-22 21:00:52 +01:00
Tormod G. Hellen
a2d24521ee Prevent things being close that shouldn't. 2022-02-22 21:00:52 +01:00
Tormod G. Hellen
b6b67d367a Prevent close settlements. 2022-02-22 21:00:52 +01:00
Tormod G. Hellen
acce8aefa4 Determine town suitability using log function. 2022-02-22 21:00:52 +01:00
Tormod G. Hellen
22a75332f8 Ensure towns are placed only in viable locations. 2022-02-22 21:00:52 +01:00
Tormod G. Hellen
1ae93ee00e Add more water checks. 
Not sure if necessary or just paranoia.
 2022-02-22 21:00:52 +01:00
Tormod G. Hellen
339d6f2a3b Refactor for clarity. 
This code was a bit hard to read. The name ought to make it easier.
 2022-02-22 21:00:52 +01:00
IsseW
e9e4be6e7e break when there are no stations 2022-02-20 22:11:09 +01:00
IsseW
258b3c7535 Workshop fixes 2022-02-20 22:08:13 +01:00
Joshua Barretto
4ef1c92858 Merge branch 'enable_custom_names_for_lakes' into 'master' 
enable custom naming bricks for lake biomes

See merge request veloren/veloren!3210
 2022-02-20 19:47:23 +00:00
floppy
0d3a0cd1b8 enable custom naming bricks for lake biomes 2022-02-16 20:30:52 +01:00
Joshua Barretto
00b003a23c Enabled site2 towns by default 2022-02-15 19:01:43 +00:00
Samuel Keiffer
6c7c0eefae Merge branch 'gnarlings' into 'master' 
Gnarlings

See merge request veloren/veloren!3194
 2022-02-15 00:22:37 +00:00
Avi Weinstock
70b7e1ef92 Automatically fill top-level unions as separate fills. 2022-02-14 14:28:00 -05:00
Sam
2bcf9b9a26 Removed unions in gnarling site to make chunkgen more performant 2022-02-14 12:40:06 -05:00
Joshua Barretto
6e46b4ddef Fixed CI 2022-02-14 11:46:42 -05:00
Avi Weinstock
aab552afc5 Iterate over partially-disjoint unions of primitive bounds, improving CSG rasterization performance in the presence of sparse/disjoint unions. 2022-02-13 23:48:12 -05:00
Sam
6dafacaa24 Addressed review comments 2022-02-13 21:49:46 -05:00
Avi Weinstock
4f962df7c8 Automatically use right-recursion instead of left-recursion for union/intersection of CSG primitives via measuring the depth of the trees when unioning/intersecting them. 2022-02-13 15:44:51 -05:00
Sam
2e6610314c Balance tweaks 2022-02-13 00:39:46 -05:00
Sam
c77270b799 Addressed feedback 2022-02-12 20:52:01 -05:00
Sam
49e8803ee0 Fixed tests 2022-02-12 17:22:08 -05:00
James Melkonian
8da1ae578f Simplify tunnel entity spawning 2022-02-12 14:21:22 -08:00
James Melkonian
8a02a943f4 Document tunnel generation 2022-02-12 13:57:44 -08:00
InfRandomness
090ac9030c Change Path colors 2022-02-11 17:05:10 +00:00
jshipsey
2eee43865f chieftain anims 2022-02-11 02:18:48 -05:00
Sam
4991f7ecea Gnarlign site tweaks and chieftain buff 2022-02-11 01:23:09 -05:00
James Melkonian
95ea7a47e0 Gnarling cavern entrance stump 2022-02-10 19:35:30 -08:00
Sam
cab87658a3 Placement tweaks 2022-02-10 14:58:39 -05:00
James Melkonian
07d19bf03c Gnarling cavern tweaks 2022-02-10 14:58:38 -05:00
Sam
86a00e75bb Tweaked fire particles 2022-02-10 14:58:37 -05:00
Sam
bf7e84c6ae Initial particle work 2022-02-10 14:58:37 -05:00
jshipsey
5eea73f793 root walls, minor tweaks 2022-02-10 14:58:36 -05:00
Sam
0031aa6f5f Chieftain AI and attacks 2022-02-10 14:58:35 -05:00
jshipsey
3a35dcc77f brick texture colors 2022-02-10 14:58:34 -05:00
jshipsey
0c788997a4 anims 2022-02-10 14:58:34 -05:00
James Melkonian
14080da693 Fix rebase 2022-02-10 14:58:33 -05:00
Sam
f1801560fa Deadwood ai 2022-02-10 14:58:31 -05:00
jshipsey
cb48dd0a75 adjust chieftain hut, start alter 2022-02-10 14:58:30 -05:00
Sam
c15fb2b68f Better mugger AI 2022-02-10 14:58:28 -05:00
jshipsey
e93e7fd21c random hut variation and banner tatter 2022-02-10 14:58:26 -05:00
James Melkonian
d0477c259e Color caverns and provide some foliage 2022-02-10 14:58:25 -05:00
jshipsey
3a02d11bab banners, reworked huts/watchtowers/fencetowers 2022-02-10 14:58:25 -05:00
James Melkonian
3a8a0d9c53 Cavern systems under gnarling fortifications 2022-02-10 14:58:24 -05:00
jshipsey
c1df0ddbf3 some aesthetic work 2022-02-10 14:58:23 -05:00
Sam
6c6caa7535 Enemy spawns in gnarling fortification. 2022-02-10 14:58:22 -05:00
Sam
2dfeadcbc4 Basic enemy spawning. 2022-02-10 14:58:22 -05:00
Sam
59551efb06 Fixed bug that would cause gate to be next to chieftain hut. 2022-02-10 14:58:21 -05:00
Sam
9dcfb43fe6 Watchtowers near gate entrance. 2022-02-10 14:58:20 -05:00
Sam
09ce889bfc Chieftain hut 2022-02-10 14:58:20 -05:00
Sam
18cb0c7e41 Wall segments and towers for chieftain area. 2022-02-10 14:58:19 -05:00
Sam
466a02e1cf Re-organzied code relating to tower and wall generation. 2022-02-10 14:58:18 -05:00
Sam
643713d8b1 Huts now have doors. Added totems. 2022-02-10 14:58:18 -05:00
Sam
dd289ea5da Initial huts 2022-02-10 14:58:17 -05:00
Sam
920fa11ddf Section of wall opened. 2022-02-10 14:58:16 -05:00
Sam
cf73da2955 Gnarling watch towers. 2022-02-10 14:58:15 -05:00
Sam
90cedfc95d Gnarlings can now make walls. 2022-02-10 14:58:15 -05:00
Sam
b28f6276dd Gnarling dungeons now only generate near forests. 2022-02-10 14:58:09 -05:00
Joshua Barretto
31192c80bc Merge branch 'biome_name_update_and_site&theme_based_naming' into 'master' 
biome_name_update_and_site&theme_based_naming

See merge request veloren/veloren!3187
 2022-02-10 09:35:47 +00:00
floppy
996488ca7e remove unnecessary, vec!s from namgen bricks 2022-02-10 09:58:14 +01:00
jshipsey
786ae39fb4 new entities 2022-02-09 20:10:59 -05:00
Joshua Barretto
507b5d371c Merge branch 'fix_plazas_in_site2_towns' into 'master' 
fix plazas in site2 towns spawning on top of each other

See merge request veloren/veloren!3191
 2022-02-09 23:19:01 +00:00
floppy
80490580a4 fix plazas in site2 towns spawning on top of each other 2022-02-09 23:44:27 +01:00
floppy
680a6e477e enable flattening for site2 towns in civ/mod.rs, 
to avoid mountain towns spawning underground
 2022-02-09 23:28:56 +01:00
floppy
03cb885af4 - add more custom bricks for biomes 
- update biome and site names
 2022-02-09 08:14:13 +01:00
floppy
422be1b451 - add generate_gnarling and generate_town in namegen.rs 
- enable generate_town for site2 towns in site2/mod.rs
 2022-02-05 13:32:45 +01:00
floppy
bd862b3dd1 tweak generate_danari in namegen.rs 2022-02-05 11:21:19 +01:00
floppy
33dae9b3b1 -adjust size-threshold for Jungle to fix Jungles not being named. 
-set size-threshold for anticipated Swamp sizes
 2022-02-04 17:14:38 +01:00
floppy
b85a384d38 -adjust size-threshold for Jungle to fix Jungles not being named. 2022-02-04 16:54:42 +01:00
floppy
b5dfe74d41 -add more biome specific namegen functions 
-introduce random choice between engl and custom naming
-add namegen section for site/theme based naming
 2022-02-04 15:45:11 +01:00
Joshua Barretto
ac13d07443 Merge branch 'crafting_stations_in_site2_towns' into 'master' 
add crafting stations to workshop in site2 towns

See merge request veloren/veloren!3174
 2022-02-03 17:16:30 +00:00
floppy
74bf89077f use const CARDINALS to generate spawn positions for crafting_stations. 2022-02-03 17:40:26 +01:00
floppy
595e6ee076 - randomize distribution of crafting_stations to static positions 2022-02-02 22:15:04 +01:00
InfRandomness
54b69e37a5 Implement giant trees in site2 2022-02-02 02:33:37 +00:00
floppy
ddc35d8b7d - add crafting stations to workshop in site2 towns 
- TODO: connect Painter rng when implemented
 2022-02-01 23:53:18 +01:00
Joshua Barretto
0ceef00b40 Merge branch 'james/site2-util' into 'master' 
More CSG primitives

See merge request veloren/veloren!3154
 2022-02-01 09:16:38 +00:00
James Melkonian
2aab277d0b Add doc comments to PrimitiveRef methods 2022-01-31 18:39:03 -08:00
Joshua Barretto
fb7433a5cf Merge branch 'determanistic-naming' into 'master' 
Fix biome naming

See merge request veloren/veloren!3173
 2022-02-01 00:51:26 +00:00
IsseW
0f7f0ace93 Use DHashMap 2022-02-01 01:20:00 +01:00
James Melkonian
b445bd494e Bezier curve prisms 2022-01-31 16:13:45 -08:00
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
IsseW
0ba4a3a409 Use DHashSet 2022-02-01 01:07:36 +01: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
floppy
ced1a82824 - add size threshold for biomes to name, to exclude mini-biomes from clogging the map. 
- fmt, clippy
 2022-01-17 11:19:34 +01:00
floppy
18c434c613 tweak generate_biome 2022-01-17 09:04:12 +01:00
floppy
c00f5bafee add fn generate_forest in namegen to name forest biomes 2022-01-17 08:36:35 +01:00
floppy
5ad8501cc8 update bricks in fn generate_biome in namegen, tweaks 
WIP
 2022-01-16 21:22:12 +01:00
IsseW
5b9f405671 Better placement of poi and actual names 2022-01-16 20:28:53 +01:00
IsseW
f8d94ef25f biome name to chunk name 2022-01-16 18:11:22 +01:00
IsseW
5bd7507f31 Added poi for all biomes 2022-01-16 16:54:49 +01:00
floppy
d5f0ee2fc5 create fn generate_biome in namegen 2022-01-16 16:40:22 +01:00
Sam
9b6c76bd3b Removed health scaling that bypasses the skill system. 2022-01-15 11:58:28 -05:00
Isidor Nielsen
5642680687 Site2 util 2022-01-15 13:06:18 +00:00
jshipsey
0e9d50162b last fixes 2022-01-14 00:19:32 -05:00
jshipsey
1fac6359de more gnarling weapons 2022-01-13 23:20:56 -05:00
jshipsey
7f928d0bc0 woodengolem, chieftain, icedrake, blowgun 2022-01-13 23:20:52 -05:00
Monty Marz
d72d926341 change merchant backpack visuals and add mining skill icons 2022-01-08 01:57:52 +01:00
Imbris
58b41bb2bb Merge branch 'debug' into 'master' 
Use debug_map to implement Debug

See merge request veloren/veloren!3048
 2022-01-02 21:02:26 +00:00
Imbris
972c8ba41d Add wildlife density modifier to features.ron 2021-12-25 19:24:09 -05:00
Imbris
bf48bd5346 update toolchain to nightly-2021-12-19 2021-12-23 13:04:24 +01:00
Christof Petig
453c4c149e fix more examples and satisfy code quality checks 2021-12-20 18:09:34 +00:00
Christof Petig
2dd63a333e fix economy test [ci skip] 2021-12-20 18:06:58 +00:00
Christof Petig
cbd2a422f3 Add Chrismas wreath (25% chance) and make the towns go wild with illumination 2021-12-20 18:06:58 +00:00
Christof Petig
3edc7b5846 make house decorations correctly depend on Calendar 2021-12-20 18:06:58 +00:00
Christof Petig
8a85d6e6e0 cargo fmt, pass calendar down into building creation 2021-12-20 18:06:58 +00:00
Christof Petig
42ba9212ea move Calendar object into WorldSim 
(needed for Christmas decoration in towns)
 2021-12-20 18:06:58 +00:00
Christof Petig
be1a9050a4 make Christmas decoration unconditional for now 2021-12-20 18:06:57 +00:00
Joshua Barretto
3b4fa6b328 Snow for ice 2021-12-20 18:06:53 +00:00
Joshua Barretto
6e97e3179d Slippery ice 2021-12-20 18:03:52 +00:00
UncomfySilence
d6d55764c4 + Created common.loot_tables.calendar.<seasonal_event> directory for special item drop changes or for potential bosses. 
+ Created common.entity.calendar.<seasonal_event> directory for special entities that spawn exclusively during season event.
+ Added lines to world/src/layer/wildlife.rs for the current events underneath nonevent basis.
+ Attempted organization go brrrrrr
 2021-12-20 18:03:52 +00:00
Joshua Barretto
a2ca95af3d Ice cliffs 2021-12-20 18:03:52 +00:00
Joshua Barretto
a2a3a20aad Added ice to cold water 2021-12-20 18:03:52 +00:00
Joshua Barretto
78f76dde83 Added baubles to trees 2021-12-20 18:03:52 +00:00
Joshua Barretto
3ddacb96ab Added christmas snow 2021-12-20 18:03:52 +00:00
Joshua Barretto
e3203080ed Added Calendar for temporal events based on the real-world calendar 2021-12-20 18:03:52 +00:00
Benoît du Garreau
aca088388b Update assets_manager to 0.7 2021-12-12 22:11:47 +01:00
notoria
81f28bc3cc Use debug_map to implement Debug 2021-12-12 21:46:06 +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