| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-09 | 1 | -0/+22 |
|\ |
|
| * | another debug msg | UbitUmarov | 2012-10-09 | 1 | -0/+22 |
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-09 | 9 | -12/+45 |
|\ \
| |/ |
|
| * | force allocation of mesh data on creation ( messy code version ) | UbitUmarov | 2012-10-09 | 9 | -12/+45 |
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-09 | 1 | -0/+19 |
|\ \
| |/ |
|
| * | temporary debug code | UbitUmarov | 2012-10-09 | 1 | -0/+19 |
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-09 | 1 | -0/+3 |
|\ \
| |/ |
|
| * | fire a extra terseupdate when stopping (like in loosing physics). In some | UbitUmarov | 2012-10-09 | 1 | -0/+3 |
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-09 | 1 | -6/+8 |
|\ \
| |/ |
|
| * | Change ray to land colision range limitation so it has no impact on other | UbitUmarov | 2012-10-09 | 1 | -6/+8 |
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-09 | 4 | -83/+229 |
|\ \
| |/ |
|
| * | move terrain geom to own ode space. Limit range on raycast if includes | UbitUmarov | 2012-10-09 | 4 | -83/+229 |
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-08 | 4 | -117/+112 |
|\ \
| |/ |
|
| * | a few changes/fix (?) | UbitUmarov | 2012-10-07 | 4 | -117/+112 |
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-07 | 4 | -41/+85 |
|\ \
| |/ |
|
| * | bug fix + make costs visible for testing | UbitUmarov | 2012-10-07 | 4 | -41/+85 |
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-07 | 4 | -44/+122 |
|\ \
| |/ |
|
| * | refix so we can compile it, loosing alpha scultps fix on core meshmerizer | UbitUmarov | 2012-10-07 | 1 | -0/+11 |
| * | fix wrong file commited | UbitUmarov | 2012-10-07 | 1 | -10/+0 |
| * | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-10-07 | 1 | -24/+7 |
| |\ |
|
| | * | comment out a spam coment on core Meshmerizer | UbitUmarov | 2012-10-07 | 1 | -26/+4 |
| * | | i update core ode plugin and make it load is meshs (i hope) | UbitUmarov | 2012-10-07 | 3 | -24/+118 |
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-07 | 7 | -1052/+632 |
|\ \ \
| |/ / |
|
| * | | [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts | UbitUmarov | 2012-10-07 | 7 | -1052/+632 |
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-05 | 4 | -40/+70 |
|\ \ \
| |/ / |
|
| * | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-10-05 | 3 | -32/+50 |
| |\ \
| | |/ |
|
| | * | Fix threading in remote asset connector | Melanie | 2012-10-05 | 1 | -16/+21 |
| | * | Allow default animation to be stopped to be replaced with another one. | Melanie | 2012-10-04 | 2 | -16/+29 |
| * | | make sure a buffer is closed, and changed a misleading log msg | UbitUmarov | 2012-10-05 | 1 | -8/+20 |
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-04 | 4 | -29/+144 |
|\ \ \
| |/ / |
|
| * | | more changes and more non active code | UbitUmarov | 2012-10-04 | 4 | -29/+144 |
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-04 | 1 | -1/+1 |
|\ \ \
| |/ / |
|
| * | | apply cmic fix to multi layer wearables | UbitUmarov | 2012-10-04 | 1 | -1/+1 |
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-04 | 1 | -1/+12 |
|\ \ \
| |/ / |
|
| * | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-10-04 | 1 | -1/+12 |
| |\ \
| | |/ |
|
| | * | Fix a viewer crash issue | Melanie | 2012-10-03 | 1 | -1/+12 |
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-04 | 5 | -23/+615 |
|\ \ \
| |/ / |
|
| * | | more changes. Most code not in use | UbitUmarov | 2012-10-04 | 5 | -23/+615 |
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-04 | 1 | -1/+1 |
|\ \ \
| |/ / |
|
| * | | missing changed file | UbitUmarov | 2012-10-03 | 1 | -1/+1 |
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-04 | 2 | -4/+41 |
|\ \ \
| |/ / |
|
| * | | meshworker basic replacement of SOP CheckSculptAndLoad ( for now disabled | UbitUmarov | 2012-10-03 | 2 | -4/+41 |
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-03 | 2 | -4/+23 |
|\ \ \
| |/ / |
|
| * | | making meshworker have more work.. | UbitUmarov | 2012-10-03 | 2 | -4/+23 |
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-03 | 9 | -166/+311 |
|\ \ \
| |/ / |
|
| * | | introduce a ODEMeshWorker class, should be pure cosmetic changes for now | UbitUmarov | 2012-10-03 | 7 | -163/+262 |
| |/ |
|
| * | Attempt to fix Mantis #6311. Honor a destination folder if one is given | Melanie | 2012-10-02 | 1 | -0/+39 |
| * | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | Melanie | 2012-09-28 | 4 | -57/+147 |
| |\ |
|
| * | | Fix a possible NRE | Melanie | 2012-09-28 | 1 | -3/+10 |
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-28 | 4 | -57/+147 |
|\ \ \
| | |/
| |/| |
|