Skip to content

Munene kariuki #2

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.

Sign up for GitHub

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

Open
Collins-kariuk wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Munene kariuki #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7996a24
Create Tech Hub Base Model1.obj
Collins-kariuk Apr 15, 2023
d2a4cd2
Stashed changes commit
Collins-kariuk Apr 15, 2023
b3eb757
Merge remote-tracking branch 'origin/justin-branch' into Gagey
Collins-kariuk Apr 15, 2023
6be8972
Merge branch 'Gagey' of https://github.com/harryber/Hackathon2023 int…
Collins-kariuk Apr 15, 2023
6832767
Merge branch 'main' into Munene-Kariuki
Collins-kariuk Apr 15, 2023
169a92d
Merge into personal branch from main
Collins-kariuk Apr 15, 2023
4471e60
Merge branch 'main' into Munene-Kariuki
Collins-kariuk Apr 15, 2023
5825895
Changes to the sample scene
Collins-kariuk Apr 15, 2023
ab49c83
Merge branch 'main' into Munene-Kariuki
Collins-kariuk Apr 15, 2023
2189f37
Merge branch 'Gagey' into Munene-Kariuki
Collins-kariuk Apr 15, 2023
3574b38
Update default
Collins-kariuk Apr 15, 2023
17be8ef
Update default-2022.dwlt
Collins-kariuk Jul 19, 2023
7bd852d
Updated location of repo
Collins-kariuk Sep 24, 2023
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
Binary file modified .DS_Store
View file
Open in desktop
Binary file not shown.
Binary file modified Assets/.DS_Store
View file
Open in desktop
Binary file not shown.
514 changes: 514 additions & 0 deletions Assets/3D Objects/Tech Hub Base Model1.obj
View file
Open in desktop

Large diffs are not rendered by default.

108 changes: 108 additions & 0 deletions Assets/3D Objects/Tech Hub Base Model1.obj.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions Assets/3rdParty/OkGoDoIt/OpenAI_API/OpenAI_API.csproj.meta
View file
Open in desktop

This file was deleted.

27 changes: 14 additions & 13 deletions Assets/Scenes/SampleScene.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 705507994}
m_IndirectSpecularColor: {r: 0.18028331, g: 0.2257133, b: 0.3069217, a: 1}
m_IndirectSpecularColor: {r: 0.18028305, g: 0.22571313, b: 0.3069213, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
Expand Down Expand Up @@ -154,7 +154,7 @@ Transform:
- {fileID: 1362810418}
- {fileID: 294151947}
m_Father: {fileID: 0}
m_RootOrder: 12
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &144818249
GameObject:
Expand Down Expand Up @@ -223,7 +223,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 10
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 52.989, z: 0}
--- !u!1 &230258653
GameObject:
Expand Down Expand Up @@ -428,7 +428,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 10
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &329613544
GameObject:
Expand Down Expand Up @@ -753,7 +753,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &713298175
GameObject:
Expand Down Expand Up @@ -1332,7 +1332,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 8
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &911438436
GameObject:
Expand Down Expand Up @@ -1567,7 +1567,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 11
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &939613661
MonoBehaviour:
Expand All @@ -1586,6 +1586,7 @@ MonoBehaviour:
start: 0
ready: 1
text: 1
timeRemaining: 0
--- !u!1 &963194225
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1801,7 +1802,7 @@ RectTransform:
- {fileID: 924685756}
- {fileID: 1952252301}
m_Father: {fileID: 0}
m_RootOrder: 9
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
Expand Down Expand Up @@ -2442,12 +2443,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1252249360}
m_LocalRotation: {x: -0, y: 0.20893998, z: -0, w: 0.97792846}
m_LocalPosition: {x: -4.73, y: 2.12, z: -9.4}
m_LocalPosition: {x: -25.4, y: 2.12, z: 23.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 7
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 24.12, z: 0}
--- !u!4 &1290399833 stripped
Transform:
Expand Down Expand Up @@ -2788,7 +2789,7 @@ Transform:
- {fileID: 694468001}
- {fileID: 1507857349}
m_Father: {fileID: 0}
m_RootOrder: 5
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!64 &1445328126
MeshCollider:
Expand Down Expand Up @@ -8404,7 +8405,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 13
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1908099796
GameObject:
Expand Down Expand Up @@ -8648,7 +8649,7 @@ Transform:
- {fileID: 1515359184}
- {fileID: 1650876012}
m_Father: {fileID: 0}
m_RootOrder: 11
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2005920447
GameObject:
Expand Down
Loading