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/presets/content.reel
parent: 5ba9aeac94c86049423fd5d4b37b277263939c13 (diff)
parent: c6de22bf42be90b403491b5f87b1818d9020310c (diff)
download: ninja-b4155fb4c33675a8a7cd37473513718043fdf0ba.tar.gz
2 files changed, 12 insertions, 8 deletions
diff --git a/js/panels/presets/content.reel/content.css b/js/panels/presets/content.reel/content.css
index c0ccbad4..409e1960 100644
--- a/js/panels/presets/content.reel/content.css
+++ b/js/panels/presets/content.reel/content.css
@@ -10,9 +10,7 @@
    -webkit-box-orient: vertical;
    -webkit-box-flex: 1;
 }
-.presetsPanel .treeRoot {
-    margin: 0 8px;
-}
 .tab-bar {
    -webkit-box-flex: 0;
    background-color: #282828;
diff --git a/js/panels/presets/content.reel/content.html b/js/panels/presets/content.reel/content.html
index 38de2a6d..afbdd559 100644
--- a/js/panels/presets/content.reel/content.html
+++ b/js/panels/presets/content.reel/content.html
@@ -19,7 +19,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                    "tabBar" : {"#": "tab-bar" },
                    "tabs" : [
                        {"key":"styles", "tab": {"#": "styles" }},
-                        {"key":"transitions", "tab": {"#": "transitions" }}
+                        {"key":"transitions", "tab": {"#": "transitions" }},
+                        {"key":"animations", "tab": {"#": "animations" }}
                    ]
                }
            },
@@ -30,8 +31,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                    "element": {"#": "librarySlot"},
                    "switchComponents": {
                        "styles": {"@": "stylesLibrary"},
-                        "transitions": {"@": "transitionsLibrary"}
+                        "transitions": {"@": "transitionsLibrary"},
+                        "animations": {"@": "animationsLibrary"}
                    }
                },
                "bindings": {
@@ -49,6 +50,10 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
            "transitionsLibrary": {
                "module": "js/panels/presets/transitions-presets.reel",
                "name": "TransitionsLibrary"
+            },
+            "animationsLibrary": {
+                "module": "js/panels/presets/animations-presets.reel",
+                "name": "AnimationsLibrary"
            }
        }
@@ -57,8 +62,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 <body>
    <section id="presetsPanel" class="presetsPanel">
        <nav id="tab-bar" class="tab-bar">
-            <div id="styles">Style Library</div>
+            <div id="styles">Styles</div>
-            <div id="transitions">Transitions Library</div>
+            <div id="transitions">Transitions</div>
+            <div id="animations">Animations</div>
        </nav>
        <div id="librarySlot" class="librarySlot"></div>
    </section>
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/presets/content.reel
parent	5ba9aeac94c86049423fd5d4b37b277263939c13 (diff)
parent	c6de22bf42be90b403491b5f87b1818d9020310c (diff)
download	ninja-b4155fb4c33675a8a7cd37473513718043fdf0ba.tar.gz

diff --git a/js/panels/presets/content.reel/content.css b/js/panels/presets/content.reel/content.css index c0ccbad4..409e1960 100644 --- a/js/panels/presets/content.reel/content.css +++ b/js/panels/presets/content.reel/content.css
@@ -10,9 +10,7 @@
10	-webkit-box-orient: vertical;	10	-webkit-box-orient: vertical;
11	-webkit-box-flex: 1;	11	-webkit-box-flex: 1;
12	}	12	}
13	.presetsPanel .treeRoot {	13
14	margin: 0 8px;
15	}
16	.tab-bar {	14	.tab-bar {
17	-webkit-box-flex: 0;	15	-webkit-box-flex: 0;
18	background-color: #282828;	16	background-color: #282828;


diff --git a/js/panels/presets/content.reel/content.html b/js/panels/presets/content.reel/content.html index 38de2a6d..afbdd559 100644 --- a/js/panels/presets/content.reel/content.html +++ b/js/panels/presets/content.reel/content.html
@@ -19,7 +19,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
19	"tabBar" : {"#": "tab-bar" },	19	"tabBar" : {"#": "tab-bar" },
20	"tabs" : [	20	"tabs" : [
21	{"key":"styles", "tab": {"#": "styles" }},	21	{"key":"styles", "tab": {"#": "styles" }},
22	{"key":"transitions", "tab": {"#": "transitions" }}	22	{"key":"transitions", "tab": {"#": "transitions" }},
		23	{"key":"animations", "tab": {"#": "animations" }}
23	]	24	]
24	}	25	}
25	},	26	},
@@ -30,8 +31,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
30	"element": {"#": "librarySlot"},	31	"element": {"#": "librarySlot"},
31	"switchComponents": {	32	"switchComponents": {
32	"styles": {"@": "stylesLibrary"},	33	"styles": {"@": "stylesLibrary"},
33	"transitions": {"@": "transitionsLibrary"}	34	"transitions": {"@": "transitionsLibrary"},
34		35	"animations": {"@": "animationsLibrary"}
35	}	36	}
36	},	37	},
37	"bindings": {	38	"bindings": {
@@ -49,6 +50,10 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
49	"transitionsLibrary": {	50	"transitionsLibrary": {
50	"module": "js/panels/presets/transitions-presets.reel",	51	"module": "js/panels/presets/transitions-presets.reel",
51	"name": "TransitionsLibrary"	52	"name": "TransitionsLibrary"
		53	},
		54	"animationsLibrary": {
		55	"module": "js/panels/presets/animations-presets.reel",
		56	"name": "AnimationsLibrary"
52	}	57	}
53		58
54	}	59	}
@@ -57,8 +62,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
57	<body>	62	<body>
58	<section id="presetsPanel" class="presetsPanel">	63	<section id="presetsPanel" class="presetsPanel">
59	<nav id="tab-bar" class="tab-bar">	64	<nav id="tab-bar" class="tab-bar">
60	<div id="styles">Style Library</div>	65	<div id="styles">Styles</div>
61	<div id="transitions">Transitions Library</div>	66	<div id="transitions">Transitions</div>
		67	<div id="animations">Animations</div>
62	</nav>	68	</nav>
63	<div id="librarySlot" class="librarySlot"></div>	69	<div id="librarySlot" class="librarySlot"></div>
64	</section>	70	</section>