Skip to content

Keep track of current house and tasks tea 168 #23

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
Wolfleader101 wants to merge 40 commits into
base: dev
Choose a base branch
from
Open

Keep track of current house and tasks tea 168 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
db979de
2 houses filled up sisters
Blake-Caldwell May 28, 2023
6f08d59
1 more house to fill
Blake-Caldwell May 28, 2023
2b22c66
interactables and triggers
Blake-Caldwell May 29, 2023
e63e91d
adding house stuff
Wolfleader101 May 29, 2023
28e601a
bin yellow
Blake-Caldwell May 29, 2023
a205b16
lights in interactables ya dog
Blake-Caldwell May 29, 2023
94d2129
cya bitch
Blake-Caldwell May 29, 2023
4136a19
fixing up tutorial house script
Wolfleader101 May 29, 2023
6af460e
Merge remote-tracking branch 'origin/keep-track-of-current-house-and-…
Wolfleader101 May 29, 2023
03813dd
collider for town hall
Blake-Caldwell May 29, 2023
e6d5129
player interactions should be working
Wolfleader101 May 30, 2023
8d1f9cc
fixed tutorial house shit
Wolfleader101 May 30, 2023
5c7e389
added in hand interacitons
Wolfleader101 May 30, 2023
6623f7e
player prefab updatd
Wolfleader101 May 30, 2023
cb02c17
updated script
Wolfleader101 May 30, 2023
6025823
Update OutdoorScene.unity
Blake-Caldwell May 30, 2023
d1c58a0
working iffy
Blake-Caldwell May 30, 2023
3700054
rigid n collider
Blake-Caldwell May 30, 2023
c98fce4
Occlusion culling baked brutha
Blake-Caldwell May 30, 2023
53521cc
epic
Blake-Caldwell May 30, 2023
dfe8258
Merge branch 'dev' into keep-track-of-current-house-and-tasks-tea-168
Blake-Caldwell May 30, 2023
d1044f8
vr should work
Wolfleader101 May 30, 2023
c41e74a
Merge remote-tracking branch 'origin/keep-track-of-current-house-and-…
Wolfleader101 May 30, 2023
e25f8ce
xr updated
Wolfleader101 May 30, 2023
941da3b
Im a fucking spastic
Blake-Caldwell May 30, 2023
f356e5f
Merge remote-tracking branch 'origin/keep-track-of-current-house-and-…
Wolfleader101 May 30, 2023
b46763f
currentr house and score
Wolfleader101 May 30, 2023
be29454
current house momenbt
Wolfleader101 May 30, 2023
b42b4df
fix for scriot
Wolfleader101 May 30, 2023
2a53961
ac fix
Wolfleader101 May 30, 2023
b06d9d7
it all works
Wolfleader101 May 30, 2023
daa291e
yeaaa
EmperorLemon May 30, 2023
d927618
it works
Wolfleader101 May 30, 2023
47259a3
Merge remote-tracking branch 'origin/keep-track-of-current-house-and-…
Wolfleader101 May 30, 2023
1315033
speed
Blake-Caldwell May 30, 2023
7ee5545
ai agents
Wolfleader101 May 30, 2023
cf5ed32
text ui working
Blake-Caldwell May 30, 2023
a3de1f0
collider
Blake-Caldwell May 30, 2023
6294de8
Merge remote-tracking branch 'origin/keep-track-of-current-house-and-…
Wolfleader101 May 30, 2023
364ce22
GG Anna
Blake-Caldwell May 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Assets/Models/Fix.meta → Assets/HouseFurniturePack.meta
View file
Open in desktop

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

8 changes: 8 additions & 0 deletions Assets/HouseFurniturePack/Materials.meta
View file
Open in desktop

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

131 changes: 131 additions & 0 deletions Assets/HouseFurniturePack/Materials/Additional_SmallProps.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Additional_SmallProps
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ValidKeywords:
- _METALLICSPECGLOSSMAP
- _NORMALMAP
- _OCCLUSIONMAP
m_InvalidKeywords: []
m_LightmapFlags: 6
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2000
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: 725149da17ef35e4f853851ef4a879ca, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 2800000, guid: f1d07f89a5a75d646a24bd42a1850854, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 725149da17ef35e4f853851ef4a879ca, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 2800000, guid: 6ec6e44ec9e2c70498d3fd7075c75d13, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 2800000, guid: 6ec6e44ec9e2c70498d3fd7075c75d13, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0.71
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 1
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Surface: 0
- _UVSec: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.9044118, g: 0.9044118, b: 0.9044118, a: 1}
- _Color: {r: 0.9044118, g: 0.9044118, b: 0.9044118, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
--- !u!114 &3106740886111242325
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
8 changes: 8 additions & 0 deletions Assets/HouseFurniturePack/Materials/Additional_SmallProps.mat.meta
View file
Open in desktop

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

128 changes: 128 additions & 0 deletions Assets/HouseFurniturePack/Materials/Basement_Props.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Basement_Props
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 6
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2000
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: 772172fc216aa0d4682bda9904c63aaa, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 2800000, guid: 5b990c507848e9c43b42bb2493a20e71, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 2800000, guid: b7fc0fdc99aebd74f882ee79b0fd3412, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 2800000, guid: b7fc0fdc99aebd74f882ee79b0fd3412, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 1
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Surface: 0
- _UVSec: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.8602941, g: 0.8602941, b: 0.8602941, a: 1}
- _Color: {r: 0.8602941, g: 0.8602941, b: 0.8602941, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
--- !u!114 &1318938592558340960
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
8 changes: 8 additions & 0 deletions Assets/HouseFurniturePack/Materials/Basement_Props.mat.meta
View file
Open in desktop

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

Loading