Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch

Conflicts: js/helper-classes/RDGE/rdge-compiled.js js/helper-classes/RDGE/runtime/GLRuntime.js js/helper-classes/RDGE/src/core/script/MeshManager.js js/helper-classes/RDGE/src/core/script/engine.js js/helper-classes/RDGE/src/core/script/fx/ssao.js js/helper-classes/RDGE/src/core/script/init_state.js js/helper-classes/RDGE/src/core/script/run_state.js js/helper-classes/RDGE/src/core/script/scenegraphNodes.js js/helper-classes/RDGE/src/core/script/utilities.js js/helper-classes/RDGE/src/tools/compile-rdge-core.bat js/helper-classes/RDGE/src/tools/compile-rdge-core.sh js/helper-classes/RDGE/src/tools/rdge-compiled.js js/lib/drawing/world.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/deform-material.js js/lib/rdge/materials/flat-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/linear-gradient-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-blur-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/relief-tunnel-material.js js/lib/rdge/materials/square-tunnel-material.js js/lib/rdge/materials/star-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/tunnel-material.js js/lib/rdge/materials/twist-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/uber-material.js js/lib/rdge/materials/water-material.js js/lib/rdge/materials/z-invert-material.js js/preloader/Preloader.js
author: John Mayhew 2012-04-02 16:28:39 -0700
committer: John Mayhew 2012-04-02 16:28:39 -0700
commit: b4155fb4c33675a8a7cd37473513718043fdf0ba (patch)
tree: 3d8c802473f2395d53d599ec9d8b70b60a4db50c /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
parent: 5ba9aeac94c86049423fd5d4b37b277263939c13 (diff)
parent: c6de22bf42be90b403491b5f87b1818d9020310c (diff)
download: ninja-b4155fb4c33675a8a7cd37473513718043fdf0ba.tar.gz
1 files changed, 2 insertions, 37 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index 1cc05f4e..7e9b8a21 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -32,44 +32,9 @@
                                        "element":{"#": "track_lane"}
                                },
                                                "bindings" : {
-                           "spanWidth" : {
+                           "tweenData" : {
                               "boundObject" : {"@": "tweenRepetition"},
-                               "boundObjectPropertyPath" : "objectAtCurrentIteration.spanWidth",
+                               "boundObjectPropertyPath" : "objectAtCurrentIteration.tweenData",
-                               "oneway" : false
-                           },
-                           "keyFramePosition" : {
-                               "boundObject" : {"@": "tweenRepetition"},
-                               "boundObjectPropertyPath" : "objectAtCurrentIteration.keyFramePosition",
-                               "oneway" : false
-                           },
-                           "spanPosition" : {
-                               "boundObject" : {"@": "tweenRepetition"},
-                               "boundObjectPropertyPath" : "objectAtCurrentIteration.spanPosition",
-                               "oneway" : false
-                           },
-                           "keyFrameMillisec" : {
-                               "boundObject" : {"@": "tweenRepetition"},
-                               "boundObjectPropertyPath" : "objectAtCurrentIteration.keyFrameMillisec",
-                               "oneway" : false
-                           },
-                           "tweenID" : {
-                               "boundObject" : {"@": "tweenRepetition"},
-                               "boundObjectPropertyPath" : "objectAtCurrentIteration.tweenID",
-                               "oneway" : false
-                           },
-                           "tweenedProperties" : {
-                               "boundObject" : {"@": "tweenRepetition"},
-                               "boundObjectPropertyPath" : "objectAtCurrentIteration.tweenedProperties",
-                               "oneway" : false
-                           },
-                           "isTweenAnimated" : {
-                               "boundObject" : {"@": "tweenRepetition"},
-                               "boundObjectPropertyPath" : "objectAtCurrentIteration.isTweenAnimated",
-                               "oneway" : false
-                           },
-                           "isClearing" : {
-                               "boundObject" : {"@": "tweenRepetition"},
-                               "boundObjectPropertyPath" : "objectAtCurrentIteration.isClearing",
                               "oneway" : false
                           }
                       }
author	John Mayhew	2012-04-02 16:28:39 -0700
committer	John Mayhew	2012-04-02 16:28:39 -0700
commit	b4155fb4c33675a8a7cd37473513718043fdf0ba (patch)
tree	3d8c802473f2395d53d599ec9d8b70b60a4db50c /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
parent	5ba9aeac94c86049423fd5d4b37b277263939c13 (diff)
parent	c6de22bf42be90b403491b5f87b1818d9020310c (diff)
download	ninja-b4155fb4c33675a8a7cd37473513718043fdf0ba.tar.gz

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html index 1cc05f4e..7e9b8a21 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -32,44 +32,9 @@
32	"element":{"#": "track_lane"}	32	"element":{"#": "track_lane"}
33	},	33	},
34	"bindings" : {	34	"bindings" : {
35	"spanWidth" : {	35	"tweenData" : {
36	"boundObject" : {"@": "tweenRepetition"},	36	"boundObject" : {"@": "tweenRepetition"},
37	"boundObjectPropertyPath" : "objectAtCurrentIteration.spanWidth",	37	"boundObjectPropertyPath" : "objectAtCurrentIteration.tweenData",
38	"oneway" : false
39	},
40	"keyFramePosition" : {
41	"boundObject" : {"@": "tweenRepetition"},
42	"boundObjectPropertyPath" : "objectAtCurrentIteration.keyFramePosition",
43	"oneway" : false
44	},
45	"spanPosition" : {
46	"boundObject" : {"@": "tweenRepetition"},
47	"boundObjectPropertyPath" : "objectAtCurrentIteration.spanPosition",
48	"oneway" : false
49	},
50	"keyFrameMillisec" : {
51	"boundObject" : {"@": "tweenRepetition"},
52	"boundObjectPropertyPath" : "objectAtCurrentIteration.keyFrameMillisec",
53	"oneway" : false
54	},
55	"tweenID" : {
56	"boundObject" : {"@": "tweenRepetition"},
57	"boundObjectPropertyPath" : "objectAtCurrentIteration.tweenID",
58	"oneway" : false
59	},
60	"tweenedProperties" : {
61	"boundObject" : {"@": "tweenRepetition"},
62	"boundObjectPropertyPath" : "objectAtCurrentIteration.tweenedProperties",
63	"oneway" : false
64	},
65	"isTweenAnimated" : {
66	"boundObject" : {"@": "tweenRepetition"},
67	"boundObjectPropertyPath" : "objectAtCurrentIteration.isTweenAnimated",
68	"oneway" : false
69	},
70	"isClearing" : {
71	"boundObject" : {"@": "tweenRepetition"},
72	"boundObjectPropertyPath" : "objectAtCurrentIteration.isClearing",
73	"oneway" : false	38	"oneway" : false
74	}	39	}
75	}	40	}