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
15,763 Commits 151 Branches 18 Tags 2.1 GiB
ce7732674a
Commit Graph

1905 Commits

Author SHA1 Message Date
Maxicarlos08
76627cd544
only use hash cache, fix compression benchmark, fixed be/le bug 2024-01-26 17:48:37 +01:00
Maxicarlos08
c5ddf73dc2
optimize sprites in compressed chunks 2024-01-26 16:26:26 +01:00
Maxicarlos08
b4ac1f7036
fix chunk compression benchmarks 2024-01-26 14:33:42 +01:00
Joshua Barretto
4a89d88e9b Added default sprite attribute state 2024-01-21 21:30:08 +00:00
Samuel Keiffer
5d6824aace Merge branch 'haniwa' into 'master' 
haniwa

See merge request veloren/veloren!4234
 2024-01-20 17:45:23 +00:00
flo
48a79b3e78 haniwa 2024-01-20 17:45:23 +00:00
Benoît du Garreau
b6ffb3a146 Update assets_manager to v0.11 2024-01-20 15:46:16 +00:00
juliancoffee
1347a31108 Deprecation step of Item::name/description 
- Mark Item::name() and Item::description() deprecated, along with
  corresponding ItemDesc methods.
- Dummify dialogue code that uses items, as it's not used anyway. In the
  future it should use common_i18n::Content.
- Allow usage of deprecated .name() for Inventory ordering, for now.
- Allow usage of deprecated .name() for Inventory ordering for
  merchants, for now.
 2024-01-14 21:25:15 +02:00
Isse
f8cb4369be clamp cave alt base at terrain alt 2024-01-07 13:14:44 +01:00
DaforLynx
0b62898060 Audio fixes and new music 2023-12-29 00:25:08 +00:00
Christof Petig
055e11f10e reintroduce underwater plants 2023-12-26 16:48:23 +01:00
Christof Petig
5af8c4687e Merge branch 'christof/christmas23' into 'master' 
Christmas theme revival

See merge request veloren/veloren!4209
 2023-12-20 17:02:01 +00:00
Uniior
737b5761f6 Crate and Barrel sprites 2023-12-17 16:17:14 +00:00
Christof Petig
4b7f3d07d2 add hirdrasil ornament variants and fix clippy 2023-12-16 12:10:17 +01:00
Christof Petig
611b55b279 PRNG experiments 2023-12-15 17:27:15 +01:00
Christof Petig
9c9c8e6873 lights over the door 2023-12-14 23:29:48 +01:00
Christof Petig
c0b56671ec hang wreaths at the fireplace 2023-12-14 23:29:32 +01:00
Christof Petig
9b485456eb Calendar based gear for villagers 2023-12-14 16:31:48 +01:00
Isse
b654c2f923 expect instead of unwrap 2023-12-12 20:20:03 +01:00
Isse
96a3c81cbb fix captain dismounting and don't panic in RandomField::choose 2023-12-12 20:14:39 +01:00
Isse
850112bd72 typo fix and add some adjectives to tavern namegen 2023-12-12 19:28:12 +01:00
Isse
5361b290df make vec2 make more sense 2023-12-12 19:25:06 +01:00
Isse
57bf7cfdac place rooms at correct alt, remove walls between gardens 2023-12-07 22:34:58 +01:00
Isse
1000b7b73f better colors for tavern 2023-12-07 20:08:03 +01:00
Isse
96a70d760c clippyyyyy 2023-12-07 20:08:03 +01:00
Isse
7a1612aa8a small fixes 2023-12-07 20:08:03 +01:00
Isse
ee4c6d006f More advanced roofs 2023-12-07 20:08:03 +01:00
Isse
5a31b17bc3 Add simple roofs 2023-12-07 20:08:03 +01:00
Isse
a9191b96a9 better stairs 2023-12-07 20:08:03 +01:00
Isse
6e19abd7ec stairs 2023-12-07 20:08:03 +01:00
Isse
e8f8f20ad0 somewhat 3d layouting 2023-12-07 20:08:03 +01:00
Isse
a3a19ecc3a tavern rtsim 2023-12-07 20:08:03 +01:00
Isse
c1aa9bd1b6 move some details to generate 2023-12-07 20:08:03 +01:00
Isse
4fa52db71d more work on tavern 2023-12-07 20:08:03 +01:00
Isse
9903b53105 working rooms 2023-12-07 20:08:03 +01:00
Isse
ecb85a0534 Tavern room layout 2023-12-07 20:08:02 +01:00
flo
daff899f37 clifftown_relocation 2023-11-25 20:58:05 +00:00
flo
756ac0eefe troll_caves_and_camps_into_sites 2023-11-24 07:53:15 +00:00
Christof Petig
424006e000 Merge branch 'site_rock_circle' into 'master' 
site_rock_circle

