aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge
Commit message (Collapse)AuthorAge
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-19
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * removed old unused import and export functions.John Mayhew2012-04-03
| |
| * Made use of semicolons consistent and updated new files to use the new RDGE ↵John Mayhew2012-04-03
| | | | | | | | namespace
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-04-02
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Fixed issue with WebGL materials not working after file-save or ↵Nivesh Rajbhandari2012-03-26
| | | | | | | | | | | | | | | | | | chrome-preview. Also fixed Raiders material not showing in the PI or working during Chrome Preview. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Squashed commit of the following GL integrationValerio Virgillito2012-03-22
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | -Namespaced all RDGE javascript.John Mayhew2012-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Removed the following unused files from the build script /core/script/fx/blur.js /core/script/fx/ssao.js /core/script/animation.js - Fully removed the following from the build and from source control as they are unused or no longer needed /core/script/util/dbgpanel.js /core/script/util/fpsTracker.js /core/script/util/statTracker.js /core/script/input.js /core/script/TextureManager.js /core/script/ubershader.js
* | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snapping_II Conflicts: js/tools/Rotate3DToolBase.js js/tools/RotateStage3DTool.js js/tools/Translate3DToolBase.js js/tools/modifier-tool-base.js
* | | Cloud materialhwc4872012-04-17
| | |
* | | Cloud materialhwc4872012-04-16
| | |
* | | Cloud Materialhwc4872012-04-15
| | |
* | | Cloud Materialhwc4872012-04-13
| | |
* | | Cloud materialhwc4872012-04-12
| | |
* | | Cloud materialhwc4872012-04-11
| | |
* | | Cloud materialhwc4872012-04-11
| | |
* | | Cloud materialhwc4872012-04-10
| | |
* | | Cloudshwc4872012-04-08
| | |
* | | texture notificationshwc4872012-04-06
| | |
* | | Re-added taper and twist-vert materials.hwc4872012-04-05
| | |
* | | Added Flag materialhwc4872012-04-04
| | |
* | | started the flag materialhwc4872012-04-03
| | |
* | | texture abstractionhwc4872012-04-02
| | |
* | | texture abstractionhwc4872012-04-02
| | |
* | | converted materials to new texture structurehwc4872012-03-30
| | |
* | | linked textureshwc4872012-03-29
| | |
* | | texture abstraction integrationhwc4872012-03-27
| | |
* | | Integrated texture wrapper into pulse and bump-metal materials.hwc4872012-03-27
| | |
* | | WebGL & Canvas as data for texture maps.hwc4872012-03-26
| | |
* | | textureshwc4872012-03-23
| | |
* | | textureshwc4872012-03-23
| | |
* | | Merge branch 'integration' of github.com:ericmueller/ninja-internal into ↵hwc4872012-03-22
|\ \ \ | | | | | | | | | | | | Textures
| * | | Added Paris and Raiders materialshwc4872012-03-22
| | | |
| * | | Synchronized material animation speed for pulse material between Ninja and ↵hwc4872012-03-21
| | | | | | | | | | | | | | | | runtime.
| * | | Added material library data to the canvas data.hwc4872012-03-21
| | | |
| * | | Bug Fixes for Canvas & WebGL File IOhwc4872012-03-20
| | | |
| * | | removing dead codehwc4872012-03-16
| | | |
| * | | Conversion to JSON based file IO for canvas2D and WebGL renderinghwc4872012-03-16
| | |/ | |/|
* / | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-03-22
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Texture Conflicts: assets/shaders/plasma.frag.glsl js/helper-classes/RDGE/GLLine.js js/helper-classes/RDGE/MaterialsLibrary.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/rectangle.js js/lib/rdge/materials/flat-material.js js/lib/rdge/materials/material.js js/panels/Materials/Materials.xml js/panels/Materials/materials-popup.reel/materials-popup.js js/preloader/Preloader.js
* | Corrections for Uber shader IOhwc4872012-03-14
| |
* | Uber material changes for IOhwc4872012-03-12
| |
* | Removing duplicate fileJose Antonio Marquez2012-03-09
| |
* | Merge pull request #32 from ericmueller/integrationJose Antonio Marquez Russo2012-03-09
|\ \ | | | | | | Added asset folder replacement to runtime load.
| * | Removed asset path replacement at authortime.hwc4872012-03-09
| | |
* | | Adding missing file for webGL, still need a fix for runtimeJose Antonio Marquez2012-03-09
|/ /
* | Adding webGL I/O runtime functionalityJose Antonio Marquez2012-03-09
| | | | | | | | There is a problem that needs to be resolved in the CanvasRuntime.
* | Canvas IOhwc4872012-03-08
| |
* | removed an unused parameter to CanvasDataManagerhwc4872012-03-08
| |
* | Fix for runtime Radial blur materialhwc4872012-03-08
| |
* | Fixed a few problems with Plasma material.hwc4872012-03-07
| |
* | File IOhwc4872012-03-07
|/