Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for all physics engines) | |||||
* | | | | | | | | | | | | | | | 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 | 5 | -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 | 5 | -57/+147 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | make some forgotten changes be done by simulation thread not by caller | UbitUmarov | 2012-09-27 | 2 | -34/+126 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Update the Http server with a few additional properties. Adapt the test | Melanie | 2012-09-27 | 2 | -0/+4 | |
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server code to match. | |||||
| * | | | | | | | | | | | | Merge branch 'ubitwork' into avination | Melanie | 2012-09-26 | 1 | -5/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Streamline and improve llGetMass | Melanie | 2012-09-26 | 1 | -23/+17 | |
| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-27 | 1 | -5/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | create a new PollServiceHttpRequest req per loop since they can be sent to | UbitUmarov | 2012-09-27 | 1 | -5/+1 | |
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | another working thread | |||||
* | | | | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-26 | 2 | -11/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | don't send a partial contents report if we are sending all data | UbitUmarov | 2012-09-26 | 1 | -10/+15 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | add assettype mesh to list of binary assets | UbitUmarov | 2012-09-26 | 1 | -1/+2 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-26 | 1 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | fix GetTextureHandler range | UbitUmarov | 2012-09-26 | 1 | -1/+5 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | missing file | UbitUmarov | 2012-09-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-26 | 7 | -29/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | just remove the damm thing | UbitUmarov | 2012-09-26 | 7 | -29/+7 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-26 | 4 | -23/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Seems nothing actually need the request body for getevents. so change | UbitUmarov | 2012-09-26 | 5 | -15/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | control flag to false | |||||
| * | | | | | | | | | | | UriModule GetEvents also doesn't need a request body | UbitUmarov | 2012-09-26 | 1 | -0/+1 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | keep watchdog happy using it to kill his threads | UbitUmarov | 2012-09-26 | 1 | -9/+1 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-26 | 5 | -35/+35 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | more changes to PollService | UbitUmarov | 2012-09-26 | 4 | -25/+25 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | fix priorityQueue to correctly use the fairness counts starting at 8 for | UbitUmarov | 2012-09-26 | 1 | -10/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nonimediate queues. Imediate queues where not taken into account so it was unused. | |||||
* | | | | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-25 | 3 | -67/+62 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | missed change | UbitUmarov | 2012-09-25 | 1 | -1/+2 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | do the same to webFecthInvDescModule | UbitUmarov | 2012-09-25 | 1 | -33/+25 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | change GetTextureModule processing | UbitUmarov | 2012-09-25 | 1 | -29/+31 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Text changes for upload messages | Melanie | 2012-09-24 | 1 | -4/+4 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-24 | 3 | -69/+128 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | more upload changes (plus untouch prebuild.xml) | UbitUmarov | 2012-09-24 | 3 | -69/+128 | |
| | | | | | | | | | | | |