See merge request veloren/veloren!4175
 2023-11-10 00:31:04 +00:00
flo
9d52110a49 site_rock_circle 2023-11-10 00:31:03 +00:00
Joshua Barretto
5418f49ecb Fixed broken savannah pit altitude 2023-11-08 23:19:02 +01:00
Joshua Barretto
23e239275c Better mesa basement 2023-11-08 23:19:02 +01:00
Joshua Barretto
05863eb1ef Better mesa layer colours 2023-11-08 23:17:34 +01:00
Joshua Barretto
48ebe004c0 Added mesa generation 2023-11-08 23:17:34 +01:00
flo
a39dda80b4 jungle_ruin_chest_and_npc_fix 2023-11-04 21:12:15 +00:00
flo
e88d61eb44 npc_spawn_fixes 2023-11-01 18:39:24 +00:00
Joshua Barretto
eddbd86f1f Moved dullahan to stone ring 2023-10-19 19:26:25 +01:00
Joshua Barretto
922759a83e Make dullahan a rare spawn in dusty caves 2023-10-19 18:26:31 +01:00
Joshua Barretto
321cc030ad Better LoD giant trees 2023-10-18 09:58:00 +01:00
jshipsey
0d1b9ee4f6 rotation, better bottom bits 2023-10-13 15:39:28 -04:00
jshipsey
567b6535af airship dock 2023-10-11 22:37:17 -04:00
Marcel Märtens
8e95cb944d cargo fmt after updating new toolchain 2023-10-06 09:13:01 +02:00
Marcel Märtens
cb25a409d5 more clippy fixes in all binaries 2023-10-06 09:12:31 +02:00
Marcel Märtens
631f3ab8ee fix clippy issues, WITHOUT clippy::needless_pass_by_ref_mut as we are still unsure how to proceed with it. we want to keep the &mut ref where we are actually writing. maybe we need another method support 2023-10-05 23:23:27 +02:00
Marcel Märtens
882a8d104c Revert "extended clippy from quality.sh" 
This reverts commit 30ebb7f2edcf299e4886aa7de6573ef54353a8dd.
 2023-10-05 22:00:49 +02:00
Marcel Märtens
df03c92741 extended clippy from quality.sh 2023-10-05 22:00:49 +02:00
Marcel Märtens
394c8892bb update toolchain to nightly-2023-09-28 2023-10-05 22:00:48 +02:00
Maxicarlos08
7734b653e7
replace all uses of Arc<> with references 2023-10-02 16:52:41 +02:00
Maxicarlos08
9ababec625
fix UI issues & cleanup 2023-09-29 23:30:44 +02:00
Maxicarlos08
66f6b81575
singleplayer server initialization status 2023-09-29 23:30:14 +02:00
flo666
a470b016fb fix_desert_city_library_windowsill 2023-09-26 15:27:08 +02:00
Laura
f4d48d2689 New Arena building and visit site for NPCs 2023-09-26 12:29:14 +00:00
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
Isse
68491dde55 Merge branch 'seachapel_rework' into 'master' 
seachapel_rework

See merge request veloren/veloren!3856
 2023-05-24 18:13:29 +00:00
