Imbris
cd98dd5245
Remove unused deps flagged by cargo-machete
2023-09-21 22:59:50 -04:00
Isse
b9c33df635
Merge branch 'isse/world-gen-ui' into 'master'
...
Map selector and generation UI
See merge request veloren/veloren!3925
2023-09-17 17:11:19 +00:00
Isse
f4ca60cbb6
Map selector and generation UI
2023-09-17 17:11:19 +00:00
Isse
478c37f6f1
Merge branch 'james/min-initial-civ-count' into 'master'
...
Always generate at least one civilization
See merge request veloren/veloren!3927
2023-09-17 16:57:06 +00:00
flo
78b2443edc
Merge branch 'qsto/bosses_loot_overhaul' into 'master'
...
Bosses loot overhaul
See merge request veloren/veloren!4072
2023-08-30 12:08:52 +00:00
Marcel Märtens
b4216ec634
get rid of old criterion
2023-08-27 19:17:04 +02:00
Christof Petig
24773cb3f1
deduplicate location name code
2023-08-22 23:11:18 +02:00
Christof Petig
b20ff5144c
determine location names when loading character list
2023-08-22 22:41:48 +02:00
Joshua Barretto
6fbca74e88
Merge branch 'maxicarlos08/dungeon-avoid-cave' into 'master'
...
Cheesing fixes to old-style dungeons
See merge request veloren/veloren!4014
2023-08-19 11:12:01 +00:00
Maxicarlos08
e5e26149ed
review
2023-08-17 11:16:20 +02:00
flo
fdea283f98
JungleRuin
2023-08-16 12:35:27 +00:00
flo
21bf0a5572
Merge branch 'pirate_hideout_site' into 'master'
...
site pirate_hideout
See merge request veloren/veloren!4057
2023-08-16 06:59:59 +00:00
flo
fba1976dee
site pirate_hideout
2023-08-16 06:59:58 +00:00
flo
36c0096f6a
coastal town fence fix
2023-08-15 22:34:38 +00:00
Maxicarlos08
0929a3c76c
use same timings for both portals
2023-08-15 12:24:49 +02:00
Maxicarlos08
8fe5f2e708
addressed review comments
2023-08-15 12:24:49 +02:00
Maxicarlos08
e5fe64ccf6
pre-review cleanups
2023-08-15 12:24:49 +02:00
Maxicarlos08
09f7087ac6
buildup time adjustments
2023-08-15 12:24:48 +02:00
Maxicarlos08
25fcb04ad3
buildup times and portal model update
2023-08-15 12:24:48 +02:00
Maxicarlos08
14141ecc80
failed attempt at making dungeons avoid caves
2023-08-15 12:24:46 +02:00
Maxicarlos08
0f2db68498
added portals
2023-08-15 12:24:17 +02:00
Maxicarlos08
730f96536a
remove staircases
2023-08-15 12:24:17 +02:00
Maxicarlos08
ed8fe545f8
Fixed temperate dungeon entrance height and wall artifacts around dungeons
2023-08-15 12:24:17 +02:00
Maxicarlos08
2d616352a2
grey walled dungeons
2023-08-15 12:24:17 +02:00
Maxicarlos08
73a79b32a1
no dungeons = no dungeons with caves!
2023-08-15 12:24:17 +02:00
Michal Sroczynski
c8feb568ba
Bosses loot overhaul p1
2023-08-11 09:47:13 +02:00
Michał
5762e62704
Desert hum fix
2023-08-09 15:53:16 +00:00
Isse
254c1c7145
ResourceSprite Fill, so we can track giant tree IronWood in rtsim
2023-08-02 18:48:01 +02:00
Michal Sroczynski
0d4fc62468
Code quality fix
2023-08-02 18:48:01 +02:00
Michal Sroczynski
1301761445
Scatter changes and fixes
2023-08-02 18:48:01 +02:00
Michal Sroczynski
2c23781d22
Remove tiers from dungeons names
2023-08-02 18:48:01 +02:00
Michal Sroczynski
50304ed54e
Format fix
2023-08-02 18:48:01 +02:00
Michal Sroczynski
28cf9bf19d
Add woods to scatter and rarify the pyrebloom
2023-08-02 18:48:01 +02:00
Michal Sroczynski
a577ed1d36
Changes to Gnarling Tree
2023-08-02 18:45:40 +02:00
David Fisher
e2a0bc55c3
Lower grass target in standalone economy tests
...
because: The test_economy_moderate_standalone was failing tests on
arm64 MacOS systems with the following error:
```
thread 'site::economy::context::tests::test_economy_moderate_standalone' panicked at 'assertion failed: site.economy.pop >= env.targets[&id]', world/src/site/economy/context.rs:562:17
```
This was originally reported in Discord by @sharp in July, 2022
https://discord.com/channels/449602562165833758/797421546871324712/997332351195553874
Debugging showed that the grass target was 880, and the population was only around 718.
Local testing showed that lowering the grass target to 700 fixed the issue.
this commit: Lowers the grass target to 700 in the standalone economy tests.
unaddressed questions:
- Why is the grass target so high in the standalone economy tests?
- Alternately, why did the grass population drift so low, and no longer aligned with the tests.
- Why is this passing in CI, but not local testing?
- There are a number of commented out add_settlement calls in the standalone economy tests. Were there issues with the tests prior?
2023-07-31 16:51:29 -04:00
Isse
e7269a510b
Fix adlet site division by zero
2023-07-28 16:08:25 +02:00
flo
36889f671e
fix_desertcity_repairbench
2023-07-13 11:30:53 +00:00
flo
b556befe73
coastal_town
2023-07-12 23:02:40 +00:00
Monty Marz
102945b9e7
Dungeon rework initial patch
2023-07-09 20:03:09 +00:00
flo
3611fd2b3d
wildlife_spawn_work
2023-07-03 23:21:56 +00:00
Samuel Keiffer
079e7bfed6
Merge branch 'uniior/cacti' into 'master'
...
New/revamped cacti sprites
See merge request veloren/veloren!3986
2023-06-18 01:22:33 +00:00
unknown
8978bc9dc4
Test
2023-06-14 13:14:33 -04:00
Tormod G. Hellen
cf002478b8
Optimally place towns.
...
This gets rid of the arbitrary threshold values for what is and
isn't an acceptable town.
2023-06-09 13:44:01 +02:00
unknown
526386e51c
Initial cacti work
2023-06-07 14:46:54 -04:00
flo
02bba1e343
clifftown rework
2023-06-07 18:45:12 +00:00
Isse
a884e0e058
Various rtsim related stuff
2023-06-03 22:14:18 +00:00
Joshua Barretto
dc2afe8236
Merge branch 'floppy_savannah_hut' into 'master'
...
savannah_hut
See merge request veloren/veloren!3872
2023-06-03 11:54:58 +00:00
flo
22854cbea2
savannah_hut
2023-06-03 11:54:58 +00:00
Tormod G. Hellen
4f2548fe78
Pass SiteKind by reference.
2023-06-02 15:04:16 +02:00
Tormod G. Hellen
1d0329cfa7
Make sure location hint calculation is only done once.
...
Location hint calculation is expensive and should not be done
in a hot loop.
This is a fixup for 1572a5a759
2023-06-02 15:04:09 +02:00
