Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-13 | 6 | -20/+150 |
|\ | |||||
| * | add a Check method to flotsamAssetCache, so to check if a asset is in | UbitUmarov | 2012-12-13 | 6 | -20/+150 |
| | | | | | | | | | | | | | | | | cache without actually loading it. Make use limited use of it in avatarfactory textures check. Also on llclientview HandleAgentTextureCached that now should work. Other asset cache modules for now will return false, so are broken. baked textures logic still unchanged. *UNTESTED* | ||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-11 | 3 | -88/+108 |
|\ \ | |/ | |||||
| * | make ubitODE ignore X and Y rotation components on avatar rotations | UbitUmarov | 2012-12-11 | 1 | -14/+37 |
| | | |||||
| * | changes on the fast speed avatars collider, collisions from above, etc | UbitUmarov | 2012-12-11 | 1 | -62/+64 |
| | | |||||
| * | fix let other phys plugins work.. broken when added feetOffset | UbitUmarov | 2012-12-11 | 3 | -13/+8 |
| | | |||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-11 | 4 | -4/+12 |
|\ \ | |/ | |||||
| * | missing files remove some warnings... | UbitUmarov | 2012-12-11 | 3 | -4/+3 |
| | | |||||
| * | missing file | UbitUmarov | 2012-12-11 | 1 | -0/+9 |
| | | |||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-11 | 3 | -301/+392 |
|\ \ | |/ | |||||
| * | a few more changes on avatar collider | UbitUmarov | 2012-12-11 | 2 | -299/+363 |
| | | |||||
| * | typo fix | UbitUmarov | 2012-12-10 | 1 | -2/+3 |
| | | |||||
| * | add velocityinterpolator packets handling but actually do nothing, since | UbitUmarov | 2012-12-09 | 1 | -1/+27 |
| | | | | | | | | they don't do what i was looking for. | ||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-07 | 1 | -1/+2 |
|\ \ | |/ | |||||
| * | add some default size setting and checks | UbitUmarov | 2012-12-07 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-07 | 4 | -12/+28 |
|\ \ | |/ | |||||
| * | revert the use of avatar skeleton and use avatar size provided by viewers, | UbitUmarov | 2012-12-07 | 4 | -12/+28 |
| | | | | | | | | since at least for now seems good enought | ||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-07 | 4 | -5/+26 |
|\ \ | |/ | |||||
| * | create a new ode character also with the new information | UbitUmarov | 2012-12-07 | 4 | -5/+26 |
| | | |||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-07 | 5 | -5/+66 |
|\ \ | |/ | |||||
| * | *TEST* Use new avatar size in ubitODE. | UbitUmarov | 2012-12-07 | 5 | -5/+66 |
| | | |||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-07 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | fix regression | UbitUmarov | 2012-12-07 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-07 | 1 | -4/+25 |
|\ \ | |/ | |||||
| * | *TEST* add some avatar skeleton information and use it to calculate avatar | UbitUmarov | 2012-12-07 | 1 | -4/+25 |
| | | | | | | | | height and bounding box. Change LSL acording. | ||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-06 | 4 | -105/+85 |
|\ \ | |/ | |||||
| * | avatar collision plane send to viewer is only relative to feet. change | UbitUmarov | 2012-12-05 | 4 | -105/+85 |
| | | | | | | | | avatar collider, just rounding the boxes, etc | ||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-04 | 3 | -14/+47 |
|\ \ | |/ | |||||
| * | move characters (avatars) to own collision space, also fixing a problem | UbitUmarov | 2012-12-04 | 3 | -14/+47 |
| | | | | | | | | with previus code that was still assuming the avatar is g2 | ||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-04 | 1 | -4/+4 |
|\ \ | |/ | |||||
| * | raise standing avatar a bit to reduce knees bending on some collisions. | UbitUmarov | 2012-12-04 | 1 | -4/+4 |
| | | | | | | | | reduce head size a bit | ||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-03 | 311 | -10116/+20710 |
|\ \ | |/ | |||||
| * | Merge branch 'avination' into ubitwork | Melanie | 2012-12-03 | 6 | -107/+383 |
| |\ | |||||
| | * | *TEST* diferent avatar collider | UbitUmarov | 2012-12-03 | 3 | -103/+350 |
| | | | |||||
| | * | fix vertex rounding direction | UbitUmarov | 2012-12-03 | 1 | -1/+8 |
| | | | |||||
| | * | *TEST* reduce all mesh vertices resolution to 1e-5. This reduces number | UbitUmarov | 2012-12-03 | 1 | -0/+16 |
| | | | | | | | | | | | | of unique vertices only originated by math errors in PrimMesher | ||||
| | * | adjust avatar standing Z position | UbitUmarov | 2012-12-03 | 1 | -5/+11 |
| | | | |||||
| | * | Add a transaction ID to the money module path for llTransferLindenDollars | Melanie | 2012-12-03 | 2 | -3/+3 |
| | | | |||||
| * | | don't zero constant force and torque in selection | UbitUmarov | 2012-11-24 | 1 | -6/+6 |
| | | | |||||
| * | | avoid potencial NullReferenceException | UbitUmarov | 2012-11-24 | 1 | -2/+5 |
| |/ | |||||
| * | Remove a superfluous newline from help | Melanie | 2012-11-23 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'careminster' into avination | Melanie | 2012-11-23 | 7 | -33/+129 |
| |\ | |||||
| | * | Merge branch 'master' into careminster | Melanie | 2012-11-23 | 7 | -33/+129 |
| | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/SceneManager.cs | ||||
| | | * | Remove the redundant BypassPermissions() checks in EstateManagmentModule. | Justin Clark-Casey (justincc) | 2012-11-23 | 1 | -8/+13 |
| | | | | | | | | | | | | | | | | This is repeated in the PermissionsModule and checking it earlier does not allow a force override of the bypass value | ||||
| | | * | minor: Add some console feedback on region restart and log who requested a ↵ | Justin Clark-Casey (justincc) | 2012-11-23 | 2 | -1/+9 |
| | | | | | | | | | | | | | | | | region restart if done from the viewer. | ||||
| | | * | Fix problem where restarting the currently selected region would stop ↵ | Justin Clark-Casey (justincc) | 2012-11-23 | 4 | -36/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | various console commands (e.g. "show users") from working. This was because the "currently selected" scene reference was being left as the dead scene instead of the restarted Scene object. | ||||
| | | * | Add regression test for checking scene close when SceneManager is asked to close | Justin Clark-Casey (justincc) | 2012-11-23 | 1 | -0/+58 |
| | | | | |||||
| * | | | Remove duplicate registration of the help topics for the module commander | Melanie | 2012-11-23 | 1 | -5/+5 |
| |/ / | |||||
| * | | Fix a build break introduced by us having a more efficient DoubleDictionary | Melanie | 2012-11-23 | 1 | -4/+8 |
| | | | | | | | | | | | | where core has a simple list | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-11-23 | 1 | -0/+7 |
| |\ \ | | |/ |