Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #3 from joseeight/FileIO-Integration | Eric | 2012-03-09 |
|\ | |||
| * | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Integration | Jose Antonio Marquez | 2012-03-09 |
| |\ | |||
| | * | Merge pull request #106 from joseeight/Color | Valerio Virgillito | 2012-03-09 |
| | |\ | |||
| | | * | Temp Gradient Fix | Jose Antonio Marquez | 2012-03-09 |
| | | * | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-03-09 |
| | | |\ | | | |/ | | |/| | |||
| | | * | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-02-29 |
| | | |\ | |||
| | | * \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-28 |
| | | |\ \ | |||
| | | * \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-23 |
| | | |\ \ \ | |||
| | | * \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-22 |
| | | |\ \ \ \ | |||
| | | * \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-21 |
| | | |\ \ \ \ \ | |||
| | | * \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-17 |
| | | |\ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-17 |
| | | |\ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-16 |
| | | |\ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-15 |
| | | |\ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | Bug Fixes | Jose Antonio Marquez | 2012-02-11 |
| | | * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-11 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-08 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-08 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-04 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-02 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #2 from mqg734/NiveshColor | Jose Antonio Marquez Russo | 2012-02-01 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-01 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #1 from mqg734/NiveshColor | Jose Antonio Marquez Russo | 2012-01-31 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | Fixing Issues for Windows Lib | Jose Antonio Marquez | 2012-03-09 |
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #33 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-03-09 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | | | | | | remap hard coded strings in rdge internal code. | hwc487 | 2012-03-09 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'FileIO-Integration' of github.com:joseeight/ninja-internal into... | hwc487 | 2012-03-09 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* | | | | | | | | | | | | | | | | | | | | | | further removal of authortime asset path replacement. | hwc487 | 2012-03-09 |
| | * | | | | | | | | | | | | | | | | | | | | Removing duplicate file | Jose Antonio Marquez | 2012-03-09 |
| |/ / / / / / / / / / / / / / / / / / / / | |||
| * | | | | | | | | | | | | | | | | | | | | Clean up | Jose Antonio Marquez | 2012-03-09 |
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #32 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-03-09 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | | | | | | Removed asset path replacement at authortime. | hwc487 | 2012-03-09 |
* | | | | | | | | | | | | | | | | | | | | | Added asset folder replacement to runtime load. | hwc487 | 2012-03-09 |
| * | | | | | | | | | | | | | | | | | | | | Adding missing file for webGL, still need a fix for runtime | Jose Antonio Marquez | 2012-03-09 |
|/ / / / / / / / / / / / / / / / / / / / | |||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Integration | Jose Antonio Marquez | 2012-03-09 |
|\| | | | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-03-09 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into montage-integration | Valerio Virgillito | 2012-03-08 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | integrating v0.7 montage into ninja | Valerio Virgillito | 2012-03-08 |
* | | | | | | | | | | | | | | | | | | | | | | Adding webGL I/O runtime functionality | Jose Antonio Marquez | 2012-03-09 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/integration' into FileIO-Integration | Jose Antonio Marquez | 2012-03-09 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | | Canvas IO | hwc487 | 2012-03-08 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-08 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | | | | | | Merge pull request #102 from dhg637/Panels | Valerio Virgillito | 2012-03-08 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | | | | | | | | | | Disabled State is now darker | Armen Kesablyan | 2012-03-08 |
| | * | | | | | | | | | | | | | | | | | | | | | Z-Index issue of disabled state with file open dialog | Armen Kesablyan | 2012-03-08 |
| | * | | | | | | | | | | | | | | | | | | | | | Disabled state for panels | Armen Kesablyan | 2012-03-07 |
| | * | | | | | | | | | | | | | | | | | | | | | Reordering and resizing now works | Armen Kesablyan | 2012-03-07 |
| | * | | | | | | | | | | | | | | | | | | | | | Fixed: Collapsed panels would collapse panels below | Armen Kesablyan | 2012-03-07 |
| | * | | | | | | | | | | | | | | | | | | | | | Fixed Collapsing and resizing window with panels | Armen Kesablyan | 2012-03-07 |
| | | |/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #104 from ananyasen/inte |