diff --git a/.hgignore b/.hgignore index 36f5367..d885d87 100644 --- a/.hgignore +++ b/.hgignore @@ -2,7 +2,4 @@ glob:obj/* glob:Temp/* glob:Library/* -glob:*.mdb -glob:*.mdb.meta - glob:.DS_Store diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 3aeb517..3fab177 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -19,7 +19,7 @@ full false Temp\bin\Debug\ - DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_3_6;UNITY_5_3;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_WEBGL;UNITY_WEBGL_API;UNITY_DISABLE_WEB_VERIFICATION;ENABLE_TEXTUREID_MAP;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_LOG_MIXED_STACKTRACE;ENABLE_IL2CPP;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX + DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_3_6;UNITY_5_3;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_LOG_MIXED_STACKTRACE;ENABLE_UNITYWEBREQUEST;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX prompt 4 0169 @@ -62,8 +62,8 @@ /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll - - /Users/matov/Programming/Projects/unityflash/Assets/FlashTools/Plugins/FTRuntimeDemo.dll + + /Users/matov/Programming/Projects/unityflash/Assets/FlashTools/Plugins/FTRuntime.dll diff --git a/Assets/FlashTools/Plugins/Editor/FTEditor.dll b/Assets/FlashTools/Plugins/Editor/FTEditor.dll new file mode 100755 index 0000000..bacb5a8 Binary files /dev/null and b/Assets/FlashTools/Plugins/Editor/FTEditor.dll differ diff --git a/Assets/FlashTools/Plugins/Editor/FTEditorDemo.dll.meta b/Assets/FlashTools/Plugins/Editor/FTEditor.dll.meta similarity index 100% rename from Assets/FlashTools/Plugins/Editor/FTEditorDemo.dll.meta rename to Assets/FlashTools/Plugins/Editor/FTEditor.dll.meta diff --git a/Assets/FlashTools/Plugins/Editor/FTEditorDemo.dll b/Assets/FlashTools/Plugins/Editor/FTEditorDemo.dll deleted file mode 100755 index 1ef0a26..0000000 Binary files a/Assets/FlashTools/Plugins/Editor/FTEditorDemo.dll and /dev/null differ diff --git a/Assets/FlashTools/Plugins/Editor/FTSwfToolsDemo.dll b/Assets/FlashTools/Plugins/Editor/FTSwfTools.dll similarity index 69% rename from Assets/FlashTools/Plugins/Editor/FTSwfToolsDemo.dll rename to Assets/FlashTools/Plugins/Editor/FTSwfTools.dll index 76d3d52..94fe2a6 100755 Binary files a/Assets/FlashTools/Plugins/Editor/FTSwfToolsDemo.dll and b/Assets/FlashTools/Plugins/Editor/FTSwfTools.dll differ diff --git a/Assets/FlashTools/Plugins/Editor/FTSwfToolsDemo.dll.meta b/Assets/FlashTools/Plugins/Editor/FTSwfTools.dll.meta similarity index 100% rename from Assets/FlashTools/Plugins/Editor/FTSwfToolsDemo.dll.meta rename to Assets/FlashTools/Plugins/Editor/FTSwfTools.dll.meta diff --git a/Assets/FlashTools/Plugins/FTRuntimeDemo.dll b/Assets/FlashTools/Plugins/FTRuntime.dll similarity index 66% rename from Assets/FlashTools/Plugins/FTRuntimeDemo.dll rename to Assets/FlashTools/Plugins/FTRuntime.dll index c239b53..47ccefc 100755 Binary files a/Assets/FlashTools/Plugins/FTRuntimeDemo.dll and b/Assets/FlashTools/Plugins/FTRuntime.dll differ diff --git a/Assets/FlashTools/Plugins/FTRuntimeDemo.dll.meta b/Assets/FlashTools/Plugins/FTRuntime.dll.meta similarity index 100% rename from Assets/FlashTools/Plugins/FTRuntimeDemo.dll.meta rename to Assets/FlashTools/Plugins/FTRuntime.dll.meta diff --git a/FTSources/FTEditor/FTEditor.csproj b/FTSources/FTEditor/FTEditor.csproj index 70a69ed..c41120e 100644 --- a/FTSources/FTEditor/FTEditor.csproj +++ b/FTSources/FTEditor/FTEditor.csproj @@ -8,6 +8,7 @@ FTEditor 0.5 v3.5 + FTEditor true @@ -17,7 +18,6 @@ false true FT_VERSION_DEMO - FTEditorDemo true @@ -26,7 +26,6 @@ 4 true FT_VERSION_FULL - FTEditor diff --git a/FTSources/FTRuntime/FTRuntime.csproj b/FTSources/FTRuntime/FTRuntime.csproj index 71bb9a3..ef9c76f 100644 --- a/FTSources/FTRuntime/FTRuntime.csproj +++ b/FTSources/FTRuntime/FTRuntime.csproj @@ -8,6 +8,7 @@ FTRuntime 0.5 v3.5 + FTRuntime true @@ -17,7 +18,6 @@ false true FT_VERSION_DEMO - FTRuntimeDemo true @@ -26,7 +26,6 @@ 4 true FT_VERSION_FULL - FTRuntime diff --git a/FTSources/FTSources.userprefs b/FTSources/FTSources.userprefs index 06a86f1..e881d08 100644 --- a/FTSources/FTSources.userprefs +++ b/FTSources/FTSources.userprefs @@ -1,6 +1,6 @@  - + diff --git a/FTSources/FTSwfTools/FTSwfTools.csproj b/FTSources/FTSwfTools/FTSwfTools.csproj index 947b19f..b7e64a2 100644 --- a/FTSources/FTSwfTools/FTSwfTools.csproj +++ b/FTSources/FTSwfTools/FTSwfTools.csproj @@ -8,6 +8,7 @@ FTSwfTools 0.5 v3.5 + FTSwfTools true @@ -17,7 +18,6 @@ false true FT_VERSION_DEMO - FTSwfToolsDemo true @@ -26,7 +26,6 @@ 4 true FT_VERSION_FULL - FTSwfTools