Reorganised. Added flash libs to build/flash. Copy dlls to build/ for…

… experimental flash support
schlunsen · Nov 9, 2010 · 46206da · 46206da
1 parent c529f66
commit 46206da
Show file tree

Hide file tree

Showing 30 changed files with 6,445 additions and 90 deletions.
diff --git a/Assets/ControlWindow.cs → Assets/GUI/ControlWindow.cs b/Assets/ControlWindow.cs → Assets/GUI/ControlWindow.cs
diff --git a/Assets/Utils/HUDFPS.cs → Assets/GUI/HUDFPS.cs b/Assets/Utils/HUDFPS.cs → Assets/GUI/HUDFPS.cs
diff --git a/Assets/test.unity b/Assets/test.unity
diff --git a/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll b/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
diff --git a/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb b/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll b/Library/ScriptAssemblies/Assembly-CSharp.dll
diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
diff --git a/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll b/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
diff --git a/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb b/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
diff --git a/Library/assetDatabase3 b/Library/assetDatabase3
diff --git a/Library/cache/53/536de761abae47e4c8e6313c2ded6e6e b/Library/cache/53/536de761abae47e4c8e6313c2ded6e6e
diff --git a/Library/expandedItems b/Library/expandedItems
diff --git a/Library/guidmapper b/Library/guidmapper
diff --git a/Library/metadata/53/536de761abae47e4c8e6313c2ded6e6e b/Library/metadata/53/536de761abae47e4c8e6313c2ded6e6e
diff --git a/Library/metadata/96/96aaf6eedb57489419cd1c026e6af47a b/Library/metadata/96/96aaf6eedb57489419cd1c026e6af47a
diff --git a/Library/metadata/a8/a8a85186e5d6a0f499559738477fbdfd b/Library/metadata/a8/a8a85186e5d6a0f499559738477fbdfd
diff --git a/NavigationLog.log b/NavigationLog.log
@@ -128,3 +128,36 @@ http://version2.dk/
 http://version2.dk/
 http://version2.dk/
 http://version2.dk/
+http://version2.dk/
+file:///C
+file:///C
+file:///C/Users/kamante/Desktop/LifeboatProcedure.xm,l
+file:///C/Users/kamante/Desktop/LifeboatProcedure.xml
+file:///C/Users/kamante/Desktop/LifeboatProcedure.xml
+file:///C/Users/kamante/Desktop/LifeboatProcedure.xml
+file:///C/Users/kamante/Desktop/LifeboatProcedure.xml
+file:///C/Users/kamante/Desktop/LifeboatProcedure.xml
+file:///Users/kamante/Desktop/LifeboatProcedure.xml
+file:///Users/kamante/Desktop/LifeboatProcedure.xml
+file:///Users/kamante/Desktop/LifeboatProcedure.xml
+file:///Users/kamante/Desktop/LifeboatProcedure.xml
+file:///Users/kamante/Desktop/LifeboatProcedure.xml
+file:///Users/kamante/Desktop/LifeboatProcedure.xml
+file:///Users/kamante/Desktop/LifeboatProcedure.xml
+file:///Users/kamante/Desktop/LifeboatProcedure.xml
+file:///Users/kamante/Desktop/LifeboatProcedure.xml
+file:///Users/kamante/Desktop/LifeboatProcedure.xml
+file:///Users/kamante/Desktop/LifeboatProcedure.xml
+file:///Users/kamante/Desktop/LifeboatProcedure.xml
+file:///Users/kamante/Desktop/LifeboatProcedure.xml
+file:///Users/kamante/Desktop/LifeboatProcedure.xml
+file:///Users/kamante/Desktop/LifeboatProcedure.xml
+file:///Users/kamante/Desktop/LifeboatProcedure.xml
+file:///Users/kamante/Desktop/LifeboatProcedure.xml
+file:///Users/kamante/Desktop/LifeboatProcedure.xml
+file:///Users/kamante/Desktop/LifeboatProcedure.xml
+http://comon.dk
+http://version2.dk/
+http://version2.dk/
+http://version2.dk/
+http://version2.dk/
diff --git a/UnityAwesomium.csproj b/UnityAwesomium.csproj
@@ -52,15 +52,15 @@
      <Compile Include="Assets\AwesomiumWrapper\AwesomiumMeshRender.cs" />
      <Compile Include="Assets\AwesomiumWrapper\AwesomiumWrapper.cs" />
      <Compile Include="Assets\AwesomiumWrapper\BrowserGUIEvents.cs" />
+     <Compile Include="Assets\GUI\ControlWindow.cs" />
+     <Compile Include="Assets\GUI\HUDFPS.cs" />
      <None Include="Assets\Standard Assets\Character Controllers\Sources\Scripts\CharacterMotor.js" />
      <None Include="Assets\Standard Assets\Character Controllers\Sources\Scripts\FPSInputController.js" />
      <Compile Include="Assets\Standard Assets\Character Controllers\Sources\Scripts\MouseLook.cs" />
      <None Include="Assets\Standard Assets\Character Controllers\Sources\Scripts\PlatformInputController.js" />
      <None Include="Assets\Standard Assets\Character Controllers\Sources\Scripts\ThirdPersonCamera.js" />
      <None Include="Assets\Standard Assets\Character Controllers\Sources\Scripts\ThirdPersonController.js" />
