diff options
| author | Nivesh Rajbhandari | 2012-04-04 17:24:27 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-04-04 17:24:27 -0700 |
| commit | 01cf259da7aaa7d70789d9a7c32111d88b477463 (patch) | |
| tree | 0bff3395ac681e5f685d2267f7dbc03a8e32bc4a /index.html | |
| parent | 331ea08655245e3532e48bf160d5f68a04d8723f (diff) | |
| parent | 13368ca6ebbc13adeafccd898dfffd7ce37cb28a (diff) | |
| download | ninja-01cf259da7aaa7d70789d9a7c32111d88b477463.tar.gz | |
Merge branch 'refs/heads/ToolFixes' into WebGLMaterials
Conflicts:
js/document/templates/montage-html/default_html.css
js/mediators/element-mediator.js
js/panels/properties.reel/properties.js
js/tools/BrushTool.js
js/tools/LineTool.js
js/tools/PenTool.js
js/tools/SelectionTool.js
js/tools/ShapeTool.js
js/tools/TranslateObject3DTool.js
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'index.html')
| -rwxr-xr-x | index.html | 37 |
1 files changed, 36 insertions, 1 deletions
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
| 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
| @@ -176,7 +176,42 @@ | |||
| 176 | </script> | 176 | </script> |
| 177 | 177 | ||
| 178 | <script type="text/javascript" src="js/helper-classes/3D/GLMatrix/gl-matrix.js"></script> | 178 | <script type="text/javascript" src="js/helper-classes/3D/GLMatrix/gl-matrix.js"></script> |
| 179 | |||
| 180 | <!-- Ridge Compiled --> | ||
| 179 | <script type="text/javascript" src="js/helper-classes/RDGE/rdge-compiled.js"></script> | 181 | <script type="text/javascript" src="js/helper-classes/RDGE/rdge-compiled.js"></script> |
| 182 | <!-- Ridge Uncompiled --> | ||
| 183 | <!-- | ||
| 184 | <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/math/vec2.js"></script> | ||
| 185 | <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/math/vec3.js"></script> | ||
| 186 | <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/math/vec4.js"></script> | ||
| 187 | <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/math/mat4.js"></script> | ||
| 188 | <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/math/quat.js"></script> | ||
| 189 | <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/objectManager.js"></script> | ||
| 190 | <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/precompiled.js"></script> | ||
| 191 | <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/renderer.js"></script> | ||
| 192 | <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/renderUtils.js"></script> | ||
| 193 | <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/jshader.js"></script> | ||
| 194 | <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/jpass.js"></script> | ||
| 195 | <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/RenderProcs.js"></script> | ||
| 196 | <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/RenderInitProcs.js"></script> | ||
| 197 | <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/MeshManager.js"></script> | ||
| 198 | <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/ShaderManager.js"></script> | ||
| 199 | <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/ScreenQuad.js"></script> | ||
| 200 | <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/box.js"></script> | ||
| 201 | <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/camera.js"></script> | ||
| 202 | <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/shadowLight.js"></script> | ||
| 203 | <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/utilities.js"></script> | ||
| 204 | <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/engine.js"></script> | ||
| 205 | <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/scenegraphNodes.js"></script> | ||
| 206 | <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/scenegraph.js"></script> | ||
| 207 | <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/lightmanager.js"></script> | ||
| 208 | <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/rendercontext.js"></script> | ||
| 209 | <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/particle.js"></script> | ||
| 210 | <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/run_state.js"></script> | ||
| 211 | <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/init_state.js"></script> | ||
| 212 | <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/runtime.js"></script> | ||
| 213 | --> | ||
| 214 | <!-- End Ridge Uncompiled --> | ||
| 180 | 215 | ||
| 181 | <script type="text/javascript" src="imports/codemirror/lib/codemirror.js"></script> | 216 | <script type="text/javascript" src="imports/codemirror/lib/codemirror.js"></script> |
| 182 | <script type="text/javascript" src="imports/codemirror/mode/htmlmixed/htmlmixed.js"></script> | 217 | <script type="text/javascript" src="imports/codemirror/mode/htmlmixed/htmlmixed.js"></script> |