| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | change ava to ava collisions a bit | UbitUmarov | 2014-07-21 | 1 | -30/+42 |
| | | |||||
| * | bug fix | UbitUmarov | 2014-07-21 | 1 | -4/+5 |
| | | |||||
| * | Remove extremely spammy error message that isn't an actual error - user | Melanie Thielker | 2014-07-20 | 1 | -5/+5 |
| | | | | | | ids queried may not exist, since LSL can use this as well, with arbitrary ids | ||||
| * | Remove some already commented lines | Melanie Thielker | 2014-07-20 | 1 | -11/+0 |
| | | |||||
| * | Fix LSL portions of sit positioning | Melanie Thielker | 2014-07-20 | 1 | -36/+12 |
| | | |||||
| * | make sittarget camera relative to root prim | UbitUmarov | 2014-07-20 | 1 | -17/+18 |
| | | | | | Please enter the commit message for your changes. Lines starting | ||||
| * | another change to standup | UbitUmarov | 2014-07-20 | 1 | -1/+1 |
| | | |||||
| * | change avatar standup code | UbitUmarov | 2014-07-20 | 1 | -28/+25 |
| | | |||||
| * | remove avn hack on sitted avatars positions | UbitUmarov | 2014-07-20 | 1 | -27/+3 |
| | | |||||
| * | physicsSit SendSitResponse also relative to parent prim | UbitUmarov | 2014-07-20 | 1 | -5/+11 |
| | | |||||
| * | fix physics sit for physical child prims | UbitUmarov | 2014-07-20 | 1 | -4/+4 |
| | | |||||
| * | physics engine cannot change internal positions of linksets, at least not | UbitUmarov | 2014-07-20 | 1 | -2/+2 |
| | | | | | in teaseupdates | ||||
| * | Merge branch 'ubitworkmaster' | Melanie Thielker | 2014-07-20 | 5 | -13/+11 |
| |\ | |||||
| | * | replace old Attachoffset by AttachedPos. Comented out possible merge | UbitUmarov | 2014-07-20 | 5 | -13/+11 |
| | | | | | | | | | artifacts | ||||
| * | | Fix duplicate attach message being sent to objects picked up from the ground | Melanie Thielker | 2014-07-20 | 1 | -1/+4 |
| |/ | |||||
| * | Fix coalesced objects not showing up as "piles" of prims (AVN only bug) | Melanie Thielker | 2014-07-20 | 1 | -4/+4 |
| | | |||||
| * | Fix taking objects | Melanie Thielker | 2014-07-19 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'avination-current' | Melanie Thielker | 2014-07-19 | 17 | -1515/+694 |
| |\ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | ||||
| | * | revert to capsule representation of avatar collider | UbitUmarov | 2014-07-19 | 1 | -297/+28 |
| | | | |||||
| | * | reduce avatar hover in basic ode plugin | UbitUmarov | 2014-07-18 | 1 | -1/+1 |
| | | | |||||
| | * | fix Xengine script instance load | UbitUmarov | 2014-07-18 | 1 | -7/+6 |
| | | | |||||
| | * | Merge branch 'avination-current' into ubitwork | UbitUmarov | 2014-07-16 | 28 | -163/+297 |
| | |\ | |||||
| | | * | Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster ↵ | UbitUmarov | 2014-07-16 | 13 | -70/+132 |
| | | |\ | | | | | | | | | | | | | into avination-current | ||||
| | | * \ | Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster ↵ | UbitUmarov | 2013-09-19 | 19 | -93/+165 |
| | | |\ \ | | | | | | | | | | | | | | | | into avination-current | ||||
| | * | \ \ | Merge branch 'avination-current' into ubitwork | UbitUmarov | 2013-06-08 | 1 | -1/+1 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster ↵ | UbitUmarov | 2013-06-08 | 1 | -1/+1 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | into avination-current | ||||
| | * | | | | | try to suspend and resume keyframes on copy to inventory to take copy | UbitUmarov | 2013-06-06 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | doesn't destroy state | ||||
| | * | | | | | Merge branch 'avination-current' into ubitwork | UbitUmarov | 2013-06-06 | 1 | -15/+64 |
| | |\ \ \ \ \ | | |/ / / / | |||||
| | | * | | | | keyframe: add more locks, change timming stop, added Suspend and resume | UbitUmarov | 2013-06-06 | 1 | -15/+64 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'avination-current' into ubitwork | UbitUmarov | 2013-06-06 | 3 | -18/+43 |
| | |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | | Merge branch 'avination-current' into ubitwork | UbitUmarov | 2013-05-31 | 2 | -5/+5 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | retouch prim stopped condition test | UbitUmarov | 2013-05-29 | 1 | -3/+3 |
| | | | | | | | | |||||
| | * | | | | | | removed spurius ref to ode.dll from odeapi | UbitUmarov | 2013-05-29 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | correction to previus comment: all parameters but gravity modifier have | UbitUmarov | 2013-05-29 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | efect on all prims. | ||||
| | * | | | | | | let gravity modifier, friction, restitution and density changes be applied | UbitUmarov | 2013-05-29 | 2 | -6/+65 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to prim. Only have efect on root prim. Density doesn't get effect imediatly, only on next change of size or shape. density change implies a full body rebuild to be done later, after reducing the number of sets sop does. Other parameters should work. **** mainly untested *** | ||||
| | * | | | | | | make sure friction slip parameters are zero ( or other value ) and not | UbitUmarov | 2013-05-29 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default cmf | ||||
| | * | | | | | | missing file | UbitUmarov | 2013-05-29 | 1 | -0/+5 |
| | | | | | | | | |||||
| | * | | | | | | missing files | UbitUmarov | 2013-05-29 | 2 | -5/+6 |
| | | | | | | | | |||||
| | * | | | | | | *** DANGER TESTING **** changed prims mesh generation hopefully removing | UbitUmarov | 2013-05-29 | 9 | -1178/+503 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spurius faces. CHanged several aspects. Fixed prims inertia that was too low, still using box as model. Increased number of quickstep SOR iterations to 15. Keep it 15 even on heavy load ( will only jump simulation time). | ||||
| * | | | | | | | fix attachments | UbitUmarov | 2014-07-19 | 1 | -7/+9 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie Thielker | 2014-06-21 | 271 | -15605/+31206 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | ||||
| | * \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2014-01-28 | 40 | -1474/+1840 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Interfaces/IInterregionComms.cs OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs | ||||
| | | * \ \ \ \ \ \ | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-28 | 4 | -24/+75 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | Added osGetRegionSize(), which returns the region size in meters and ↵ | Oren Hurvitz | 2014-01-28 | 3 | -0/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recognizes megaregions | ||||
| | | | * | | | | | | | Convert tabs to spaces from previous commit 8c2b41b01 | Justin Clark-Casey (justincc) | 2014-01-28 | 1 | -27/+27 |
| | | | | | | | | | | | |||||
| | | | * | | | | | | | Make inidirectory files supercede distro files | Dev Random | 2014-01-27 | 1 | -27/+49 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Reinsert attachments list taking code in SP.MakeRootAgent() | Justin Clark-Casey (justincc) | 2014-01-27 | 1 | -14/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Locking attachments then launching script instances on a separate thread will not work, attachments will simply be unlocked and vulnerable to race conditions. | ||||
| | | * | | | | | | | | refactor: Remove identical part.ParentGroup.AddAvatar(UUID); calls which ↵ | Justin Clark-Casey (justincc) | 2014-01-27 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | occur no matter which branch of the conditional is executed | ||||
| | | * | | | | | | | | Re-enabled NPCModuleTests.TestCreate() | Justin Clark-Casey (justincc) | 2014-01-27 | 1 | -3/+1 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-24 | 1 | -21/+19 |
| | | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |