Skip to content
Browse files

Fixed up git ignoring and removed binaries

  • Loading branch information...
1 parent dd51946 commit 688f69412a7e8e579e711ecfbc6f526b1db5eb66 @JetFault committed
Showing with 1 addition and 301 deletions.
  1. +1 −1 .gitignore
  2. +0 −185 Darkness.as3proj
  3. BIN bin/Darkness.swf
  4. BIN bin/expressInstall.swf
  5. +0 −40 bin/index.html
  6. +0 −38 obj/DarknessConfig.old
  7. +0 −37 obj/DarknessConfig.xml
View
2 .gitignore
@@ -2,6 +2,6 @@ Darkness.as3proj
bin/expressInstall.swf
bin/index.html
bin/js/swfobject.js
-bin/js/swfobject.js
obj/
+lib/
bin/Darkness.swf
View
185 Darkness.as3proj
@@ -1,185 +0,0 @@
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?>
-<project version="2">
- <!-- Output SWF options -->
- <output>
- <movie outputType="Application" />
- <movie input="" />
- <movie path="bin\Darkness.swf" />
- <movie fps="30" />
- <movie width="800" />
- <movie height="600" />
- <movie version="10" />
- <movie minorVersion="1" />
- <movie platform="Flash Player" />
- <movie background="#FFFFFF" />
- </output>
- <!-- Other classes to be compiled into your SWF -->
- <classpaths>
- <class path="src" />
- <class path="..\..\..\..\lwjgl\AdamAtomic-flixel-8989e50" />
- </classpaths>
- <!-- Build options -->
- <build>
- <option accessible="False" />
- <option allowSourcePathOverlap="False" />
- <option benchmark="False" />
- <option es="False" />
- <option locale="" />
- <option loadConfig="" />
- <option optimize="True" />
- <option omitTraces="True" />
- <option showActionScriptWarnings="True" />
- <option showBindingWarnings="True" />
- <option showInvalidCSS="True" />
- <option showDeprecationWarnings="True" />
- <option showUnusedTypeSelectorWarnings="True" />
- <option strict="True" />
- <option useNetwork="True" />
- <option useResourceBundleMetadata="True" />
- <option warnings="True" />
- <option verboseStackTraces="False" />
- <option linkReport="" />
- <option loadExterns="" />
- <option staticLinkRSL="True" />
- <option additional="" />
- <option compilerConstants="" />
- <option minorVersion="" />
- </build>
- <!-- SWC Include Libraries -->
- <includeLibraries>
- <!-- example: <element path="..." /> -->
- </includeLibraries>
- <!-- SWC Libraries -->
- <libraryPaths>
- <!-- example: <element path="..." /> -->
- </libraryPaths>
- <!-- External Libraries -->
- <externalLibraryPaths>
- <!-- example: <element path="..." /> -->
- </externalLibraryPaths>
- <!-- Runtime Shared Libraries -->
- <rslPaths>
- <!-- example: <element path="..." /> -->
- </rslPaths>
- <!-- Intrinsic Libraries -->
- <intrinsics>
- <!-- example: <element path="..." /> -->
- </intrinsics>
- <!-- Assets to embed into the output SWF -->
- <library>
- <!-- example: <asset path="..." id="..." update="..." glyphs="..." mode="..." place="..." sharepoint="..." /> -->
- </library>
- <!-- Class files to compile (other referenced classes will automatically be included) -->
- <compileTargets>
- <compile path="src\Darkness.as" />
- </compileTargets>
- <!-- Paths to exclude from the Project Explorer tree -->
- <hiddenPaths>
- <!-- example: <hidden path="..." /> -->
- </hiddenPaths>
- <!-- Executed before build -->
- <preBuildCommand />
- <!-- Executed after build -->
- <postBuildCommand alwaysRun="False" />
- <!-- Other project options -->
- <options>
- <option showHiddenPaths="False" />
- <option testMovie="Default" />
- </options>
- <!-- Plugin storage -->
- <storage />
-=======
-<?xml version="1.0" encoding="utf-8"?>
-<project version="2">
- <!-- Output SWF options -->
- <output>
- <movie outputType="Application" />
- <movie input="" />
- <movie path="bin\Darkness.swf" />
- <movie fps="30" />
- <movie width="800" />
- <movie height="600" />
- <movie version="10" />
- <movie minorVersion="1" />
- <movie platform="Flash Player" />
- <movie background="#FFFFFF" />
- </output>
- <!-- Other classes to be compiled into your SWF -->
- <classpaths>
- <class path="src" />
- <class path="..\flixel" />
- <class path="..\..\flixel" />
- </classpaths>
- <!-- Build options -->
- <build>
- <option accessible="False" />
- <option allowSourcePathOverlap="False" />
- <option benchmark="False" />
- <option es="False" />
- <option locale="" />
- <option loadConfig="" />
- <option optimize="True" />
- <option omitTraces="True" />
- <option showActionScriptWarnings="True" />
- <option showBindingWarnings="True" />
- <option showInvalidCSS="True" />
- <option showDeprecationWarnings="True" />
- <option showUnusedTypeSelectorWarnings="True" />
- <option strict="True" />
- <option useNetwork="True" />
- <option useResourceBundleMetadata="True" />
- <option warnings="True" />
- <option verboseStackTraces="False" />
- <option linkReport="" />
- <option loadExterns="" />
- <option staticLinkRSL="True" />
- <option additional="" />
- <option compilerConstants="" />
- <option minorVersion="" />
- </build>
- <!-- SWC Include Libraries -->
- <includeLibraries>
- <!-- example: <element path="..." /> -->
- </includeLibraries>
- <!-- SWC Libraries -->
- <libraryPaths>
- <!-- example: <element path="..." /> -->
- </libraryPaths>
- <!-- External Libraries -->
- <externalLibraryPaths>
- <!-- example: <element path="..." /> -->
- </externalLibraryPaths>
- <!-- Runtime Shared Libraries -->
- <rslPaths>
- <!-- example: <element path="..." /> -->
- </rslPaths>
- <!-- Intrinsic Libraries -->
- <intrinsics>
- <!-- example: <element path="..." /> -->
- </intrinsics>
- <!-- Assets to embed into the output SWF -->
- <library>
- <!-- example: <asset path="..." id="..." update="..." glyphs="..." mode="..." place="..." sharepoint="..." /> -->
- </library>
- <!-- Class files to compile (other referenced classes will automatically be included) -->
- <compileTargets>
- <compile path="src\Darkness.as" />
- </compileTargets>
- <!-- Paths to exclude from the Project Explorer tree -->
- <hiddenPaths>
- <!-- example: <hidden path="..." /> -->
- </hiddenPaths>
- <!-- Executed before build -->
- <preBuildCommand />
- <!-- Executed after build -->
- <postBuildCommand alwaysRun="False" />
- <!-- Other project options -->
- <options>
- <option showHiddenPaths="False" />
- <option testMovie="Default" />
- </options>
- <!-- Plugin storage -->
- <storage />
->>>>>>> fb156d043dc999731b78a578036c96e4b9efefa8
-</project>
View
BIN bin/Darkness.swf
Binary file not shown.
View
BIN bin/expressInstall.swf
Binary file not shown.
View
40 bin/index.html
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="utf-8"/>
- <title>Darkness</title>
- <meta name="description" content="" />
-
- <script src="js/swfobject.js"></script>
- <script>
- var flashvars = {
- };
- var params = {
- menu: "false",
- scale: "noScale",
- allowFullscreen: "true",
- allowScriptAccess: "always",
- bgcolor: "",
- wmode: "direct" // can cause issues with FP settings & webcam
- };
- var attributes = {
- id:"Darkness"
- };
- swfobject.embedSWF(
- "Darkness.swf",
- "altContent", "100%", "100%", "10.0.0",
- "expressInstall.swf",
- flashvars, params, attributes);
- </script>
- <style>
- html, body { height:100%; overflow:hidden; }
- body { margin:0; }
- </style>
-</head>
-<body>
- <div id="altContent">
- <h1>Darkness</h1>
- <p><a href="http://www.adobe.com/go/getflashplayer">Get Adobe Flash player</a></p>
- </div>
-</body>
-</html>
View
38 obj/DarknessConfig.old
@@ -1,38 +0,0 @@
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?>
-<!--This Adobe Flex compiler configuration file was generated by a tool.-->
-<!--Any modifications you make may be lost.-->
-<flex-config>
- <target-player>10.1</target-player>
- <benchmark>false</benchmark>
- <static-link-runtime-shared-libraries>true</static-link-runtime-shared-libraries>
- <compiler>
- <define append="true">
- <name>CONFIG::debug</name>
- <value>true</value>
- </define>
- <define append="true">
- <name>CONFIG::release</name>
- <value>false</value>
- </define>
- <define append="true">
- <name>CONFIG::timeStamp</name>
- <value>'3/20/2012'</value>
- </define>
- <verbose-stacktraces>true</verbose-stacktraces>
- <source-path append="true">
- <path-element>C:\Users\Jerry\Git\Darkness\src</path-element>
- <path-element>C:\lwjgl\AdamAtomic-flixel-8989e50</path-element>
- <path-element>C:\Program Files (x86)\FlashDevelop\Library\AS3\classes</path-element>
- </source-path>
- </compiler>
- <file-specs>
- <path-element>C:\Users\Jerry\Git\Darkness\src\Darkness.as</path-element>
- </file-specs>
- <default-background-color>#FFFFFF</default-background-color>
- <default-frame-rate>30</default-frame-rate>
- <default-size>
- <width>800</width>
- <height>600</height>
- </default-size>
-</flex-config>
View
37 obj/DarknessConfig.xml
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--This Adobe Flex compiler configuration file was generated by a tool.-->
-<!--Any modifications you make may be lost.-->
-<flex-config>
- <target-player>10.1</target-player>
- <benchmark>false</benchmark>
- <static-link-runtime-shared-libraries>true</static-link-runtime-shared-libraries>
- <compiler>
- <define append="true">
- <name>CONFIG::debug</name>
- <value>true</value>
- </define>
- <define append="true">
- <name>CONFIG::release</name>
- <value>false</value>
- </define>
- <define append="true">
- <name>CONFIG::timeStamp</name>
- <value>'3/20/2012'</value>
- </define>
- <verbose-stacktraces>true</verbose-stacktraces>
- <source-path append="true">
- <path-element>C:\Users\Jerry\Git\Darkness\src</path-element>
- <path-element>C:\lwjgl\AdamAtomic-flixel-8989e50</path-element>
- <path-element>C:\Program Files (x86)\FlashDevelop\Library\AS3\classes</path-element>
- </source-path>
- </compiler>
- <file-specs>
- <path-element>C:\Users\Jerry\Git\Darkness\src\Darkness.as</path-element>
- </file-specs>
- <default-background-color>#FFFFFF</default-background-color>
- <default-frame-rate>30</default-frame-rate>
- <default-size>
- <width>800</width>
- <height>600</height>
- </default-size>
-</flex-config>

0 comments on commit 688f694

Please sign in to comment.
Something went wrong with that request. Please try again.