diff --git a/.vsconfig b/.vsconfig new file mode 100644 index 0000000..d70cd98 --- /dev/null +++ b/.vsconfig @@ -0,0 +1,6 @@ +{ + "version": "1.0", + "components": [ + "Microsoft.VisualStudio.Workload.ManagedGame" + ] +} diff --git a/Assets/AssetsFORELLE/Sprites/Tilesets/BasicLevel.png b/Assets/AssetsFORELLE/Sprites/Tilesets/BasicLevel.png index 1da8fc5..30653f1 100644 --- a/Assets/AssetsFORELLE/Sprites/Tilesets/BasicLevel.png +++ b/Assets/AssetsFORELLE/Sprites/Tilesets/BasicLevel.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6725ab09d6d72abb5ee43cdd2c9c052787ba7df36c366a2a5afb6f8f82e9053 -size 3398 +oid sha256:72a4ef49b7a2961fee658101d1a0a9775ecec81c151b088fb38fe6e3c750b4e3 +size 3598 diff --git a/Assets/AssetsFORELLE/Sprites/Tilesets/Tiles/FloatingTiles/bröckelige platform_radioaktiv.png b/Assets/AssetsFORELLE/Sprites/Tilesets/Tiles/FloatingTiles/bröckelige platform_radioaktiv.png new file mode 100644 index 0000000..e3cdb2c --- /dev/null +++ b/Assets/AssetsFORELLE/Sprites/Tilesets/Tiles/FloatingTiles/bröckelige platform_radioaktiv.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a74e262bb39b743528d96f00af12087dc9b060cb9d20c5ebb03957ae310d800 +size 250 diff --git a/Assets/AssetsFORELLE/Sprites/Tilesets/Tiles/FloatingTiles/bröckelige platform_radioaktiv.png.meta b/Assets/AssetsFORELLE/Sprites/Tilesets/Tiles/FloatingTiles/bröckelige platform_radioaktiv.png.meta new file mode 100644 index 0000000..7b0435f --- /dev/null +++ b/Assets/AssetsFORELLE/Sprites/Tilesets/Tiles/FloatingTiles/bröckelige platform_radioaktiv.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: acf6d8f7fa37a3342846598466394d93 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AssetsFORELLE/Sprites/Tilesets/Tiles/FloatingTiles/floating_platform_radioaktive.png b/Assets/AssetsFORELLE/Sprites/Tilesets/Tiles/FloatingTiles/floating_platform_radioaktive.png new file mode 100644 index 0000000..25736b3 --- /dev/null +++ b/Assets/AssetsFORELLE/Sprites/Tilesets/Tiles/FloatingTiles/floating_platform_radioaktive.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad9b3dbb10461beba29bd8524335b95e7911970a8ca43998a9ff2f110e985b58 +size 401 diff --git a/Assets/AssetsFORELLE/Sprites/Tilesets/Tiles/FloatingTiles/floating_platform_radioaktive.png.meta b/Assets/AssetsFORELLE/Sprites/Tilesets/Tiles/FloatingTiles/floating_platform_radioaktive.png.meta new file mode 100644 index 0000000..faf2489 --- /dev/null +++ b/Assets/AssetsFORELLE/Sprites/Tilesets/Tiles/FloatingTiles/floating_platform_radioaktive.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: aa8d3ecdaeb3d9b42ad168a221384390 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AssetsFORELLE/Sprites/Tilesets/water and pressure plate.pyxel b/Assets/AssetsFORELLE/Sprites/Tilesets/water and pressure plate.pyxel index db468bb..4e1f5c5 100644 Binary files a/Assets/AssetsFORELLE/Sprites/Tilesets/water and pressure plate.pyxel and b/Assets/AssetsFORELLE/Sprites/Tilesets/water and pressure plate.pyxel differ diff --git a/Assets/RPGTALK/Scripts/Editor/Node Editor/Node_Editor_Framework-develop/Testdialog.txt b/Assets/RPGTALK/Scripts/Editor/Node Editor/Node_Editor_Framework-develop/Testdialog.txt new file mode 100644 index 0000000..63f893c --- /dev/null +++ b/Assets/RPGTALK/Scripts/Editor/Node Editor/Node_Editor_Framework-develop/Testdialog.txt @@ -0,0 +1 @@ +MEOWLIN THE PURRTASTIC: I AM AWESOME AND I WANT FISHH \ No newline at end of file diff --git a/Assets/RPGTALK/Scripts/Editor/Node Editor/Node_Editor_Framework-develop/Testdialog.txt.meta b/Assets/RPGTALK/Scripts/Editor/Node Editor/Node_Editor_Framework-develop/Testdialog.txt.meta new file mode 100644 index 0000000..500cde6 --- /dev/null +++ b/Assets/RPGTALK/Scripts/Editor/Node Editor/Node_Editor_Framework-develop/Testdialog.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f199606f9a757c643b028e6170e23d20 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity index 19995c1..a0c0d0d 100644 --- a/Assets/Scenes/Prototype.unity +++ b/Assets/Scenes/Prototype.unity @@ -2014,6 +2014,7 @@ GameObject: - component: {fileID: 170098610} - component: {fileID: 170098609} - component: {fileID: 170098617} + - component: {fileID: 170098618} m_Layer: 0 m_Name: Frank m_TagString: Player @@ -2204,6 +2205,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: inFirstDim: 1 +--- !u!114 &170098618 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 170098608} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 751a28d482d8ba345b9156a7f8e19f66, type: 3} + m_Name: + m_EditorClassIdentifier: + person: {fileID: 170098608} --- !u!1 &192372226 GameObject: m_ObjectHideFlags: 0 @@ -2260,9 +2274,9 @@ MonoBehaviour: callbackBeforeTalk: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: CancelControls + - m_Target: {fileID: 170098618} + m_TargetAssemblyTypeName: stopFrank, Assembly-CSharp + m_MethodName: stopFrankFast m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -2274,13 +2288,13 @@ MonoBehaviour: m_CallState: 2 lineToStart: 1 lineToBreak: 37 - txtToParse: {fileID: 4900000, guid: 7f185b9559d0d0047bbba8408794334c, type: 3} + txtToParse: {fileID: 4900000, guid: f199606f9a757c643b028e6170e23d20, type: 3} overwriteCallbackAfterTalk: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: WhoAreYou + - m_Target: {fileID: 170098618} + m_TargetAssemblyTypeName: stopFrank, Assembly-CSharp + m_MethodName: stopFrankFast m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -4127,7 +4141,7 @@ SpriteRenderer: m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &835580476 @@ -46490,7 +46504,7 @@ SpriteRenderer: m_Size: {x: 2, y: 2} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &2067597304 diff --git a/ProjectSettings/TimelineSettings.asset b/ProjectSettings/TimelineSettings.asset new file mode 100644 index 0000000..cfaebd7 --- /dev/null +++ b/ProjectSettings/TimelineSettings.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + 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: a287be6c49135cd4f9b2b8666c39d999, type: 3} + m_Name: + m_EditorClassIdentifier: + assetDefaultFramerate: 60 + m_DefaultFrameRate: 60