Commit Graph

10634 Commits

Author SHA1 Message Date
floppy
28a7b00445 tweak biome icon 2022-01-18 09:19:55 +01:00
floppy
dcf36df781 tweak biome icon 2022-01-18 09:17:51 +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
fd920cea1d allow enabling/disabling biome names on map 2022-01-17 23:47:27 +01:00
floppy
a836b61190 allow enabling/disabling biome names on map 2022-01-17 23:45:51 +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
Samuel Keiffer
dd612a9473 Merge branch 'sam/ability_selection' into 'master'
Ability Selection UI

Closes #419, #421, and #1431

See merge request veloren/veloren!3031
2022-01-16 03:19:21 +00:00
Sam
7ae8ed09f6 Addressed MR comments. 2022-01-15 21:50:27 -05:00
Sam
4d3b0736d0 Fixed bug with returning to general combat skill tree. 2022-01-15 21:49:30 -05:00
Sam
aaa33c6834 Fixed display of some stats in dary and changelog entry. 2022-01-15 21:49:29 -05:00
Sam
e662946130 Removed placeholder abilities, tweaked migration. 2022-01-15 21:49:29 -05:00
Sam
745cc20c66 Hardened json model of ability sets and added dev panics for when conversion from database failed with dev opt mode. 2022-01-15 21:49:28 -05:00
Sam
27c9f702db Fixed issue with character creation referencing incorrect table in database 2022-01-15 21:49:28 -05:00
Sam
19a1a0adb2 Changed to using slot maker for ability slots 2022-01-15 21:49:25 -05:00
Sam
fe80e365fa Changed persistence of abilities to go through an intermediate state in json models. 2022-01-15 21:46:57 -05:00
Monty Marz
6d0913bb5e visuals 2022-01-15 21:46:57 -05:00
Sam
d1c5d3e020 If dual wielding two of the same weapon kind, use the same ability entry to display abilities from either hand. 2022-01-15 21:46:56 -05:00
Sam
70d6f3a854 Scroll through all aiblities in the same pages. 2022-01-15 21:46:56 -05:00
Sam
3870688717 Pages to swap between weapon abilities. 2022-01-15 21:46:55 -05:00
Sam
ed38272d23 Diary stats now use real values. 2022-01-15 21:46:55 -05:00
Monty Marz
eb0bed39e8 stats window WIP 2022-01-15 21:46:54 -05:00
Monty Marz
7515c26d68 progress 2022-01-15 21:46:54 -05:00
Sam
714e080535 Abilities can now be dragged to slot to be equipped. 2022-01-15 21:46:53 -05:00
Sam
d0e487da8a Ability sets now start with non-empty defaults. 2022-01-15 21:45:27 -05:00
Sam
4c3771a1a0 Persistence of auxiliary abilities. 2022-01-15 21:42:34 -05:00
Sam
d86692c4fe Added in-memory persistence of ability sets per weapon kind pair. 2022-01-15 21:42:34 -05:00
Monty Marz
89bf41574c diary section buttons 2022-01-15 21:42:33 -05:00
Sam
ee5293c64e Abilities scrollable now. 2022-01-15 21:42:33 -05:00
Sam
cf724bd76c Initial UI work 2022-01-15 21:42:32 -05:00
Samuel Keiffer
7b7ad62be9 Merge branch 'sam/remove-fake-health' into 'master'
Removed health scaling from generation

Closes #1354

See merge request veloren/veloren!3100
2022-01-15 22:34:48 +00:00
Sam
9b6c76bd3b Removed health scaling that bypasses the skill system. 2022-01-15 11:58:28 -05:00
Dominik Broński
a6d1bfa6a0 Merge branch 'isse/site2-util' into 'master'
Site2 util

See merge request veloren/veloren!3037
2022-01-15 13:06:18 +00:00
Isidor Nielsen
5642680687 Site2 util 2022-01-15 13:06:18 +00:00
Imbris
4b1900d3ea Merge branch 'fix-hotbar-bug' into 'master'
Fix hotbar bug

See merge request veloren/veloren!3066
2022-01-15 01:37:27 +00:00
Tormod G. Hellen
3afa16bf03 Fix hotbar changing when sorting inventory.
Previously the hotbar slots would refer to inventory slots. An
unfortunate consequence of this was that when the contents of an
inventory slot changed, so would the corresponding hotbar slot
change. This commit fixes that.
2022-01-14 19:14:24 +01:00
Tormod G. Hellen
a33e6df303 Remove unused code. 2022-01-14 18:23:42 +01:00
Samuel Keiffer
589189315c Merge branch 'slipped/gnarlingstuff' into 'master'
gnarling depth

See merge request veloren/veloren!3068
2022-01-14 07:22:11 +00:00
Imbris
1e24e4b8fb Merge branch 'YuriMomo/Fix-Report-Message' into 'master'
Fix-Report-Message

See merge request veloren/veloren!3096
2022-01-14 06:17:55 +00:00
jshipsey
0e9d50162b last fixes 2022-01-14 00:19:32 -05:00