aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
...
| | * | reduce avatar hover in basic ode pluginUbitUmarov2014-07-181-1/+1
| | * | fix Xengine script instance loadUbitUmarov2014-07-181-7/+6
| | * | Merge branch 'avination-current' into ubitworkUbitUmarov2014-07-1653-472/+954
| | |\ \
| | | * \ Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster in...UbitUmarov2014-07-1621-91/+256
| | | |\ \
| | | * \ \ Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster in...UbitUmarov2013-09-1936-381/+698
| | | |\ \ \
| | * | \ \ \ Merge branch 'avination-current' into ubitworkUbitUmarov2013-06-083-320/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster in...UbitUmarov2013-06-083-320/+1
| | | |\ \ \ \
| | * | | | | | add indexes for new visual parameters shape_hover andUbitUmarov2013-06-071-1/+6
| | * | | | | | try to suspend and resume keyframes on copy to inventory to take copyUbitUmarov2013-06-061-1/+12
| | * | | | | | Merge branch 'avination-current' into ubitworkUbitUmarov2013-06-061-15/+64
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | keyframe: add more locks, change timming stop, added Suspend and resumeUbitUmarov2013-06-061-15/+64
| | * | | | | | Merge branch 'avination-current' into ubitworkUbitUmarov2013-06-064-18/+43
| | |\ \ \ \ \ \ | | | |/ / / / /
| | * | | | | | Merge branch 'avination-current' into ubitworkUbitUmarov2013-05-314-7/+7
| | |\ \ \ \ \ \
| | * | | | | | | retouch prim stopped condition testUbitUmarov2013-05-291-3/+3
| | * | | | | | | removed spurius ref to ode.dll from odeapiUbitUmarov2013-05-291-1/+1
| | * | | | | | | correction to previus comment: all parameters but gravity modifier haveUbitUmarov2013-05-291-1/+0
| | * | | | | | | let gravity modifier, friction, restitution and density changes be appliedUbitUmarov2013-05-292-6/+65
| | * | | | | | | make sure friction slip parameters are zero ( or other value ) and notUbitUmarov2013-05-291-3/+3
| | * | | | | | | missing fileUbitUmarov2013-05-291-0/+5
| | * | | | | | | missing filesUbitUmarov2013-05-292-5/+6
| | * | | | | | | *** DANGER TESTING **** changed prims mesh generation hopefully removingUbitUmarov2013-05-299-1178/+503
| * | | | | | | | fix attachmentsUbitUmarov2014-07-191-7/+9
| * | | | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie Thielker2014-06-21663-40549/+83928
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2014-01-2859-1643/+2129
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2014-01-2816-101/+265
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Remove the core module extra profile settings support carried in with the latestMelanie2014-01-053-2/+6
| | * | | | | | | | | | Intermediate commit. Sill errors.Melanie2014-01-0536-8803/+10755
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge commit '92aad6f1bb45974927fa43d6fd30f98337dee3f0' into careminsterMelanie2014-01-050-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge commit '5b73b9c4a85335ba837280688b903fef44be8f35' into careminsterMelanie2014-01-050-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '3df8990e6ff6a5293b425e906cd381da9e0424a5' into careminsterMelanie2014-01-050-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '97934e00e667b6f432340a54671221a970a048d7' into careminsterMelanie2014-01-050-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '08750501617ca332ab196b2f25030e3c635c9dd6' into careminsterMelanie2014-01-051-2/+88
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Revert "Add support for user preferences (im via email)"Melanie2013-12-0714-297/+36
| | * | | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-12-0717-48/+305
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-12-0713-7904/+8421
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-11-2376-9536/+10619
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-11-0834-7618/+7968
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-11-0380-259/+17602
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2013-10-066-6/+34
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | * Fixes cases where Last Attachment Point gets overwritten with 0 when it sho...teravus2013-10-054-4/+12
| | | * | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of careminster:/var/git/careminsterteravus2013-10-0485-872/+2997
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of careminster:/var/git/careminsterteravus2013-09-1611-76/+98
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | * This fixes the border crossing offsets by storing the final keyframe locati...teravus2013-09-161-2/+22
| | | * | | | | | | | | | | | | | | | | | | | | | | * Fix a null ref that causes a stack unwind when crossing borders. Less stac...teravus2013-09-163-12/+49
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-10-0668-71/+242
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-10-0485-872/+2997
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'avination-current' into careminsterMelanie2013-09-1615-88/+147
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | / / / | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-09-0737-114/+727
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-09-0125-297/+943
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-08-181-4/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \