Skip to content

Edgar3 #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
Glorytomankind wants to merge 25 commits into
base: master
Choose a base branch
from
Open

Edgar3 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
c2e2304
Particula glow creada
Glorytomankind Mar 6, 2019
f092912
Luces del pasillo creadas, hace falta revisión por si acaso, te quier…
Glorytomankind Mar 13, 2019
7c15cfa
He hecho el glow mejorado y está en el pasillo, te quiero muchinfinit…
Glorytomankind Mar 13, 2019
6c9b691
Arregladas luces de la sala segura, ahora importaré la sala de la niñ…
Glorytomankind Mar 14, 2019
d490781
He añadido la sala del puzzle, falta por iluminar y a ti te falta por…
Glorytomankind Mar 14, 2019
e15ccd9
La zona del puzzle está iluminada, pero no tanto como lo que iluminas…
Glorytomankind Mar 14, 2019
cfe7d72
Estoy haciendo la biblioteca, tengo que cabarla y empezar a poner tex…
ximoko Mar 15, 2019
2645546
He "finisheado" el rayo, ahora estoy haciendo la iluminación de la bu…
Glorytomankind Mar 18, 2019
355fb08
AitorHijodeputa
Glorytomankind Mar 19, 2019
f4fca7e
Sigo arreglando el pasillo, ahora ya estoy montando la biblioteca, ai…
Glorytomankind Mar 21, 2019
b61f8b1
La biblioteca está texturzada, tengo que ponerle las luces y cambiar …
Glorytomankind Mar 22, 2019
ac65b36
He importado el pasillo oeste, he acabado de montar la biblio y la sa…
Glorytomankind Mar 26, 2019
82666a4
Pues hoy no he hecho mucho la verdad, pero tú has hecho menos por rec…
Mar 27, 2019
9f21d16
He acabado la sala de revelado ahora solo faltan dos
Glorytomankind Apr 1, 2019
2ddca8b
Estoy poniendo luces en el pasillo, como tú le pones la luz a mi cora…
Glorytomankind Apr 1, 2019
f880a01
El pasillo oeste está finished y ahora solo queda el pasillo de arrib…
Glorytomankind Apr 2, 2019
c580aad
Sigo con el pasillo de arriba
Glorytomankind Apr 3, 2019
48bc386
Acabado el pasillo de arriba. VAMOS VAMOS SOLO ME PARA UNA BALA ME EN…
Glorytomankind Apr 3, 2019
dd8510a
colliders biblioteca
SalvadorRodri Apr 4, 2019
c0b26d0
Policolgada
Glorytomankind Apr 9, 2019
db1e38c
Sindrome de tunelcarpiano la plli está colgada y buen muerta
Glorytomankind Apr 10, 2019
1c4f735
yeah perdonen kamehameha después del tema del tetris viene el dragon …
Glorytomankind Apr 10, 2019
8ede767
No sé qué he hecho hoy la verdad
Glorytomankind Apr 11, 2019
e962291
He hecho unos elementos de circo para ir poniendo
Glorytomankind Apr 16, 2019
0b4dd18
Laflamaylasangreestánhechas
Glorytomankind Apr 19, 2019
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
4,633 changes: 4,633 additions & 0 deletions Assets/Export/Particle System.prefab
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions Assets/Export/Particle System.prefab.meta
View file
Open in desktop

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

79 changes: 79 additions & 0 deletions Assets/Export/Point Light (1) 1.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_SourcePrefab: {fileID: 0}
m_RootGameObject: {fileID: 1666543610718686}
m_IsPrefabAsset: 1
--- !u!1 &1666543610718686
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4043766160053228}
- component: {fileID: 108669237626164362}
m_Layer: 0
m_Name: Point Light (1) 1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4043766160053228
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1666543610718686}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -19.280462, y: 1.387, z: 69.87}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!108 &108669237626164362
Light:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1666543610718686}
m_Enabled: 1
serializedVersion: 8
m_Type: 2
m_Color: {r: 0.75, g: 0.75, b: 1, a: 1}
m_Intensity: 0.8
m_Range: 14.91
m_SpotAngle: 30
m_CookieSize: 10
m_Shadows:
m_Type: 0
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 0.402
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 823
m_Lightmapping: 4
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_ShadowRadius: 0
m_ShadowAngle: 0
8 changes: 8 additions & 0 deletions Assets/Export/Point Light (1) 1.prefab.meta
View file
Open in desktop

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

79 changes: 79 additions & 0 deletions Assets/Export/Point Light (1).prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_SourcePrefab: {fileID: 0}
m_RootGameObject: {fileID: 1137755309334324}
m_IsPrefabAsset: 1
--- !u!1 &1137755309334324
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4994074994489130}
- component: {fileID: 108432940085342644}
m_Layer: 0
m_Name: Point Light (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4994074994489130
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1137755309334324}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -19.280462, y: 1.387, z: 69.87}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!108 &108432940085342644
Light:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1137755309334324}
m_Enabled: 1
serializedVersion: 8
m_Type: 2
m_Color: {r: 0.75, g: 0.75, b: 1, a: 1}
m_Intensity: 0.8
m_Range: 14.91
m_SpotAngle: 30
m_CookieSize: 10
m_Shadows:
m_Type: 0
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 0.402
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 823
m_Lightmapping: 4
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_ShadowRadius: 0
m_ShadowAngle: 0
8 changes: 8 additions & 0 deletions Assets/Export/Point Light (1).prefab.meta
View file
Open in desktop

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

85 changes: 85 additions & 0 deletions Assets/Export/Quad (1).prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_SourcePrefab: {fileID: 0}
m_RootGameObject: {fileID: 1802528471724344}
m_IsPrefabAsset: 1
--- !u!1 &1802528471724344
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4533102125138058}
- component: {fileID: 33914230135454192}
- component: {fileID: 23629940293726418}
m_Layer: 0
m_Name: Quad (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4533102125138058
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1802528471724344}
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: -24.112, y: 1.47, z: 71.52}
m_LocalScale: {x: 8.496035, y: 4.278, z: 1.4244}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
--- !u!23 &23629940293726418
MeshRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1802528471724344}
m_Enabled: 1
m_CastShadows: 3
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_RenderingLayerMask: 4294967295
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!33 &33914230135454192
MeshFilter:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1802528471724344}
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
8 changes: 8 additions & 0 deletions Assets/Export/Quad (1).prefab.meta
View file
Open in desktop

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

85 changes: 85 additions & 0 deletions Assets/Export/Quad (2).prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_SourcePrefab: {fileID: 0}
m_RootGameObject: {fileID: 1967642521324226}
m_IsPrefabAsset: 1
--- !u!1 &1967642521324226
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4011815059065234}
- component: {fileID: 33005598204934844}
- component: {fileID: 23396605813471664}
m_Layer: 0
m_Name: Quad (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4011815059065234
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1967642521324226}
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: -19.24, y: 0.12, z: 71.113}
m_LocalScale: {x: 8.496035, y: 0.49513572, z: 1.4244}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
--- !u!23 &23396605813471664
MeshRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1967642521324226}
m_Enabled: 1
m_CastShadows: 3
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_RenderingLayerMask: 4294967295
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!33 &33005598204934844
MeshFilter:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1967642521324226}
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
8 changes: 8 additions & 0 deletions Assets/Export/Quad (2).prefab.meta
View file
Open in desktop

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

Loading