Skip to content

Commit

Permalink
fixed setting of Space.mouseEnabled to false upon reset
Browse files Browse the repository at this point in the history
  • Loading branch information
Zeb Zhao committed Mar 7, 2015
1 parent 54b08ff commit c68ad74
Show file tree
Hide file tree
Showing 7 changed files with 87 additions and 122 deletions.
24 changes: 15 additions & 9 deletions CheetaEngine.as3proj
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,19 @@
<output>
<movie outputType="Application" />
<movie input="" />
<movie path="bin\Main.swf" />
<movie path="bin\IsometricDemo.swf" />
<movie fps="30" />
<movie width="800" />
<movie width="400" />
<movie height="600" />
<movie version="11" />
<movie minorVersion="0" />
<movie minorVersion="9" />
<movie platform="Flash Player" />
<movie background="#FFFFFF" />
<movie preferredSDK="AIR 16.0.0;16.0.0;" />
</output>
<!-- Other classes to be compiled into your SWF -->
<classpaths>
<class path="src" />
<class path="demos\Isometric Demo\src" />
</classpaths>
<!-- Build options -->
<build>
Expand All @@ -24,6 +25,7 @@
<option allowSourcePathOverlap="False" />
<option benchmark="False" />
<option es="False" />
<option inline="False" />
<option locale="" />
<option loadConfig="" />
<option optimize="True" />
Expand All @@ -42,7 +44,7 @@
<option loadExterns="" />
<option staticLinkRSL="True" />
<option additional="" />
<option compilerConstants="CONFIG::developer,true" />
<option compilerConstants="" />
<option minorVersion="" />
</build>
<!-- SWC Include Libraries -->
Expand All @@ -51,7 +53,7 @@
</includeLibraries>
<!-- SWC Libraries -->
<libraryPaths>
<!-- example: <element path="..." /> -->
<element path="site\downloads\gamecheetah-v1.1-release.swc" />
</libraryPaths>
<!-- External Libraries -->
<externalLibraryPaths>
Expand All @@ -71,7 +73,7 @@
</library>
<!-- Class files to compile (other referenced classes will automatically be included) -->
<compileTargets>
<compile path="src\Main.as" />
<compile path="demos\Isometric Demo\src\Main.as" />
</compileTargets>
<!-- Paths to exclude from the Project Explorer tree -->
<hiddenPaths>
Expand All @@ -83,9 +85,13 @@
<postBuildCommand alwaysRun="False" />
<!-- Other project options -->
<options>
<option showHiddenPaths="False" />
<option showHiddenPaths="True" />
<option testMovie="Default" />
<option testMovieCommand="" />
</options>
<!-- Plugin storage -->
<storage />
<storage>
<entry key="at_enabled"><![CDATA[0]]></entry>
<entry key="at_password"><![CDATA[]]></entry>
</storage>
</project>
70 changes: 70 additions & 0 deletions build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<?xml version="1.0"?>
<!--
Useful links
http://justinimhoff.com/ant-library-swc-namespaces
https://github.com/honzabrecka/using-ant-to-build-flash
-->
<project name="build all" default="swc" basedir=".">
<taskdef resource="flexTasks.tasks" classpath="C:/AIRSDK_Compiler/ant/lib/flexTasks.jar"/>
<property name="AIR_SDK_HOME" value="C:/AIRSDK_Compiler" />
<property name="PLAYER_VERSION" value="11.9" />
<property name="SWC_DIR" value="site\downloads" />
<property name="ENGINE_VERSION" value="1.1" />
<property name="DEMOS_DIR" value="site\demos\static\swf" />

<target name="swc" depends="swc-compile-dev, swc-compile-release"/>

<target name="swc-compile-dev">
<compc failonerror="true" maxmemory="1024m"
output="${SWC_DIR}\gamecheetah-v${ENGINE_VERSION}-dev.swc">
<compiler.external-library-path dir="${AIR_SDK_HOME}/frameworks/" append="true">
<include name="libs/player/${PLAYER_VERSION}/playerglobal.swc" />
</compiler.external-library-path>
<load-config filename="obj/dev- CheetaEngine.flex.compc.xml"/>
<include-sources dir="src" includes="*" />
</compc>
</target>

<target name="swc-compile-release">
<compc failonerror="true" maxmemory="1024m"
output="${SWC_DIR}\gamecheetah-v${ENGINE_VERSION}-release.swc">
<compiler.external-library-path dir="${AIR_SDK_HOME}/frameworks/" append="true">
<include name="libs/player/${PLAYER_VERSION}/playerglobal.swc" />
</compiler.external-library-path>
<load-config filename="obj/release- CheetaEngine.flex.compc.xml"/>
<include-sources dir="src" includes="*" />
</compc>
</target>

<target name="demos" depends="isometric-game-dev, isometric-game-release"/>

<target name="isometric-game-dev">
<mxmlc failonerror="true" maxmemory="1024m"
output="${DEMOS_DIR}\IsometricDemo-dev.swf"
file="demos/Isometric Demo/src/Main.as">
<compiler.external-library-path dir="${AIR_SDK_HOME}/frameworks/" append="true">
<include name="libs/player/${PLAYER_VERSION}/playerglobal.swc" />
</compiler.external-library-path>
<library-path
file="${SWC_DIR}\gamecheetah-v${ENGINE_VERSION}-dev.swc"
append="true">
</library-path>
<source-path path-element="demos/Isometric Demo/src"/>
</mxmlc>
</target>

<target name="isometric-game-release">
<mxmlc failonerror="true" maxmemory="1024m"
output="${DEMOS_DIR}\IsometricDemo-release.swf"
file="demos/Isometric Demo/src/Main.as">
<compiler.external-library-path dir="${AIR_SDK_HOME}/frameworks/" append="true">
<include name="libs/player/${PLAYER_VERSION}/playerglobal.swc" />
</compiler.external-library-path>
<library-path
file="${SWC_DIR}\gamecheetah-v${ENGINE_VERSION}-release.swc"
append="true">
</library-path>
<source-path path-element="demos/Isometric Demo/src"/>
</mxmlc>
</target>
</project>
55 changes: 0 additions & 55 deletions obj/CheetaEngineConfig.old

This file was deleted.

55 changes: 0 additions & 55 deletions obj/CheetaEngineConfig.xml

This file was deleted.

2 changes: 1 addition & 1 deletion obj/dev- CheetaEngine.flex.compc.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<flex-config xmlns="http://www.adobe.com/2006/flex-config">
<output>C:\Users\Owner\Desktop\Cheeta\CheetaEngine\site\downloads\gamecheetah-dev.swc</output>
<output></output>
<use-network>true</use-network>
<target-player>11.9</target-player>
<warnings>true</warnings>
Expand Down
2 changes: 1 addition & 1 deletion obj/release- CheetaEngine.flex.compc.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<flex-config xmlns="http://www.adobe.com/2006/flex-config">
<output>C:\Users\Owner\Desktop\Cheeta\CheetaEngine\site\downloads\gamecheetah-dev.swc</output>
<output></output>
<use-network>true</use-network>
<target-player>11.9</target-player>
<warnings>true</warnings>
Expand Down
1 change: 0 additions & 1 deletion src/gamecheetah/Space.as
Original file line number Diff line number Diff line change
Expand Up @@ -1066,7 +1066,6 @@ package gamecheetah

alphaThreshold = 1;
mouseAlphaThreshold = 1;
mouseEnabled = false;
useCollisionMasks = true;
detectCollisions = true;

Expand Down

0 comments on commit c68ad74

Please sign in to comment.