Commit Graph

338 Commits

Author SHA1 Message Date
flo
48a79b3e78 haniwa 2024-01-20 17:45:23 +00: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
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
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
flo
a39dda80b4 jungle_ruin_chest_and_npc_fix 2023-11-04 21:12:15 +00: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
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
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
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
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