Skip to content

Commit a4507d7

Browse files
author
boomboxhead
authored
Merge pull request #1 from M3-org/main
Add models and blender file
2 parents 0c579a2 + c69b089 commit a4507d7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+17
-13
lines changed

Diff for: README.md

+6-2

Diff for: media/7oroy.png

-85.5 KB
Binary file not shown.

Diff for: media/bankless.png

-320 KB
Binary file not shown.

Diff for: media/boomboxhead.png

-347 KB
Binary file not shown.

Diff for: media/daotown-sign.png

-738 KB
Binary file not shown.

Diff for: media/daotown.png

-1.58 MB
Binary file not shown.

Diff for: media/m3-mart.png

-481 KB
Binary file not shown.

Diff for: media/m3tv.png

-222 KB
Binary file not shown.

Diff for: media/m3tv2.png

-179 KB
Binary file not shown.

Diff for: media/metafactory-castle.png

-138 KB
Binary file not shown.

Diff for: media/mf_truck.png

-200 KB
Binary file not shown.

Diff for: media/omigroup.png

-24.2 KB
Binary file not shown.

Diff for: media/snapshot1.png

-124 KB
Binary file not shown.

Diff for: media/snapshot2.png

-125 KB
Binary file not shown.

Diff for: media/stage.png

-765 KB
Binary file not shown.

Diff for: media/stage2.png

-805 KB
Binary file not shown.

Diff for: media/tubby-island.png

-191 KB
Binary file not shown.

Diff for: media/tubbygatcha1.png

-149 KB
Binary file not shown.

Diff for: media/tubbygatcha2.png

-156 KB
Binary file not shown.

Diff for: overworld/blender/ortho.blend

55.7 MB
Binary file not shown.

Diff for: overworld/blender/ortho.blend1

38.1 MB
Binary file not shown.

Diff for: overworld/images/7oroy.png

53.4 KB

Diff for: overworld/images/HypeWheels3.png

32.5 KB

Diff for: overworld/images/anata.png

48.8 KB

Diff for: overworld/images/bankless.png

67.7 KB

Diff for: overworld/images/bodybg.png

769 KB

Diff for: overworld/images/boomboxhead.png

69.4 KB

Diff for: overworld/images/brainstorm.png

27.2 KB

Diff for: overworld/images/m3-mart.png

52.9 KB

Diff for: overworld/images/m3grow.png

77.1 KB

Diff for: overworld/images/m3tv.png

49.2 KB

Diff for: overworld/images/m3tv2.png

45 KB

Diff for: overworld/images/metafactory-castle.png

34.8 KB

Diff for: overworld/images/mf_truck.png

56.8 KB

Diff for: overworld/images/mirrorstand.png

32 KB

Diff for: overworld/images/omigroup.png

24.8 KB

Diff for: overworld/images/opensea.png

39.1 KB

Diff for: overworld/images/optimism-bridge.png

61.6 KB

Diff for: overworld/images/pepehouse.png

27.2 KB

Diff for: overworld/images/snapshot1.png

34.5 KB

Diff for: overworld/images/snapshot2.png

35.1 KB

Diff for: overworld/images/tubby-island.png

41.7 KB

Diff for: overworld/images/tubbycats.png

80.8 KB

Diff for: overworld/images/tubbygatcha1.png

51.8 KB

Diff for: overworld/images/tubbygatcha2.png

53.1 KB

Diff for: overworld/images/upstreet.png

105 KB

Diff for: overworld/images/zoramachine.png

43.6 KB

Diff for: overworld/images/zoramachine2.png

42.3 KB

Diff for: overworld/index.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919

2020
<a href="https://discord.gg/m3-org" target="_blank" class="discord"><img src="images/discord.png"><span class="tooltip">Discord Channel</span></a>
2121

22-
<a href="https://sketchfab.com/3d-models/metafactory-truck-101bd0d014fd45ab90e7552aae89375d" target="_blank" class="opensea"><img src="images/truck.png"><span class="tooltip">OpenSea Marketplace</span></a>
22+
<a href="https://sketchfab.com/3d-models/metafactory-truck-101bd0d014fd45ab90e7552aae89375d" target="_blank" class="opensea"><img src="images/OPENSEA.png"><span class="tooltip">OpenSea Marketplace</span></a>
2323

24-
<a href="https://sketchfab.com/3d-models/metafactory-truck-101bd0d014fd45ab90e7552aae89375d" target="_blank" class="snapshot"><img src="images/truck.png"><span class="tooltip">Snapshot Voting</span></a>
24+
<a href="https://sketchfab.com/3d-models/metafactory-truck-101bd0d014fd45ab90e7552aae89375d" target="_blank" class="snapshot"><img src="images/snapshot1.png"><span class="tooltip">Snapshot Voting</span></a>
2525

