Squashed commit of the following:
commitb240dc6adfMerge:772766866a9810Author: qlr32 <qloree@oakland.edu> Date: Mon Jan 27 18:18:03 2025 -0500 Merge branch 'main' into quentin123 commit772766882dAuthor: qlr32 <qloree@oakland.edu> Date: Mon Jan 27 18:17:29 2025 -0500 pixel test pixelt est commit83e0012a3fAuthor: Qloree32 <qloree@oakland.edu> Date: Mon Jan 27 13:34:41 2025 -0500 pixel art test pixel art test commit6747d86877Author: Qloree32 <qloree@oakland.edu> Date: Mon Jan 27 13:31:32 2025 -0500 pixel art test pixel art test commit5f084fb932Author: Qloree32 <qloree@oakland.edu> Date: Mon Jan 27 13:24:56 2025 -0500 pixel art test pixel art test commit8313737908Author: Qloree32 <qloree@oakland.edu> Date: Sun Jan 26 21:57:37 2025 -0500 pixel art test1.1 1.1 commit10d34d4d29Author: Qloree32 <qloree@oakland.edu> Date: Sun Jan 26 21:57:05 2025 -0500 pixel art test test commit6f4c810759Merge:84f1a66285a5fbAuthor: Qloree32 <qloree@oakland.edu> Date: Sun Jan 26 20:57:09 2025 -0500 Merge branch 'main' into quentin commit84f1a664c9Author: Qloree32 <qloree@oakland.edu> Date: Sun Jan 26 20:56:44 2025 -0500 f
This commit is contained in:
@@ -54,7 +54,19 @@ MonoBehaviour:
|
||||
- rid: 7752762179098771474
|
||||
- rid: 7752762179098771475
|
||||
- rid: 7752762179098771476
|
||||
<<<<<<< Updated upstream
|
||||
<<<<<<< Updated upstream
|
||||
<<<<<<< Updated upstream
|
||||
- rid: 8239426011147272263
|
||||
=======
|
||||
- rid: 3813502762424205379
|
||||
>>>>>>> Stashed changes
|
||||
=======
|
||||
- rid: 3813502762424205379
|
||||
>>>>>>> Stashed changes
|
||||
=======
|
||||
- rid: 3813502762424205379
|
||||
>>>>>>> Stashed changes
|
||||
m_RuntimeSettings:
|
||||
m_List: []
|
||||
m_AssetVersion: 8
|
||||
@@ -80,6 +92,10 @@ MonoBehaviour:
|
||||
references:
|
||||
version: 2
|
||||
RefIds:
|
||||
- rid: 3813502762424205379
|
||||
type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
|
||||
data:
|
||||
m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2}
|
||||
- rid: 7752762179098771456
|
||||
type: {class: UniversalRenderPipelineRuntimeTextures, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
|
||||
data:
|
||||
|
||||
Reference in New Issue
Block a user