-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/feature/mpl_version' into develop
- Loading branch information
Showing
197 changed files
with
7,415 additions
and
4,231 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <module type="Flex" version="4"> | ||
| <component name="FlexBuildConfigurationManager" active="CollisionDetectionKit_v15"> | ||
| <configurations> | ||
| <configuration name="CollisionDetectionKit_v15" output-type="Library" output-file="CollisionDetectionKit_v15.swc" output-folder="$MODULE_DIR$/bin"> | ||
| <dependencies target-player="16.0"> | ||
| <sdk name="AIRSDK_Compiler" /> | ||
| </dependencies> | ||
| <compiler-options> | ||
| <map> | ||
| <entry key="compiler.locale" value="en_US" /> | ||
| </map> | ||
| </compiler-options> | ||
| <packaging-air-desktop /> | ||
| <packaging-android /> | ||
| <packaging-ios /> | ||
| </configuration> | ||
| </configurations> | ||
| <compiler-options /> | ||
| </component> | ||
| <component name="NewModuleRootManager" inherit-compiler-output="true"> | ||
| <exclude-output /> | ||
| <content url="file://$MODULE_DIR$"> | ||
| <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> | ||
| </content> | ||
| <orderEntry type="jdk" jdkName="AIRSDK_Compiler" jdkType="Flex SDK Type (new)" /> | ||
| <orderEntry type="sourceFolder" forTests="false" /> | ||
| </component> | ||
| </module> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <module type="Flex" version="4"> | ||
| <component name="FlexBuildConfigurationManager" active="FLV Encoder"> | ||
| <configurations> | ||
| <configuration name="FLV Encoder" target-platform="Desktop" output-type="Library" output-file="FLV Encoder.swc" output-folder="$MODULE_DIR$/bin"> | ||
| <dependencies> | ||
| <entries> | ||
| <entry library-id="430e4898-cf1e-4dcf-b0a7-20fc82c07812"> | ||
| <dependency linkage="Merged" /> | ||
| </entry> | ||
| </entries> | ||
| <sdk name="AIRSDK_Compiler" /> | ||
| </dependencies> | ||
| <compiler-options> | ||
| <map> | ||
| <entry key="compiler.locale" value="en_US" /> | ||
| </map> | ||
| </compiler-options> | ||
| <packaging-air-desktop /> | ||
| <packaging-android /> | ||
| <packaging-ios /> | ||
| </configuration> | ||
| </configurations> | ||
| <compiler-options /> | ||
| </component> | ||
| <component name="NewModuleRootManager" inherit-compiler-output="true"> | ||
| <exclude-output /> | ||
| <content url="file://$MODULE_DIR$"> | ||
| <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> | ||
| </content> | ||
| <orderEntry type="jdk" jdkName="AIRSDK_Compiler" jdkType="Flex SDK Type (new)" /> | ||
| <orderEntry type="sourceFolder" forTests="false" /> | ||
| <orderEntry type="module-library" exported=""> | ||
| <library type="flex"> | ||
| <properties id="430e4898-cf1e-4dcf-b0a7-20fc82c07812" /> | ||
| <CLASSES> | ||
| <root url="file://$MODULE_DIR$/src/leelib/util/flvEncoder/alchemy" /> | ||
| </CLASSES> | ||
| <JAVADOC /> | ||
| <SOURCES /> | ||
| <jarDirectory url="file://$MODULE_DIR$/src/leelib/util/flvEncoder/alchemy" recursive="false" /> | ||
| </library> | ||
| </orderEntry> | ||
| </component> | ||
| </module> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <module type="Flex" version="4"> | ||
| <component name="FlexBuildConfigurationManager" active="Gestouch"> | ||
| <configurations> | ||
| <configuration name="Gestouch" target-platform="Mobile" output-type="Library" output-file="Gestouch.swc" output-folder="$MODULE_DIR$/bin"> | ||
| <dependencies> | ||
| <entries> | ||
| <entry library-id="e98ffa82-c9b5-46ef-b904-c632fc4940b8"> | ||
| <dependency linkage="Merged" /> | ||
| </entry> | ||
| </entries> | ||
| <sdk name="AIRSDK_Compiler" /> | ||
| </dependencies> | ||
| <compiler-options> | ||
| <map> | ||
| <entry key="compiler.locale" value="en_US" /> | ||
| </map> | ||
| </compiler-options> | ||
| <packaging-air-desktop /> | ||
| <packaging-android /> | ||
| <packaging-ios /> | ||
| </configuration> | ||
| </configurations> | ||
| <compiler-options /> | ||
| </component> | ||
| <component name="NewModuleRootManager" inherit-compiler-output="true"> | ||
| <exclude-output /> | ||
| <content url="file://$MODULE_DIR$"> | ||
| <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> | ||
| </content> | ||
| <orderEntry type="jdk" jdkName="AIRSDK_Compiler" jdkType="Flex SDK Type (new)" /> | ||
| <orderEntry type="sourceFolder" forTests="false" /> | ||
| <orderEntry type="module-library" exported=""> | ||
| <library type="flex"> | ||
| <properties id="e98ffa82-c9b5-46ef-b904-c632fc4940b8" /> | ||
| <CLASSES> | ||
| <root url="file://$MODULE_DIR$/libs" /> | ||
| </CLASSES> | ||
| <JAVADOC /> | ||
| <SOURCES /> | ||
| <jarDirectory url="file://$MODULE_DIR$/libs" recursive="false" /> | ||
| </library> | ||
| </orderEntry> | ||
| </component> | ||
| </module> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <module type="Flex" version="4"> | ||
| <component name="FlexBuildConfigurationManager" active="KSketch_Portable"> | ||
| <configurations> | ||
| <configuration name="KSketch_Portable" target-platform="Mobile" main-class="KSketch_Portable" output-file="KSketch_Portable.swf" output-folder="$MODULE_DIR$/bin-debug"> | ||
| <dependencies> | ||
| <entries> | ||
| <entry module-name="KSKInterface" build-configuration-name="KSKInterface"> | ||
| <dependency linkage="Merged" /> | ||
| </entry> | ||
| <entry library-id="d9a95dcf-fe6c-46ea-a991-61f219d3071a"> | ||
| <dependency linkage="Merged" /> | ||
| </entry> | ||
| </entries> | ||
| <sdk name="AIRSDK_Compiler" /> | ||
| </dependencies> | ||
| <compiler-options> | ||
| <map> | ||
| <entry key="compiler.locale" value="en_US" /> | ||
| </map> | ||
| </compiler-options> | ||
| <packaging-air-desktop /> | ||
| <packaging-android enabled="true" use-generated-descriptor="false" custom-descriptor-path="$MODULE_DIR$/src/KSketch_Portable-app.xml" package-file-name="KSketch_Portable"> | ||
| <files-to-package> | ||
| <FilePathAndPathInPackage file-path="$MODULE_DIR$/src/assets" path-in-package="assets" /> | ||
| </files-to-package> | ||
| <AirSigningOptions keystore-path="/Volumes/ksketch/Releases/2014-02-04.latest/Android/KsketchAndroidDeveloper.p12" use-temp-certificate="false" /> | ||
| </packaging-android> | ||
| <packaging-ios enabled="true" use-generated-descriptor="false" custom-descriptor-path="$MODULE_DIR$/src/KSketch_Portable-app.xml" package-file-name="KSketch_Portable"> | ||
| <files-to-package> | ||
| <FilePathAndPathInPackage file-path="$MODULE_DIR$/src/assets" path-in-package="assets" /> | ||
| </files-to-package> | ||
| <AirSigningOptions keystore-path="/Users/nurcamelliaz/Documents/2014-02-04.latest/KsketchDevelop-2014-10-01.p12" provisioning-profile-path="/Users/nurcamelliaz/Documents/2014-02-04.latest/Ksketch.mobileprovision" /> | ||
| </packaging-ios> | ||
| </configuration> | ||
| </configurations> | ||
| <compiler-options /> | ||
| </component> | ||
| <component name="NewModuleRootManager" inherit-compiler-output="true"> | ||
| <exclude-output /> | ||
| <content url="file://$MODULE_DIR$"> | ||
| <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> | ||
| </content> | ||
| <orderEntry type="jdk" jdkName="AIRSDK_Compiler" jdkType="Flex SDK Type (new)" /> | ||
| <orderEntry type="sourceFolder" forTests="false" /> | ||
| <orderEntry type="module-library" exported=""> | ||
| <library type="flex"> | ||
| <properties id="d9a95dcf-fe6c-46ea-a991-61f219d3071a" /> | ||
| <CLASSES> | ||
| <root url="jar://$DOCUMENTS$/gaforflash/lib/analytics.swc!/" /> | ||
| </CLASSES> | ||
| <JAVADOC /> | ||
| <SOURCES /> | ||
| </library> | ||
| </orderEntry> | ||
| <orderEntry type="module" module-name="KSKInterface" exported="" /> | ||
| </component> | ||
| </module> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.