| Commit message (Collapse) | Author | Age |
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
integration
Conflicts:
js/helper-classes/RDGE/GLWorld.js
js/helper-classes/RDGE/Materials/PulseMaterial.js
js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
js/helper-classes/RDGE/src/tools/rdge-compiled.js
js/preloader/Preloader.js
|
| |
| |
| |
| | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| |
| |
| |
| |
| |
| | |
WebGL materials."
This reverts commit 96a0a8c916533eb5625816192ed38488f639326d.
|
| |
| |
| |
| |
| |
| | |
materials.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | |
|
| | |
|
| | |
|
| | |
|
|/ |
|
|\
| |
| |
| |
| | |
Conflicts:
js/ninja.reel/ninja.html
|
| |
| |
| |
| | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| |\
| | |
| | |
| | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | |
|
| | | |
|
| | |\
| | | |
| | | |
| | | |
| | | | |
Conflicts:
js/helper-classes/RDGE/Materials/FlatMaterial.js
|
| | | |
| | | |
| | | |
| | | |
| | | | |
switched the preloader to use the compiled version of rdge
Updated the rdge binary.
|
| | | | |
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
js/helper-classes/RDGE/GLRectangle.js
js/helper-classes/RDGE/GLWorld.js
js/helper-classes/RDGE/MaterialsLibrary.js
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | | |
Started vertex deformations.
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | | |
working
|
| | | | | | |
|
| | | | | | |
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
js/helper-classes/RDGE/GLMaterial.js
js/helper-classes/RDGE/GLRectangle.js
js/helper-classes/RDGE/GLWorld.js
js/helper-classes/RDGE/Materials/FlatMaterial.js
js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js
js/helper-classes/RDGE/Materials/JuliaMaterial.js
js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js
js/helper-classes/RDGE/Materials/MandelMaterial.js
js/helper-classes/RDGE/Materials/PlasmaMaterial.js
js/helper-classes/RDGE/Materials/PulseMaterial.js
js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
js/helper-classes/RDGE/Materials/RadialGradientMaterial.js
js/helper-classes/RDGE/Materials/TunnelMaterial.js
js/helper-classes/RDGE/Materials/TwistMaterial.js
js/helper-classes/RDGE/rdge-compiled.js
js/helper-classes/RDGE/src/core/script/renderer.js
js/panels/Materials/Materials.xml
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Also, merging in changes that improve rendering performance by not updating static materials.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|\ \ \ \ \ \
| | |/ / / /
| |/| | | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
js/helper-classes/RDGE/Materials/FlatMaterial.js
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | |/ / / /
| |/| | | |
| | | | | |
| | | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | | |
between 2d and 3d shape modes.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|\ \ \ \ \
| | |/ / /
| |/| | | |
|
| | | | | |
|
| |\| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
js/helper-classes/RDGE/GLWorld.js
js/helper-classes/RDGE/MaterialsLibrary.js
|
| | | | |
| | | | |
| | | | |
| | | | | |
and mouse down
|
| | | | | |
|
| |\ \ \ \
| | | |_|/
| | |/| | |
|
| | | | |
| | | | |
| | | | |
| | | | | |
fix to colorToHex)
|
| |\ \ \ \
| | | |_|/
| | |/| | |
|
| | | | | |
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | | |
Changed zoom from the document bar to keep the location center of the viewable portion of the document fixed.
|
| | | | | |
|
| | | | | |
|