aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | | | Squashed commit of the following:Jonathan Duran2012-03-09
| * | | | | | | | | | | | | | remove console log and cleanupJonathan Duran2012-03-08
| * | | | | | | | | | | | | | Merge branch 'refs/heads/SerialKiller' into TimelineUberJonathan Duran2012-03-08
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Squashed commit of the following:Jonathan Duran2012-03-08
| | * | | | | | | | | | | | | Timeline: Fixes for layer numbering problem, document switching events.Jon Reid2012-03-08
| | * | | | | | | | | | | | | Merge remote-tracking branch 'ninja-kruti/SerialKiller-branch1' into Timeline...Jon Reid2012-03-08
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Timeline : Changing the order of the arrLayers being builtKruti Shah2012-03-08
| | * | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/SerialKiller' into Timeline-localJon Reid2012-03-08
| | |\| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Remove unnecessary needsDraw callsJonathan Duran2012-03-08
| | * | | | | | | | | | | | | | Merge branch 'Timeline-serialkiller' into Timeline-localJon Reid2012-03-07
| | |\| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | cleanupJonathan Duran2012-03-07
| | | * | | | | | | | | | | | | Bigfixes and cleanup from optimizationJonathan Duran2012-03-07
| | | * | | | | | | | | | | | | Bugfixes from optimizationJonathan Duran2012-03-07
| | | * | | | | | | | | | | | | Optimize Timeline serializationJonathan Duran2012-03-07
| | | * | | | | | | | | | | | | Optimize serialization bindings for Tween componentJonathan Duran2012-03-07
| | * | | | | | | | | | | | | | Timeline: Bug fix: IKNINJA-1283 When a second document is open and closed, t...Jon Reid2012-03-07
| | |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #111 from pushkarjoshi/pentoolValerio Virgillito2012-03-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-03-13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #110 from mqg734/WebGLFixesValerio Virgillito2012-03-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #108 from pushkarjoshi/brushtoolValerio Virgillito2012-03-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #105 from joseeight/FileIO-Build-CandidateValerio Virgillito2012-03-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Cleaning up webGL runtimeJose Antonio Marquez2012-03-13
| * | | | | | | | | | | | | | Clean up and TODOsJose Antonio Marquez2012-03-12
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Fix for 2D Canvas runtimeJose Antonio Marquez2012-03-12
| * | | | | | | | | | | | | Merge branch 'refs/heads/FileIO-Integration' into FileIOJose Antonio Marquez2012-03-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Add temp delay for webGL previewJose Antonio Marquez2012-03-10
| | * | | | | | | | | | | | | Merge branch 'refs/heads/FileIO-Integration' into FileIO-Build-CandidateJose Antonio Marquez2012-03-10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Temp Runtime WebGL FixJose Antonio Marquez2012-03-10
| | | * | | | | | | | | | | | | Setting local path to assetsJose Antonio Marquez2012-03-10
| | | * | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-IntegrationJose Antonio Marquez2012-03-09
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | / / | | | | |_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-IntegrationJose Antonio Marquez2012-03-09
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Fixing Issues for Windows LibJose Antonio Marquez2012-03-09
| | | * | | | | | | | | | | | | Merge pull request #33 from ericmueller/integrationJose Antonio Marquez Russo2012-03-09
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | | / / | | | | |_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | remap hard coded strings in rdge internal code.hwc4872012-03-09
| | | | * | | | | | | | | | | Merge branch 'FileIO-Integration' of github.com:joseeight/ninja-internal into...hwc4872012-03-09
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | further removal of authortime asset path replacement.hwc4872012-03-09
| | | * | | | | | | | | | | | | Removing duplicate fileJose Antonio Marquez2012-03-09
| | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Clean upJose Antonio Marquez2012-03-09
| | | * | | | | | | | | | | | Merge pull request #32 from ericmueller/integrationJose Antonio Marquez Russo2012-03-09
| | | |\| | | | | | | | | | |
| | | | * | | | | | | | | | | Removed asset path replacement at authortime.hwc4872012-03-09
| | | | * | | | | | | | | | | Added asset folder replacement to runtime load.hwc4872012-03-09
| | | * | | | | | | | | | | | Adding missing file for webGL, still need a fix for runtimeJose Antonio Marquez2012-03-09
| | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-IntegrationJose Antonio Marquez2012-03-09
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Adding webGL I/O runtime functionalityJose Antonio Marquez2012-03-09
| | | * | | | | | | | | | | | Merge branch 'refs/heads/integration' into FileIO-IntegrationJose Antonio Marquez2012-03-09
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Canvas IOhwc4872012-03-08
| | * | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-CandidateJose Antonio Marquez2012-03-09
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-CandidateJose Antonio Marquez2012-03-09
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / | | | |