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,502 Commits 151 Branches 18 Tags 2.1 GiB
f1a2f090eb
Commit Graph

1883 Commits

Author SHA1 Message Date
Syniis
148eef4805 Various changes to crystal generation and WIP flowers 2024-02-24 23:09:01 +01:00
Syniis
ec310efb3c More cave features 2024-02-24 23:09:01 +01:00
flo
ab89750a9a Merge branch 'terracotta_tweaks' into 'master' 
terracotta_small_tweaks

See merge request veloren/veloren!4332
 2024-02-21 21:52:09 +00:00
flo
673425f9f1 terracotta_small_tweaks 2024-02-21 21:52:09 +00:00
UncomfySilence
fc08c172c2 revert cave spawn chance 2024-02-21 15:50:16 +01:00
UncomfySilence
f3cc4bf90f cave and tree distributions and minor tweaks 2024-02-21 12:28:41 +01:00
flo
ed4fd55bc3 terracotta 2024-02-15 06:08:03 +00:00
Youssef Fahmy
0d2938d8f1 Beginner balance tweaks 2024-02-14 23:23:29 +00:00
Marcel Märtens
fc076a39fb remove unmaintained fehler crate by updating lz-fear and zwitch to culpa 2024-02-10 11:30:36 +01:00
juliancoffee
52328b89d2 rebase 2024-02-08 16:25:39 +02:00
laundmo
283b404724 Working wind/lift particles 
+ clippy fixes
 2024-02-08 16:25:39 +02:00
laundmo
6e5bd89818 Add near_water boolean to TerrainChunkMeta 
+ lots of smaller tweaks and changes
+ tuning to make more fun (its a bit strong though)
 2024-02-08 16:25:39 +02:00
laundmo
91c718b931 easier chunk normal using double cross product 2024-02-08 16:25:39 +02:00
laundmo
59bf62a453 Add approximate chunk terrain normals into sim 2024-02-08 16:25:38 +02:00
laundmo
761953513b Initial work for gliding lift, updraft, thermals 2024-02-08 16:25:38 +02:00
Marcel Märtens
6ebbb89d4d update toolchain to nightly-2024-01-17 2024-02-05 19:51:50 +01:00
Treeco
7496aa5357 Added LOD objects for new forest types 2024-01-31 23:01:44 +00:00
BigKhan
7aa9955e98 Update mod.rs 2024-01-31 17:25:27 +00:00
BigKhan
16156a8887 removed a SPACE 2024-01-31 16:50:53 +00:00
BigKhan
554e5b6c80 Added Autumn ForestKind 2024-01-31 16:50:13 +00:00
BigKhan
87c00b5645 did the fmt thing 2024-01-31 13:22:08 +00:00
BigKhan
ee10e03736 wood darker 2024-01-31 13:19:48 +00:00
BigKhan
a07a4ca926 fixed flying branches 2024-01-31 13:15:52 +00:00
BigKhan
f600d48e15 Added Cherry Tree ForestKind 2024-01-31 13:15:26 +00:00
BigKhan
fd173e7f08 did what isse said i should do 2024-01-28 14:42:08 +00:00
BigKhan
69f549deab made the trees maples instead. renamed the ForestKind to match. 2024-01-28 14:34:11 +00:00
BigKhan
9d36a1446d adding autumn trees to temperate forest 2024-01-27 22:52:57 +00:00
BigKhan
f626fdc496 Added Autumn Trees 2024-01-27 21:12:51 +00:00
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