Mercurial > cortex

changeset 45:f080f1e49fba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed imports, moved fox
author Robert McIntyre <rlm@mit.edu>
date Tue, 08 Nov 2011 02:11:01 -0700
parents f3e33fd5f97d
children 286a00500ee5
files assets/Models/die.blend1 assets/Models/fox/fox.blend assets/Models/fox/fox.blend1 assets/Models/logo/logo.blend assets/Models/wolf/fox.blend assets/Models/wolf/fox.blend1 assets/Models/wolf/fox.blend2 org/body.org org/eyes.org org/skin.org
diffstat 10 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
     1.1 Binary file assets/Models/die.blend1 has changed

     2.1 Binary file assets/Models/fox/fox.blend has changed

     3.1 Binary file assets/Models/fox/fox.blend1 has changed

     4.1 Binary file assets/Models/logo/logo.blend has changed

     5.1 Binary file assets/Models/wolf/fox.blend has changed

     6.1 Binary file assets/Models/wolf/fox.blend1 has changed

     7.1 Binary file assets/Models/wolf/fox.blend2 has changed

     8.1 --- a/org/body.org	Tue Nov 08 01:38:22 2011 -0700
     8.2 +++ b/org/body.org	Tue Nov 08 02:11:01 2011 -0700
     8.3 @@ -5,7 +5,7 @@
     8.4  #+SETUPFILE: ../../aurellem/org/setup.org
     8.5  #+INCLUDE: ../../aurellem/org/level-0.org
     8.6  
     8.7 -* Body ! 
     8.8 +* Body  
     8.9  
    8.10  #+srcname: body-main
    8.11  #+begin_src clojure 

     9.1 --- a/org/eyes.org	Tue Nov 08 01:38:22 2011 -0700
     9.2 +++ b/org/eyes.org	Tue Nov 08 02:11:01 2011 -0700
     9.3 @@ -95,7 +95,8 @@
     9.4    (:import java.awt.Dimension)
     9.5    (:import javax.swing.JFrame)
     9.6    (:import com.jme3.math.ColorRGBA)
     9.7 -  (:import com.jme3.scene.Node))
     9.8 +  (:import com.jme3.scene.Node)
     9.9 +  (:import com.jme3.math.Vector3f))
    9.10  
    9.11  (defn view-image
    9.12    "Initailizes a JPanel on which you may draw a BufferedImage of the

    10.1 --- a/org/skin.org	Tue Nov 08 01:38:22 2011 -0700
    10.2 +++ b/org/skin.org	Tue Nov 08 02:11:01 2011 -0700
    10.3 @@ -108,7 +108,7 @@
    10.4  #+srcname: touch-test
    10.5  #+begin_src clojure 
    10.6  (ns test.touch
    10.7 -  (:use (cortex world util touch)))
    10.8 +  (:use (cortex import world util touch)))
    10.9  
   10.10  (cortex.import/mega-import-jme3)
   10.11