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

feat: 3d racing game #400

Merged
merged 21 commits into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c1dd1e2
up next: making the race car controls
arimulligan Oct 12, 2024
72cfce2
Merge branch 'main' of https://github.com/Tuhura-Tech/wiki into 335-3…
arimulligan Oct 13, 2024
7a4b1e0
feat: changed resource to tutorial component
arimulligan Oct 13, 2024
0186fe6
started car controls
arimulligan Oct 13, 2024
4e36b41
fix: mobile tutorial contents now shows up
arimulligan Oct 14, 2024
3446ade
added photos & finished main car controls
arimulligan Oct 14, 2024
bec710b
added some steps to make race path
arimulligan Oct 14, 2024
35db696
finished first track
arimulligan Oct 20, 2024
71ffc7c
added follow camera + car design
arimulligan Oct 30, 2024
f86181e
Built track + edits
arimulligan Oct 30, 2024
65de92a
built track barriers & hill
arimulligan Oct 30, 2024
eb696c5
finished track building & HUD
arimulligan Nov 2, 2024
55e8f7d
Update pnpm-lock.yaml
arimulligan Nov 3, 2024
96d2b74
Merge branch 'main' of https://github.com/Tuhura-Tech/wiki into 335-3…
arimulligan Nov 3, 2024
b9374e7
Revert "Merge branch 'main' of https://github.com/Tuhura-Tech/wiki in…
arimulligan Nov 3, 2024
63bd96b
Revert "Update pnpm-lock.yaml"
arimulligan Nov 3, 2024
da15b62
Merge branch 'main' of https://github.com/Tuhura-Tech/wiki into 335-3…
arimulligan Dec 10, 2024
82540c1
updated to main
arimulligan Dec 10, 2024
76327eb
added in a main menu + levels + pause menu
arimulligan Dec 13, 2024
07d6c42
quick last edits + finally done
arimulligan Dec 13, 2024
1a2cdd5
Merge branch 'main' of https://github.com/Tuhura-Tech/wiki into 335-3…
arimulligan Dec 13, 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
11 changes: 4 additions & 7 deletions astro.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,6 @@ export default defineConfig({
label: "Godot", items: [{
label: "Godot Basics",
link: "game-design/godot/basics"
},{
label: "2D Platformer",
link: "game-design/godot/2dplatformergame"
},{
label: "2D Racing Game",
link: "game-design/godot/2dracinggame"
},{
label: "Universal Features",
link: "game-design/godot/universal"
Expand All @@ -98,7 +92,10 @@ export default defineConfig({
},{
label: "Setting up C# For Godot",
link: "game-design/godot/projectsetup"
}],
},{
label: "3D Racing Game",
link: "game-design/godot/3dracinggame/0-main-scene/"
}],
collapsed: true
}],
},
Expand Down
Binary file removed src/assets/godot/2DPlatformer/screenshot1.png
Binary file not shown.
Binary file removed src/assets/godot/2DPlatformer/screenshot10.png
Binary file not shown.
Binary file removed src/assets/godot/2DPlatformer/screenshot11.png
Binary file not shown.
Binary file removed src/assets/godot/2DPlatformer/screenshot12.png
Binary file not shown.
Binary file removed src/assets/godot/2DPlatformer/screenshot2.png
Binary file not shown.
Binary file removed src/assets/godot/2DPlatformer/screenshot3.png
Binary file not shown.
Binary file removed src/assets/godot/2DPlatformer/screenshot4.png
Binary file not shown.
Binary file removed src/assets/godot/2DPlatformer/screenshot5.png
Binary file not shown.
Binary file removed src/assets/godot/2DPlatformer/screenshot6.png
Binary file not shown.
Binary file removed src/assets/godot/2DPlatformer/screenshot7.png
Binary file not shown.
Binary file removed src/assets/godot/2DPlatformer/screenshot8.png
Binary file not shown.
Binary file removed src/assets/godot/2DPlatformer/screenshot9.png
Binary file not shown.
Binary file removed src/assets/godot/2DRacing/image1.png
Binary file not shown.
Binary file removed src/assets/godot/2DRacing/image2.png
Binary file not shown.
Binary file removed src/assets/godot/2DRacing/image3.png
Binary file not shown.
Binary file removed src/assets/godot/2DRacing/image4.png
Binary file not shown.
Binary file removed src/assets/godot/2DRacing/image5.png
Binary file not shown.
Binary file removed src/assets/godot/2DRacing/image6.png
Binary file not shown.
Binary file added src/assets/godot/3DRacing/HUDFileStructure.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/godot/3DRacing/Path3DControls.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/godot/3DRacing/VehicleBodySimple.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/godot/3DRacing/curvedPath3D.png
Binary file added src/assets/godot/3DRacing/finishLine.png
Binary file added src/assets/godot/3DRacing/newTrack.png
Binary file added src/assets/godot/3DRacing/pathMeasurements.png
Binary file added src/assets/godot/3DRacing/pauseMenuHUD.png
Binary file added src/assets/godot/3DRacing/tiltButton.png
Binary file added src/assets/godot/3DRacing/titleScreen.png
Binary file added src/assets/godot/3DRacing/trackPathResult.png
2 changes: 1 addition & 1 deletion src/components/starlight/MobileTableOfContents.astro
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const { toc } = Astro.props;
</summary>
<div class="dropdown">
{isTutorial ? (
<TutorialNav id="mobile" />
<TutorialNav {...Astro.props} mobile={true} />
) : (
<TableOfContentsList toc={toc.items} isMobile />
)}
Expand Down
4 changes: 2 additions & 2 deletions src/components/tutorial/TutorialNav.astro
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ import Progress from './Progress.astro';
import UnitProgressIcon from './UnitProgressIcon.astro';

const currentUrl = Astro.url.pathname.replace(/\/$/, '');
const { id } = Astro.props;
const { id, mobile } = Astro.props;

export const allPages = await getCollection('docs');
const pages = allPages.filter((page) => isTutorialEntry(page, id));

const tutorialPages = getTutorialPages(pages);
const units = getTutorialUnits(tutorialPages);

const makeUnitId = (index: number) => `${Astro.props.id}__tutorial-unit-nav-panel-${index}`;
const makeUnitId = (index: number) => `${mobile ? "mobile" : ""}__tutorial-unit-nav-panel-${index}`;
const isCurrentUnit = (unit: (typeof units)[number]) =>
unit.lessons.some((lesson) => currentUrl.endsWith(lesson.slug));
---
Expand Down
Loading
Loading