26-
<a href="https://sketchfab.com/3d-models/m3-mart-833699c4a15b4d1ab3e3d79068972431" target="_blank" class="m3-mart"><img src="images/truck.png"><span class="tooltip">M3 Mart</span></a>
26+
<a href="https://sketchfab.com/3d-models/m3-mart-833699c4a15b4d1ab3e3d79068972431" target="_blank" class="m3-mart"><img src="images/M3-MART.png"><span class="tooltip">M3 Mart</span></a>
2727

2828
<a href="https://sketchfab.com/3d-models/3d-skill-role-badges-and-pins-e3329ed59b874aad98586657a5f11630" target="_blank" class="badges-and-pins"><img src="images/git.png"><span class="tooltip">GitHub Badges and Pins</span></a>
2929

@@ -33,13 +33,13 @@
3333

3434
<a href="https://hyperfy.io/studio" target="_blank" class="hyperfy-hq"><img src="images/hyperfy.png"><span class="tooltip">Hyperfy HQ</span></a>
3535

36-
<a href="https://sketchfab.com/3d-models/omi-diner-b8972d0fc33047c3b475e78b3f5a9183" target="_blank" class="omi-diner"><img src="images/truck.png"><span class="tooltip">OMI Diner</span></a>
36+
<a href="https://sketchfab.com/3d-models/omi-diner-b8972d0fc33047c3b475e78b3f5a9183" target="_blank" class="omi-diner"><img src="images/omigroup.png"><span class="tooltip">OMI Diner</span></a>
3737

3838
<a href="https://sketchfab.com/3d-models/internet-archive-building-2d76cc9e714f42bb9d090af73074296a" target="_blank" class="internet-archive"><img src="images/IA.png"><span class="tooltip">Internet Archive Building</span></a>
3939

4040
<a href="https://sketchfab.com/3d-models/metafactory-castle-f08c9c88d9974c80ba88c034c25b7738" target="_blank" class="voxels-makers-district"><img src="images/cryptovoxel.png"><span class="tooltip">Voxels Makers District</span></a>
4141

42-
<a href="https://sketchfab.com/3d-models/m3tv-soundstage-6206325ff5c643c9b1dd2ce5aadbec19" target="_blank" class="m3tv-soundstage"><img src="images/studio.png"><span class="tooltip">M3TV Soundstage</span></a>
42+
<a href="https://sketchfab.com/3d-models/m3tv-soundstage-6206325ff5c643c9b1dd2ce5aadbec19" target="_blank" class="m3tv-soundstage"><img src="images/M3TV.png"><span class="tooltip">M3TV Soundstage</span></a>
4343

4444
<div class="cloud-container">
4545
<img src="images/cloud.png" class="cloud" alt="Cloud">

Diff for: overworld/models/internet_archive_building.glb

24.6 MB
Binary file not shown.

Diff for: overworld/models/m3_mart.glb

10.4 MB
Binary file not shown.

Diff for: overworld/models/m3tv_soundstage.glb

22.2 MB
Binary file not shown.

Diff for: overworld/models/metafactory_castle.glb

4.07 MB
Binary file not shown.

Diff for: overworld/models/omi_diner.glb

8.5 MB
Binary file not shown.

Diff for: overworld/styles.css

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ body {
1111

1212

1313
.map-container {
14-
background: url('images/body.png') no-repeat center center;
14+
background: url('images/bodybg.png') no-repeat center center;
1515
background-size: contain;
1616
background-color: #aee311;
1717
position: relative;
@@ -70,9 +70,8 @@ body {
7070
} /* Adjusted to percentage */
7171

7272

73-
7473
.map-container a .tooltip {
75-
visibility: hidden;
74+
visibility: visible; /* Change to visible to make the tooltip always visible */
7675
width: 120px;
7776
background-color: black;
7877
font-size: 2vh;
@@ -81,9 +80,10 @@ body {
8180
border-radius: 6px;
8281
padding: 5px 0;
8382
position: absolute;
84-
z-index: 1;
85-
top: 50%;
83+
z-index: 10000; /* Set a high z-index value */
84+
top: 10%;
8685
right: 0%;
86+
transform: translate(-50%, -50%); /* Center the tooltip */
8787
}
8888

8989
.map-container a:hover .tooltip {
@@ -247,4 +247,4 @@ body {
247247
transform: translateX(100vw) translateY(100vh); /* Moves to the bottom right */
248248
opacity: 0;
249249
}
250-
}
250+
}

0 commit comments

Comments
 (0)