aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* fixing the number fields to not have units.Valerio Virgillito2012-04-04
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-04-04
|\
| * Merge pull request #156 from mayhewinator/WorkingBranchValerio Virgillito2012-04-04
| |\ | | | | | | Namespace and code cleanup for RDGE and related files
| | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-04-04
| | |\ | | |/ | |/| | | | | | | | | | | | | WorkingBranch Conflicts: js/lib/drawing/world.js
| | * removed unnecessary call to exportMaterials from init(). this call should ↵John Mayhew2012-04-04
| | | | | | | | | | | | not have been there.
| | * Removed the dependence on an "assets" directory for the RDGE runtime. Now ↵John Mayhew2012-04-03
| | | | | | | | | | | | Ninja does not need to create duplicate files when it sets up the users Ninja Projects directory for RDGE support.
| | * removed old unused import and export functions.John Mayhew2012-04-03
| | |
| | * Namespaced the canvas runtime file and updated all dependenciesJohn Mayhew2012-04-03
| | |
| | * updated the rdge compiled version and its runtime, incremented rdge library ↵John Mayhew2012-04-03
| | | | | | | | | | | | version number
| | * fixed remaining namespace bugs ensuring the use of the RDGE namespace ↵John Mayhew2012-04-03
| | | | | | | | | | | | everywhere it is required
| | * removed unnecessary files from the RDGE build.John Mayhew2012-04-03
| | | | | | | | | | | | | | | Added back the build batch and shell script files for building the compiled version of RDGE Corrected the build scripts to not include the precompiled.js file twice.
| | * added the Closure compiler to the gitignore file so we wouldn't track it in ↵John Mayhew2012-04-03
| | | | | | | | | | | | source control
| | * 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
| | * | Recompiled RDGE and put index.html back to loading the compiled version of RDGEJohn Mayhew2012-04-02
| | | |
| | * | Fixed compiler warningsJohn Mayhew2012-04-02
| | | |
| | * | -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 'refs/heads/master' into componentsValerio Virgillito2012-04-04
|\| | |
| * | | Merge pull request #154 from mqg734/ToolFixesValerio Virgillito2012-04-04
| |\ \ \ | | | | | | | | | | Need to set elementModel.isIn2DSnapCache flag to false when removing element from SnapManager's cache.
| | * | | Need to set elementModel.isIn2DSnapCache flag to false when removing element ↵Nivesh Rajbhandari2012-04-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from SnapManager's cache. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | Merge pull request #149 from dhg637/BugFixesValerio Virgillito2012-04-04
| |\ \ \ \ | | | | | | | | | | | | Bug fixes
| | * | | | Merge branch 'refs/heads/master' into BugFixesArmen Kesablyan2012-04-04
| | |\| | |
| | * | | | Bug #1060: Fixed CSS Lint issueArmen Kesablyan2012-03-30
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | Bug Fix: Height and width of panels not be keptArmen Kesablyan2012-03-29
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | Resizing BugsArmen Kesablyan2012-03-29
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | Bug #1073: Panels interact with hottest drag dropArmen Kesablyan2012-03-28
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | Merge pull request #150 from ericguzman/PresetsPIValerio Virgillito2012-04-04
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Presets - Fix a couple issues with presets
| | * | | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-04-04
| | |\ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | Conflicts: js/controllers/presets-controller.js
| * | | | | Squashed commit of Preparing for the montage undo-manager: Architecture changesValerio Virgillito2012-04-04
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reworked the add and remove elements into 1 function which can take 1 or more elements. Removed the _element from the selection array Many other changes related to those 2 changes Undo/Redo shortcuts are now using montage undo/redo manager. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Merge pull request #148 from ananyasen/integration-candidateValerio Virgillito2012-04-01
| |\ \ \ \ | | | | | | | | | | | | added text paste detection and updated some menu items
| | * | | | - using clipboard data directly to avoid using setTimeoutAnanya Sen2012-03-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixed logical error to trigger OK on Enter key pressed Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | detect paste from context menu for new file and save as dialogAnanya Sen2012-03-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | IKNINJA-719 - removed Zoom In/Zoom Out under View menu in the Main menuAnanya Sen2012-03-28
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Disabled cut, copy, paste, debug, since that functionality is not there yet Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | Merge pull request #151 from ericguzman/CSSPanel_AnimationDurationFixValerio Virgillito2012-03-30
| |\ \ \ \ | | | | | | | | | | | | CSS Panel - Fix animation duration value updates from "infinite" to int...
| | * | | | CSS Panel - Fix animation duration value updates from "infinite" to integer.Eric Guzman2012-03-29
| |/ / / /
| | | * | Animation Presets - Only combine animations if pre-existing animations existEric Guzman2012-04-02
| | | | |
| | | * | Presets Controller - Remove unused method callEric Guzman2012-03-30
| | | | |
| | | * | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-29
| | | |\ \ | | |_|/ / | |/| | |
| | | * | Presets - Remove style transition when transition doesn't start. Also added ↵Eric Guzman2012-03-29
| | | | | | | | | | | | | | | | | | | | temporary fix for aggregating animations (from timeline/presets)
* | | | | removing some of the button propertiesValerio Virgillito2012-03-30
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Merge branch 'components' of github.com:mencio/ninja-internal into componentsValerio Virgillito2012-03-30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: node_modules/components-data/toggle-button.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | completing the component simple piValerio Virgillito2012-03-30
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | completing the component simple piValerio Virgillito2012-03-30
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | IKNINJA-1191 - Fixed the order of the componentsValerio Virgillito2012-03-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Components now appear in alphabetical order. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-03-30
|\| | | |
| * | | | Merge pull request #147 from pushkarjoshi/brushtoolValerio Virgillito2012-03-29
| |\ \ \ \ | | |/ / / | |/| | | Brushtool
| | * | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-28
| | |\ \ \
| | * | | | turn off changing the left and top of the brush stroke canvasPushkar Joshi2012-03-28
| | | | | |
| | * | | | Merge branch 'maste