# Conflicts:
#	Assets/TextMesh Pro/Fonts/TMP_Assets/CourierPrime-Regular SDF.asset
#	Assets/TextMesh Pro/Fonts/TMP_Assets/CutiveMono-Regular SDF.asset
#	Assets/TextMesh Pro/Fonts/TMP_Assets/Inconsolata-VariableFont_wdth,wght SDF.asset
#	Assets/TextMesh Pro/Fonts/TMP_Assets/OxygenMono-Regular SDF.asset
#	Assets/TextMesh Pro/Fonts/TMP_Assets/ShareTechMono-Regular SDF.asset
#	Assets/TextMesh Pro/Fonts/TMP_Assets/SpecialElite-Regular SDF.asset
#	Assets/_Content/Prefabs/OctoPlayerFP.prefab
#	Packages/OctoCore/Runtime/Scripts/Components/OctoPlayer.cs
This commit is contained in:
Ferlat Thibaud
2026-06-03 13:52:36 +02:00
64 changed files with 6855 additions and 4698 deletions
@@ -1,2 +1,27 @@
fileFormatVersion: 2
guid: d1d38d88a124d5246a9fd0f0e9e1fe87
guid: d1d38d88a124d5246a9fd0f0e9e1fe87
PluginImporter:
externalObjects: {}
serializedVersion: 3
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
Any:
enabled: 0
settings: {}
Editor:
enabled: 0
settings:
DefaultValueInitialized: true
OSXUniversal:
enabled: 1
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:
@@ -1,2 +1,27 @@
fileFormatVersion: 2
guid: 1e6017c8ce4747d4dbae4aa39826a07c
guid: 1e6017c8ce4747d4dbae4aa39826a07c
PluginImporter:
externalObjects: {}
serializedVersion: 3
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
Any:
enabled: 0
settings: {}
Editor:
enabled: 0
settings:
DefaultValueInitialized: true
OSXUniversal:
enabled: 1
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:
@@ -1,2 +1,27 @@
fileFormatVersion: 2
guid: 0d23c940ee9321f4aa6c196361b94d74
guid: 0d23c940ee9321f4aa6c196361b94d74
PluginImporter:
externalObjects: {}
serializedVersion: 3
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
Any:
enabled: 0
settings: {}
Editor:
enabled: 0
settings:
DefaultValueInitialized: true
OSXUniversal:
enabled: 1
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:
@@ -1,2 +1,27 @@
fileFormatVersion: 2
guid: 350f292ac9d468343ab2a9288c944bb0
guid: 350f292ac9d468343ab2a9288c944bb0
PluginImporter:
externalObjects: {}
serializedVersion: 3
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
Any:
enabled: 0
settings: {}
Editor:
enabled: 0
settings:
DefaultValueInitialized: true
OSXUniversal:
enabled: 1
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:
@@ -1,2 +1,27 @@
fileFormatVersion: 2
guid: 4cbafe3e1d7c5544abfb3c41ca54e3f3
guid: 4cbafe3e1d7c5544abfb3c41ca54e3f3
PluginImporter:
externalObjects: {}
serializedVersion: 3
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
Any:
enabled: 0
settings: {}
Editor:
enabled: 0
settings:
DefaultValueInitialized: true
OSXUniversal:
enabled: 1
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:
@@ -1,2 +1,27 @@
fileFormatVersion: 2
guid: 723222076c07afc4293168e02fbcdf25
guid: 723222076c07afc4293168e02fbcdf25
PluginImporter:
externalObjects: {}
serializedVersion: 3
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
Any:
enabled: 0
settings: {}
Editor:
enabled: 0
settings:
DefaultValueInitialized: true
OSXUniversal:
enabled: 1
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:
@@ -1,2 +1,27 @@
fileFormatVersion: 2
guid: 8733469f1f01b064a842cbf9bb084802
guid: 8733469f1f01b064a842cbf9bb084802
PluginImporter:
externalObjects: {}
serializedVersion: 3
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
Any:
enabled: 0
settings: {}
Editor:
enabled: 0
settings:
DefaultValueInitialized: true
OSXUniversal:
enabled: 1
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:
@@ -1,2 +1,27 @@
fileFormatVersion: 2
guid: 28a752fddafa67b46aa481b5bdad34cf
guid: 28a752fddafa67b46aa481b5bdad34cf
PluginImporter:
externalObjects: {}
serializedVersion: 3
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
Any:
enabled: 0
settings: {}
Editor:
enabled: 0
settings:
DefaultValueInitialized: true
OSXUniversal:
enabled: 1
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:
@@ -1,2 +1,29 @@
fileFormatVersion: 2
guid: cf56a3a7b5de28a46b9f9981e76e7244
guid: cf56a3a7b5de28a46b9f9981e76e7244
PluginImporter:
externalObjects: {}
serializedVersion: 3
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
Any:
enabled: 0
settings: {}
Editor:
enabled: 1
settings:
CPU: AnyCPU
DefaultValueInitialized: true
OS: OSX
OSXUniversal:
enabled: 1
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,18 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: c945e91273b87a045b723cc8ddded56c, type: 3}
m_Name: 3B7065D1-9A3B-4166-8CD1-0CCC60BE9E15
m_EditorClassIdentifier: AK.Wwise.Unity.API.WwiseTypes::WwiseEventReference
objectName: Play_FlashHallu
id: 1497902650
guid: 3B7065D1-9A3B-4166-8CD1-0CCC60BE9E15
IsInUserDefinedSoundBank: 0
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: b6053d4e76e193d4f9a7bf1dcddb7e5b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant: