summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-08-29Added the ability to remove a preprocessor define.Jonathan Goodman
2012-08-29Just pass in an empty preprocessor definition map from now on. The shader ↵Jonathan Goodman
compiler won't add new #defines if it's empty.
2012-08-28Added new bindTexture and unbindTexture API to LLGLSLShader. Reviewed by davep.Jonathan Goodman
2012-08-28Added support for adding custom preprocessor definitions (for shader ↵Jonathan Goodman
permutations)
2012-08-23pull back beta tagOz Linden
2012-08-22merge changes for DRTVWR-202Oz Linden
2012-08-22tag merge of DRTVWR-202Oz Linden
2012-08-22Added tag 3.4.0-beta4 for changeset 84fb70dfe344Oz Linden
2012-08-22Fix up white space to follow coding policy guidelinescallum_linden
2012-08-22pull back release hotfix and beta fixesOz Linden
2012-08-22merge changes for DRTVWR-201Oz Linden
2012-08-22tag merge of DRTVWR-201Oz Linden
2012-08-22merge changes forOz Linden
2012-08-22merge changes for DRTVWR-203Oz Linden
2012-08-22tag merge of DRTVWR-203Oz Linden
2012-08-22merge back 3.4.0-beta3 fixesOz Linden
2012-08-21storm-1906: correct cmake error when using precompiled llphysicsextensions_tpvOz Linden
2012-08-20Added tag 3.4.0-beta3 for changeset 182a9bf30e81Oz Linden
2012-08-20tag merge of DRTVWR-200Oz Linden
2012-08-20merge back beta fixesOz Linden
2012-08-20silly change to trigger a rebuild in Team Citycallum_linden
2012-08-20silly change to trigger a rebuild in Team Citycallum_linden
2012-08-20Added tag 3.3.4-release2 for changeset 7c9102fb9988Oz Linden
2012-08-20tag merge of DRTVWR-199Oz Linden
2012-08-17MAINT-1439: BUGFIX Correcting Kart 1.0 issue with physical objects using ↵Todd Stinson
angular velocity.
2012-08-17Minor change required for merge from viewer-developmentAura Linden
2012-08-17Merged in from viewer-development.Aura Linden
2012-08-16Added tag 3.4.0-beta2 for changeset b1dbb1a83f48Oz Linden
2012-08-16merge changes for DRTVWR-197Oz Linden
2012-08-16tag merge of DRTVWR-197Oz Linden
2012-08-16Reverting Sabin's change to build system that we used during testingcallumprentice
2012-08-16PATH-852: Attempting to fix the format of the BMP cursors for linux.Todd Stinson
2012-08-16Silly Python 'string' fixcallumprentice
2012-08-16Silly Python 'string' fixcallumprentice
2012-08-16Silly typo fixcallumprentice
2012-08-16merge changes for storm-1879Oz Linden
2012-08-16merge changes for storm-1895Oz Linden
2012-08-16merge changes for storm-1898Oz Linden
2012-08-16merge changes for storm-1899Oz Linden
2012-08-16merge up to latest viewer-developmentOz Linden
2012-08-15Add explicit reference to keychain to usecallumprentice
2012-08-15merge back beta fixesOz Linden
2012-08-15silly typo - change language from dutch to english :)callumprentice
2012-08-15merge changes for DRTVWR-198Oz Linden
2012-08-15tag merge of DRTVWR-198Oz Linden
2012-08-15merge back beta fixesOz Linden
2012-08-15Changed name of keychain to match setup instructionscallum_linden
2012-08-15tag merge of DRTVWR-196Oz Linden
2012-08-15merge changes for DRTVWR-194Oz Linden
2012-08-15tag merge of DRTVWR-194Oz Linden