Marcel
|
593d8fa4b5
|
Merge branch 'xMAC94x/update_vek' into 'master'
switch to upstream vek again
See merge request veloren/veloren!3342
|
2022-05-02 08:34:21 +00:00 |
|
Marcel
|
e30845c68f
|
Merge branch 'christof/shredded_economy3' into 'master'
Economic debugging and documentation
See merge request veloren/veloren!3309
|
2022-05-01 18:26:29 +00:00 |
|
Marcel Märtens
|
fa49248c31
|
switch to upstream vek again
|
2022-04-28 09:10:55 +02:00 |
|
Isse
|
3027597352
|
Site2 giant tree entity spawning
|
2022-04-27 10:53:08 +00:00 |
|
Christof Petig
|
2ddd1cc0a7
|
execute with local tracing environment
sadly the level passed is ignored, and it warns about an invalid filter directive
but RUST_LOG environment variables work as expected
|
2022-04-24 17:26:16 +02:00 |
|
Christof Petig
|
ab985b54ab
|
initialize ERROR not INFO
|
2022-04-24 17:26:16 +02:00 |
|
Christof Petig
|
5f5ebeecfe
|
ignore expensive tests without much added value
|
2022-04-24 17:26:16 +02:00 |
|
Christof Petig
|
2f7c50281f
|
fix neighbor logic in test, fix clippy, fix rustfmt
|
2022-04-24 17:26:16 +02:00 |
|
Christof Petig
|
8dfd6dc523
|
document more elements of economy
|
2022-04-24 17:26:16 +02:00 |
|
Christof Petig
|
53ace17327
|
output trade to csv file
|
2022-04-24 17:26:16 +02:00 |
|
Christof Petig
|
dc4b9dc19e
|
more readable and meaningful csv output
|
2022-04-24 17:26:16 +02:00 |
|
Christof Petig
|
d897df4b78
|
output number of trade partners
|
2022-04-24 17:26:16 +02:00 |
|
Christof Petig
|
eedfce45bc
|
also output normal economic simulation
|
2022-04-24 17:26:16 +02:00 |
|
Christof Petig
|
8e48d59539
|
also print situation in other econ test
|
2022-04-24 17:26:16 +02:00 |
|
Christof Petig
|
b144ed42e3
|
display trade volume
|
2022-04-24 17:26:16 +02:00 |
|
Christof Petig
|
57dafea9b4
|
group the first three settlements together (should enable them to survive by trade)
|
2022-04-24 17:26:16 +02:00 |
|
Christof Petig
|
6f431a6fff
|
rearrange and connect towns (shows planning weakness)
|
2022-04-24 17:26:16 +02:00 |
|
Christof Petig
|
faf12118f0
|
remember which good a profession is missing for productivity
|
2022-04-24 17:26:16 +02:00 |
|
Christof Petig
|
94bef521ce
|
new test to check different resource situations
|
2022-04-24 17:26:15 +02:00 |
|
Christof Petig
|
40cf44d7b1
|
Enforce a minimum price for goods
|
2022-04-23 22:11:29 +02:00 |
|
Youssef Fahmy
|
aec866e5ec
|
Balance tweaks
|
2022-04-23 14:54:01 +00:00 |
|
aflying pumpkin
|
c7f7e63495
|
Added Lionesses
|
2022-04-16 16:57:59 +00:00 |
|
flo
|
262a730cc6
|
clifftown sprite fix
|
2022-04-15 20:01:59 +00:00 |
|
Marcel Märtens
|
64b9602760
|
update further dependencies, including strum and get rid of old strum_macro
|
2022-04-04 16:06:47 +02:00 |
|
Marcel Märtens
|
affdf3131f
|
update a bunch of dependencies, including clap3
|
2022-04-04 11:43:29 +02:00 |
|
flo
|
3d24b1d635
|
CliffTowns
|
2022-03-29 12:52:08 +00:00 |
|
James Melkonian
|
5b801dc44d
|
Adjust harvester boss arena offset
|
2022-03-27 20:41:03 -07:00 |
|
Samuel Keiffer
|
4aaefdf6be
|
Merge branch 'ubruntu/site2-guards-raiders' into 'master'
Bring raiders and guards to site2 towns
See merge request veloren/veloren!3300
|
2022-03-26 00:29:53 +00:00 |
|
ubruntu
|
6d30f7f748
|
Bring raiders and guards to site2 towns
|
2022-03-26 00:29:52 +00:00 |
|
Marcel
|
a8a8ee181d
|
Merge branch 'christof/parallel_economy' into 'master'
Parallel economic simulation, based on shredded_economy2
See merge request veloren/veloren!3288
|
2022-03-25 19:59:57 +00:00 |
|
Samuel Keiffer
|
3964ac466a
|
Merge branch 'ubruntu/house-decorations' into 'master'
Site2 house decorations
See merge request veloren/veloren!3273
|
2022-03-24 15:13:56 +00:00 |
|
ubruntu
|
c71354e192
|
Site2 house decorations
|
2022-03-24 15:13:56 +00:00 |
|
InfRandomness
|
8359d5754a
|
Add new primitive to draw giant trees
|
2022-03-24 15:13:53 +00:00 |
|
Christof Petig
|
aeac483bac
|
parallel simulation of economies
|
2022-03-21 23:35:08 +01:00 |
|
Christof Petig
|
96c5d17460
|
Address xmac's comments and prepare for parallelization
|
2022-03-21 23:35:08 +01:00 |
|
Christof Petig
|
ef6cee891f
|
move the economy tick into Economy
This prepares for a parallel processing as it centralizes access to the surrounding index
|
2022-03-19 09:39:56 +01:00 |
|
Olexorus
|
cf66eccb75
|
Use Rust 2021 postfix .into_iter()
|
2022-03-15 16:34:56 +01:00 |
|
DaforLynx
|
ff624dd6e9
|
Reinstate town music.
|
2022-03-13 11:18:32 +00:00 |
|
DaforLynx
|
7b6f424bb0
|
Loud rivers
|
2022-03-13 07:47:23 +00:00 |
|
Samuel Keiffer
|
c5365c850a
|
Merge branch 'isse/primitive-fixes' into 'master'
Primitive fixes
See merge request veloren/veloren!3260
|
2022-03-13 03:34:49 +00:00 |
|
Isidor Nielsen
|
7621a21560
|
Primitive fixes
|
2022-03-13 03:34:49 +00:00 |
|
Tormod G. Hellen
|
5f12163e54
|
Prevent towns being placed in the ocean just off the coast.
|
2022-03-12 02:45:49 +01:00 |
|
Tormod G. Hellen
|
5e3ef83195
|
Force incompatible sites further apart.
|
2022-03-12 02:45:49 +01:00 |
|
Tormod G. Hellen
|
afdb7fe9ea
|
Increase quality of town placements.
|
2022-03-12 02:45:49 +01:00 |
|
Tormod G. Hellen
|
68072231dc
|
Force towns further apart.
|
2022-03-12 02:45:49 +01:00 |
|
Tormod G. Hellen
|
031db61c1e
|
Fix bug where chunks outside the map counted as occupied.
This prevented sites from being placed near the edge of the map.
|
2022-03-12 02:45:43 +01:00 |
|
Isidor Nielsen
|
e21f04d456
|
Add entity spawn on painter
|
2022-03-09 21:40:23 +00:00 |
|
Christof Petig
|
546afa86ae
|
Economy redesign: Cleaner file structure (no code change)
|
2022-03-05 09:19:26 +00:00 |
|
Christof Petig
|
f347b9de11
|
Diversify price calculation for items by using multiple categories per item.
|
2022-03-03 02:32:34 +00:00 |
|
Isidor Nielsen
|
bd8a7a0506
|
Better rocks
|
2022-03-02 16:28:04 +00:00 |
|
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 |
|