diff options
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 /node_modules | |
parent | 5ba9aeac94c86049423fd5d4b37b277263939c13 (diff) | |
parent | c6de22bf42be90b403491b5f87b1818d9020310c (diff) | |
download | ninja-b4155fb4c33675a8a7cd37473513718043fdf0ba.tar.gz |
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
Diffstat (limited to 'node_modules')
61 files changed, 3138 insertions, 17 deletions
diff --git a/node_modules/components-data/feed-reader.json b/node_modules/components-data/feed-reader.json new file mode 100644 index 00000000..39da73f3 --- /dev/null +++ b/node_modules/components-data/feed-reader.json | |||
@@ -0,0 +1,25 @@ | |||
1 | { | ||
2 | "component": "feedreader", | ||
3 | |||
4 | "module": "montage/ui/feed-reader/feed-reader.reel", | ||
5 | |||
6 | "name": "FeedReader", | ||
7 | |||
8 | "properties": [ | ||
9 | { | ||
10 | "name": "feedURL", | ||
11 | "type": "string", | ||
12 | "default": null | ||
13 | }, | ||
14 | { | ||
15 | "name": "feedDisplayMode", | ||
16 | "type": "select", | ||
17 | "default": "timer", | ||
18 | "possibleValues": ["animation", "timer"] | ||
19 | } | ||
20 | ], | ||
21 | "defaultStyles": { | ||
22 | "width":"380px", | ||
23 | "height":"120px" | ||
24 | } | ||
25 | } \ No newline at end of file | ||
diff --git a/node_modules/components-data/map.json b/node_modules/components-data/map.json new file mode 100644 index 00000000..655d222d --- /dev/null +++ b/node_modules/components-data/map.json | |||
@@ -0,0 +1,28 @@ | |||
1 | { | ||
2 | "component": "map", | ||
3 | |||
4 | "module": "montage/ui/map.reel", | ||
5 | |||
6 | "name": "Map", | ||
7 | |||
8 | "properties": [ | ||
9 | { | ||
10 | "name": "category", | ||
11 | "type": "select", | ||
12 | "default": "restaurant", | ||
13 | "possibleValues": ["restaurant", "hospital", "cafe", "museum"] | ||
14 | }, | ||
15 | { | ||
16 | "name": "center", | ||
17 | "type": "string", | ||
18 | "default": "" | ||
19 | } | ||
20 | |||
21 | ], | ||
22 | |||
23 | "defaultStyles": { | ||
24 | "width": "280px", | ||
25 | "height": "280px" | ||
26 | } | ||
27 | |||
28 | } \ No newline at end of file | ||
diff --git a/node_modules/components-data/picasa-carousel.json b/node_modules/components-data/picasa-carousel.json new file mode 100644 index 00000000..2eb601c7 --- /dev/null +++ b/node_modules/components-data/picasa-carousel.json | |||
@@ -0,0 +1,20 @@ | |||
1 | { | ||
2 | "component": "picasa-carousel", | ||
3 | |||
4 | "module": "montage/ui/picasa-carousel.reel", | ||
5 | |||
6 | "name": "PicasaCarousel", | ||
7 | |||
8 | "properties": [ | ||
9 | { | ||
10 | "name": "queryParameter", | ||
11 | "type": "string", | ||
12 | "default": "" | ||
13 | } | ||
14 | ], | ||
15 | "defaultStyles": { | ||
16 | "width":"800px", | ||
17 | "height":"160px", | ||
18 | "border": "1px" | ||
19 | } | ||
20 | } \ No newline at end of file | ||
diff --git a/node_modules/components-data/searchfield.json b/node_modules/components-data/searchfield.json new file mode 100644 index 00000000..94c570d9 --- /dev/null +++ b/node_modules/components-data/searchfield.json | |||
@@ -0,0 +1,20 @@ | |||
1 | { | ||
2 | "component": "searchfield", | ||
3 | |||
4 | "module": "montage/ui/textfield.reel", | ||
5 | |||
6 | "name": "Textfield", | ||
7 | |||
8 | "properties": [ | ||
9 | { | ||
10 | "name": "valueBinding", | ||
11 | "type": "string", | ||
12 | "default": null | ||
13 | }, | ||
14 | { | ||
15 | "name": "value", | ||
16 | "type": "string", | ||
17 | "default": "" | ||
18 | } | ||
19 | ] | ||
20 | } \ No newline at end of file | ||
diff --git a/node_modules/components-data/textfield.json b/node_modules/components-data/textfield.json index 7164b8b3..39c65eab 100644 --- a/node_modules/components-data/textfield.json +++ b/node_modules/components-data/textfield.json | |||
@@ -7,6 +7,10 @@ | |||
7 | 7 | ||
8 | "properties": [ | 8 | "properties": [ |
9 | { | 9 | { |
10 | "name": "valueBinding", | ||
11 | "type": "string", | ||
12 | "default": null | ||
13 | },{ | ||
10 | "name": "accept", | 14 | "name": "accept", |
11 | "type": "string", | 15 | "type": "string", |
12 | "default": null | 16 | "default": null |
diff --git a/node_modules/components-data/youtube-channel.json b/node_modules/components-data/youtube-channel.json new file mode 100644 index 00000000..c909fd1b --- /dev/null +++ b/node_modules/components-data/youtube-channel.json | |||
@@ -0,0 +1,16 @@ | |||
1 | { | ||
2 | "component": "youtube-channel", | ||
3 | |||
4 | "module": "montage/ui/youtube-channel.reel", | ||
5 | |||
6 | "name": "YoutubeChannel", | ||