Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🪷🎐 ↝ [SSG-79 SSG-88]: Multi-project integration #168

Merged
merged 19 commits into from
Dec 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f4d0edf
🧑🏼‍🚀🍿 ↝ [SSG-88 SSG-89 SSM-69]: Merging projects' missions
Gizmotronn Dec 16, 2024
ba71588
🧮🛻 ↝ [SSG-90 SSC-52 SSC-53]: Chapter 1 missions for DMP
Gizmotronn Dec 18, 2024
8023752
🌂🧑🏻‍🦳 ↝ [SSG-90 SSG-91 SSC-54]: Cleaning up the post cards, improving…
Gizmotronn Dec 19, 2024
c9ef8a0
🧬🛡️ ↝ [SSM-70 SSM-71 SSC-54 SSC-52]: Chapters for both PH & Baseplate…
Gizmotronn Dec 20, 2024
ef74fb7
🌡️🥋️ ↝ [SSG-90 SSG-91]: Confirming that post cards are less redundant…
Gizmotronn Dec 20, 2024
9386cfc
🔓🏤 ↝ [SSG-92 SSM-72 SSM-73 SSC-54]: Well I just caused a few problems
Gizmotronn Dec 20, 2024
c721521
🎤🍟 ↝ [SSC-32 SSC-55 SSG-93 SSM-73]: Chapters are maybe optimised prop…
Gizmotronn Dec 20, 2024
8cdcacf
🦴⏰ ↝ [SSC-56 SSC-57]: CoM (Base) project now working for C1
Gizmotronn Dec 20, 2024
b6a322c
🐿️🎮 ↝ [SSM-75 SSM-73 SSC-56 SSP-39 SSP-40]: Adding ph gen 1 and perfo…
Gizmotronn Dec 22, 2024
7cca998
💞😵‍💫 ↝ [SSP-40]: PH Gen 1 working in-test
Gizmotronn Dec 23, 2024
65f962d
🌘🥈 ↝ [SSP-41]: Trying (and failing) to get asteroid generator integra…
Gizmotronn Dec 24, 2024
0f6b300
📑🛕 ↝ [SSC-56 SSC-58 SSC-59]: CoM C1 mission points calculator working…
Gizmotronn Dec 25, 2024
456666e
🚵🏻‍♀️🌈 ↝ [SSP-39 SSP-42]: Generators can now show in missions inside …
Gizmotronn Dec 26, 2024
dee0d11
👨🏼‍✈️🛻 ↝ [SSP-39 SSP-42]: Making some updates to 'create cards'
Gizmotronn Dec 27, 2024
8678f4e
🌡️🦽 ↝ [SSP-39 SSP-42 SSP-43 SSC-45 SSM-76]: Planet maker is now in C2…
Gizmotronn Dec 28, 2024
b7bfd28
🛵🍯 ↝ [SSP-41]: Asteroid Generator is working now
Gizmotronn Dec 28, 2024
56d122e
️🌧️🐒 ↝ [SSM-62 SSG-88]: Playing around with the post cards
Gizmotronn Dec 28, 2024
73ec49e
️💋🦾 ↝ [SSM-62 SSG-88]: Attempting to implement a new design for uploa…
Gizmotronn Dec 16, 2024
bbe2752
️🦵🏻🪸 ↝ [SSM-62 SSG-88]: Removing upload def for now
Gizmotronn Dec 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import AllAutomatonsOnActivePlanet from "@/components/Structures/Auto/AllAutomat
import { EarthViewLayout } from "@/components/(scenes)/planetScene/layout";
import Onboarding from "./scenes/onboarding/page";
import VerticalToolbar from "@/components/Layout/Toolbar";
import StructureMissionGuide from "@/components/Layout/Guide";
import SimpleeMissionGuide from "./tests/singleMissionGuide";

export default function Home() {
Expand Down
2 changes: 0 additions & 2 deletions app/scenes/mars/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { InventoryStructureItem } from "@/types/Items";
import { PlanetarySystem } from "@/components/(scenes)/planetScene/orbitals/system";
import AllAutomatonsOnActivePlanet from "@/components/Structures/Auto/AllAutomatons";
import { MiningComponentComponent } from "@/components/(scenes)/mining/mining-component";
import StructureMissionGuide from "@/components/Layout/Guide";

const MarsView: React.FC = () => {
const supabase = useSupabaseClient();
Expand Down Expand Up @@ -57,7 +56,6 @@ const MarsStructures: React.FC = () => {
return (
<MarsActionSceneLayout>
<MiningComponentComponent />
<StructureMissionGuide />
</MarsActionSceneLayout>
// <EarthViewLayout>
// <div className="w-full">
Expand Down
2 changes: 0 additions & 2 deletions app/scenes/mining/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@

import React from "react";
import { EarthActionSceneLayout, EarthViewLayout } from "@/components/(scenes)/planetScene/layout";
import StructureMissionGuide from "@/components/Layout/Guide";
import { MiningComponentComponent } from "@/components/(scenes)/mining/mining-component";

export default function Mining() {
return (
<EarthActionSceneLayout>
<MiningComponentComponent />
<StructureMissionGuide />
</EarthActionSceneLayout>
);
};
137 changes: 0 additions & 137 deletions app/starnet/feed/anomalies/page.tsx

This file was deleted.

132 changes: 0 additions & 132 deletions app/starnet/feed/page.tsx

This file was deleted.

Loading
Loading