aboutsummaryrefslogtreecommitdiff
path: root/index.html
diff options
context:
space:
mode:
authorhwc4872012-04-19 13:01:43 -0700
committerhwc4872012-04-19 13:01:43 -0700
commite6a20fe64574763483dc602bd759278ccf5e5e68 (patch)
tree69defe7200206f0257fe90697136fadef59d521e /index.html
parentae7eb87564632ce7c676bd728b8ff2710ff0bb83 (diff)
parent9284c19f076dec3b47ece7dc7bcd22d74e4246c3 (diff)
downloadninja-e6a20fe64574763483dc602bd759278ccf5e5e68.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts: js/lib/drawing/world.js js/lib/geom/geom-obj.js js/lib/rdge/materials/cloud-material.js js/lib/rdge/materials/deform-material.js js/lib/rdge/materials/flat-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/pulse-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
Diffstat (limited to 'index.html')
-rwxr-xr-xindex.html37
1 files changed, 36 insertions, 1 deletions
diff --git a/index.html b/index.html
index d385e4ba..00e8bc5e 100755
--- a/index.html
+++ b/index.html
@@ -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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 22:26:50 +0000