-     <Compile Include="Assets\Utils\HUDFPS.cs" />
      <Compile Include="Assets\Utils\iTween.cs" />
-     <Compile Include="Assets\ControlWindow.cs" />
  <Reference Include="Awesomium">
  <HintPath>Assets\Plugins\Awesomium.dll</HintPath>
  </Reference>

diff --git a/UnityAwesomiumSource/Unity/UnityAwesomium.ncb b/UnityAwesomiumSource/Unity/UnityAwesomium.ncb
diff --git a/UnityAwesomiumSource/Unity/UnityAwesomium.suo b/UnityAwesomiumSource/Unity/UnityAwesomium.suo
diff --git a/build/NavigationLog.log b/build/NavigationLog.log
@@ -41,3 +41,28 @@ http://www.dr.dk
 http://version2.dk/
 http://version2.dk/
 http://version2.dk/
+http://version2.dk/
+http://www.youtube.com
+http://version2.dk/
+http://www.youtube.com
+http://version2.dk/
+http://www.youtube.com
+http://version2.dk/
+http://www.youtube.com
+http://version2.dk/
+http://www.youtube.com
+http://version2.dk/
+http://www.youtube.com
+http://version2.dk/
+http://www.dr.dk
+http://version2.dk/
+http://www.dr.dk
+http://version2.dk/
+http://www.dr.dk
+http://version2.dk/
+http://www.dr.dk
+http://version2.dk/
+http://version2.dk/
+http://version2.dk/
+http://version2.dk/
+http://version2.dk/
diff --git a/build/awesomium.log b/build/awesomium.log
@@ -1,12 +1,12 @@
-[1109/154907:INFO:WebCore.cpp(74)] Creating the core thread.
-[1109/154907:INFO:WebCore.cpp(84)] Creating the WebCore.
-[1109/154907:INFO:WebCoreProxy.cpp(45)] ICU successfully initialized.
-[1109/154907:INFO:RequestContext.cpp(68)] An invalid or empty cookie path was specified, cookies will be lost on program exit.
-[1109/154907:INFO:RequestContext.cpp(111)] An invalid or empty cache path was specified, cache will be lost on program exit.
-[1109/154907:INFO:WebCoreProxy.cpp(202)] The WebCore is now online.
-[1109/154907:INFO:WebView.cpp(68)] A new WebView has been created.
-[1109/154907:INFO:WebViewProxy.cpp(150)] WebViewProxy[0] has been created.
-[1109/154907:INFO:proxy_service.cc(619)] New proxy configuration was loaded:
+[1109/165242:INFO:WebCore.cpp(74)] Creating the core thread.
+[1109/165242:INFO:WebCore.cpp(84)] Creating the WebCore.
+[1109/165242:INFO:WebCoreProxy.cpp(45)] ICU successfully initialized.
+[1109/165242:INFO:RequestContext.cpp(68)] An invalid or empty cookie path was specified, cookies will be lost on program exit.
+[1109/165242:INFO:RequestContext.cpp(111)] An invalid or empty cache path was specified, cache will be lost on program exit.
+[1109/165242:INFO:WebCoreProxy.cpp(202)] The WebCore is now online.
+[1109/165242:INFO:WebView.cpp(68)] A new WebView has been created.
+[1109/165242:INFO:WebViewProxy.cpp(150)] WebViewProxy[0] has been created.
+[1109/165242:INFO:proxy_service.cc(619)] New proxy configuration was loaded:
 {
   auto_detect: 0
   pac_url: 

diff --git a/build/flash/NPSWF32.dll b/build/flash/NPSWF32.dll
diff --git a/build/flash/gcswf32.dll b/build/flash/gcswf32.dll
diff --git a/build/output/testDBG.txt b/build/output/testDBG.txt
@@ -1,5 +1,5 @@
-Unity texture width: 512
-Unity texture height: 512
+Unity texture width: 500
+Unity texture height: 500
 m_buffer size (sizeof): 4ONBEginNavi
  update
 ONBEginNavi
@@ -17,9 +17,36 @@ update
 update
 update
 update
+OnFinished 
+ 4
+Size of buffer after delete: 4scrolling: -100 
+update
+scrolling: -100 
+update
+scrolling: -300 
+update
+scrolling: -100 
+update
+scrolling: -100 
+update
+scrolling: -400 
+update
+scrolling: -100 
+update
+update
+update
+update
+update
+update
+update
+update
+update
+update
+update
+update
+update
+update
+update
 update
 update
 update
-OnFinished 
- 4
-Size of buffer after delete: 4
diff --git a/build/test_Data/Managed/Assembly-CSharp-firstpass.dll b/build/test_Data/Managed/Assembly-CSharp-firstpass.dll
diff --git a/build/test_Data/Managed/Assembly-CSharp.dll b/build/test_Data/Managed/Assembly-CSharp.dll
diff --git a/build/test_Data/Managed/Assembly-UnityScript-firstpass.dll b/build/test_Data/Managed/Assembly-UnityScript-firstpass.dll
diff --git a/build/test_Data/mainData b/build/test_Data/mainData