flo
a55276ea73 seachapel_rework 2023-05-24 18:13:29 +00:00
Tormod G. Hellen
a2ecd0b403
Replace SquareLocationRestriction with Aabr<i32>. 
This is a fixup for 1572a5a759
 2023-05-23 01:25:36 +02:00
Tormod G. Hellen
af080016ab
Get rid of the old and clunky loc_suitable_for_site function. 2023-05-22 16:35:12 +02:00
Tormod G. Hellen
a58b589c1a
Consolidate SiteKind impl. 2023-05-22 16:26:30 +02:00
Tormod G. Hellen
2397209b5d
Add proximity test. 2023-05-22 00:58:53 +02:00
Tormod G. Hellen
1572a5a759
Add location hint optimization. 2023-05-22 00:58:53 +02:00
Tormod G. Hellen
057c502218
Factor out town attribute calculation. 2023-05-22 00:58:53 +02:00
Sam
ca070f7ae8 Removed old tier-1 files 2023-05-13 09:32:29 -04:00
flo666
aca38d0cf4 review fixes 2023-05-13 09:32:29 -04:00
Sam
07afecfcd1 Clippy 2023-05-13 09:32:28 -04:00
Sam
92074e16d3 Made most inaccessible adlet caves accessible 2023-05-13 09:32:28 -04:00
flo666
8516899c18 inuit inspired location names for adlet stronghold 2023-05-13 09:32:27 -04:00
flo666
0431ebf8dc solid fill for igloo foundations 2023-05-13 09:32:26 -04:00
flo666
34bfb8ba68 tweak igloo&bonehut top decor bone 2023-05-13 09:32:26 -04:00
Isse
62a598c59b remove unwrap TODO 2023-05-13 09:32:26 -04:00
flo666
19b90d078a rebase & fix pipeline 2023-05-13 09:32:25 -04:00
flo666
7739aaff78 add more loot 2023-05-13 09:32:24 -04:00
flo666
713baa615e chests 2023-05-13 09:32:22 -04:00
flo666
7bed8488e7 level yetipit room entries 2023-05-13 09:32:22 -04:00
flo666
dfc6cbae3a reduce bonfire particles - Ember, 
reduce animals
 2023-05-13 09:32:21 -04:00
flo666
ed260f832d add loot, reduce enemies 2023-05-13 09:32:21 -04:00
flo666
c2cf88da3d - bigger yetipit mob rooms 
- tweaks
 2023-05-13 09:32:20 -04:00
flo666
17e4af3c48 BlockKind::ArtSnow 
replace BlockKind::Snow with BlockKind::Misc
 2023-05-13 09:32:19 -04:00
flo666
25ef582f1a - sprites IceCrystal, GlowIceCrystal for yetipit 
- rough creature balance
 2023-05-13 09:32:16 -04:00
flo666
38a6cc67f9 add models: bone_door, bone_keyhole, bone_key 2023-05-13 09:31:29 -04:00
flo666
72418e6804 where possible, replace intersect(painter.cylinder with intersect(painter.aabb 2023-05-13 09:30:57 -04:00
flo666
f4c7ab16d2 outside igloo variety 2023-05-13 09:30:57 -04:00
flo666
eb269c0e89 remove without() from adlet site code 2023-05-13 09:30:56 -04:00
flo666
6668df9f08 add adlet elder 2023-05-13 09:30:56 -04:00
flo666
86803c43bf adlet tracker tweaks 2023-05-13 09:30:54 -04:00
flo666
f936c2f00e rocky yetipit entrance & AdletTrap object 2023-05-13 09:30:54 -04:00
Sam
9fbc759ccd Creature distribution 2023-05-13 09:30:52 -04:00
Sam
2e9f1edef3 Adlet AI 2023-05-13 09:30:52 -04:00
Sam
92e28f09fc Adlet abilities 2023-05-13 09:30:51 -04:00
flo666
715a0b7b20 rebase 2023-05-13 09:30:50 -04:00
flo666
1750c9a0f2 structure work 2023-05-13 09:30:48 -04:00
Sam
3557f93f1e Initial cookfires and rock and bone huts 2023-05-13 09:30:19 -04:00