Merge pull request #1 from M3-org/main

Add models and blender file
M3-org · Nov 19, 2023 · a4507d7 · a4507d7
2 parents 0c579a2 + c69b089
commit a4507d7
Show file tree

Hide file tree

Showing 55 changed files with 17 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -1,2 +1,6 @@
-# website
-simple 2D website with 3D backend
+# M3 Overworld 
+
+- https://m3-org.github.io/website/
+- https://m3-org.github.io/website/overworld/ new website (WIP)
+
+![image](https://github.com/M3-org/website/assets/7612104/4d8e6151-03da-43e9-a6d5-77d4ffcd9925)
diff --git a/media/7oroy.png b/media/7oroy.png
diff --git a/media/bankless.png b/media/bankless.png
diff --git a/media/boomboxhead.png b/media/boomboxhead.png
diff --git a/media/daotown-sign.png b/media/daotown-sign.png
diff --git a/media/daotown.png b/media/daotown.png
diff --git a/media/m3-mart.png b/media/m3-mart.png
diff --git a/media/m3tv.png b/media/m3tv.png
diff --git a/media/m3tv2.png b/media/m3tv2.png
diff --git a/media/metafactory-castle.png b/media/metafactory-castle.png
diff --git a/media/mf_truck.png b/media/mf_truck.png
diff --git a/media/omigroup.png b/media/omigroup.png
diff --git a/media/snapshot1.png b/media/snapshot1.png
diff --git a/media/snapshot2.png b/media/snapshot2.png
diff --git a/media/stage.png b/media/stage.png
diff --git a/media/stage2.png b/media/stage2.png
diff --git a/media/tubby-island.png b/media/tubby-island.png
diff --git a/media/tubbygatcha1.png b/media/tubbygatcha1.png
diff --git a/media/tubbygatcha2.png b/media/tubbygatcha2.png
diff --git a/overworld/blender/ortho.blend b/overworld/blender/ortho.blend
diff --git a/overworld/blender/ortho.blend1 b/overworld/blender/ortho.blend1
diff --git a/overworld/images/7oroy.png b/overworld/images/7oroy.png
diff --git a/overworld/images/HypeWheels3.png b/overworld/images/HypeWheels3.png
diff --git a/overworld/images/anata.png b/overworld/images/anata.png
diff --git a/overworld/images/bankless.png b/overworld/images/bankless.png
diff --git a/overworld/images/bodybg.png b/overworld/images/bodybg.png
diff --git a/overworld/images/boomboxhead.png b/overworld/images/boomboxhead.png
diff --git a/overworld/images/brainstorm.png b/overworld/images/brainstorm.png
diff --git a/overworld/images/m3-mart.png b/overworld/images/m3-mart.png
diff --git a/overworld/images/m3grow.png b/overworld/images/m3grow.png
diff --git a/overworld/images/m3tv.png b/overworld/images/m3tv.png
diff --git a/overworld/images/m3tv2.png b/overworld/images/m3tv2.png
diff --git a/overworld/images/metafactory-castle.png b/overworld/images/metafactory-castle.png
diff --git a/overworld/images/mf_truck.png b/overworld/images/mf_truck.png
diff --git a/overworld/images/mirrorstand.png b/overworld/images/mirrorstand.png
diff --git a/overworld/images/omigroup.png b/overworld/images/omigroup.png
diff --git a/overworld/images/opensea.png b/overworld/images/opensea.png
diff --git a/overworld/images/optimism-bridge.png b/overworld/images/optimism-bridge.png
diff --git a/overworld/images/pepehouse.png b/overworld/images/pepehouse.png
diff --git a/overworld/images/snapshot1.png b/overworld/images/snapshot1.png
diff --git a/overworld/images/snapshot2.png b/overworld/images/snapshot2.png
diff --git a/overworld/images/tubby-island.png b/overworld/images/tubby-island.png
diff --git a/overworld/images/tubbycats.png b/overworld/images/tubbycats.png
diff --git a/overworld/images/tubbygatcha1.png b/overworld/images/tubbygatcha1.png
diff --git a/overworld/images/tubbygatcha2.png b/overworld/images/tubbygatcha2.png
diff --git a/overworld/images/upstreet.png b/overworld/images/upstreet.png
diff --git a/overworld/images/zoramachine.png b/overworld/images/zoramachine.png
diff --git a/overworld/images/zoramachine2.png b/overworld/images/zoramachine2.png
diff --git a/overworld/index.html b/overworld/index.html
@@ -19,11 +19,11 @@
 
         <a href="https://discord.gg/m3-org" target="_blank" class="discord"><img src="images/discord.png"><span class="tooltip">Discord Channel</span></a>
 
-        <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> 
+        <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> 
 
-        <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> 
+        <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> 
 
-        <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>
+        <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>
 
         <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>
 
@@ -33,13 +33,13 @@
 
         <a href="https://hyperfy.io/studio" target="_blank" class="hyperfy-hq"><img src="images/hyperfy.png"><span class="tooltip">Hyperfy HQ</span></a>
 
-        <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>
+        <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>
 
         <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>
 
         <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>
 
-        <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>
+        <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>
 
         <div class="cloud-container">
             <img src="images/cloud.png" class="cloud" alt="Cloud">

diff --git a/overworld/models/internet_archive_building.glb b/overworld/models/internet_archive_building.glb
diff --git a/overworld/models/m3_mart.glb b/overworld/models/m3_mart.glb
diff --git a/overworld/models/m3tv_soundstage.glb b/overworld/models/m3tv_soundstage.glb
diff --git a/overworld/models/metafactory_castle.glb b/overworld/models/metafactory_castle.glb
diff --git a/overworld/models/omi_diner.glb b/overworld/models/omi_diner.glb
diff --git a/overworld/styles.css b/overworld/styles.css
@@ -11,7 +11,7 @@ body {
 
 
 .map-container {
-    background: url('images/body.png') no-repeat center center;
+    background: url('images/bodybg.png') no-repeat center center;
     background-size: contain;
     background-color: #aee311;
     position: relative;
@@ -70,9 +70,8 @@ body {
      } /* Adjusted to percentage */
 
 
-
 .map-container a .tooltip {
-    visibility: hidden;
+    visibility: visible; /* Change to visible to make the tooltip always visible */
     width: 120px;
     background-color: black;
     font-size: 2vh;
@@ -81,9 +80,10 @@ body {
     border-radius: 6px;
     padding: 5px 0;
     position: absolute;
-    z-index: 1;
-    top: 50%; 
+    z-index: 10000; /* Set a high z-index value */
+    top: 10%;
     right: 0%;
+    transform: translate(-50%, -50%); /* Center the tooltip */
 }
 
 .map-container a:hover .tooltip {
@@ -247,4 +247,4 @@ body {
               transform: translateX(100vw) translateY(100vh); /* Moves to the bottom right */
               opacity: 0;
           }
-      }
+      }