aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* make sittarget camera relative to root primUbitUmarov2014-07-201-17/+18
| | | | Please enter the commit message for your changes. Lines starting
* another change to standupUbitUmarov2014-07-201-1/+1
|
* change avatar standup codeUbitUmarov2014-07-201-28/+25
|
* remove avn hack on sitted avatars positionsUbitUmarov2014-07-201-27/+3
|
* physicsSit SendSitResponse also relative to parent primUbitUmarov2014-07-201-5/+11
|
* fix physics sit for physical child primsUbitUmarov2014-07-201-4/+4
|
* physics engine cannot change internal positions of linksets, at least notUbitUmarov2014-07-201-2/+2
| | | | in teaseupdates
* Merge branch 'ubitworkmaster'Melanie Thielker2014-07-205-13/+11
|\
| * replace old Attachoffset by AttachedPos. Comented out possible mergeUbitUmarov2014-07-205-13/+11
| | | | | | | | artifacts
* | Fix duplicate attach message being sent to objects picked up from the groundMelanie Thielker2014-07-201-1/+4
|/
* Fix coalesced objects not showing up as "piles" of prims (AVN only bug)Melanie Thielker2014-07-201-4/+4
|
* Fix taking objectsMelanie Thielker2014-07-191-1/+1
|
* Merge branch 'avination-current'Melanie Thielker2014-07-1918-1516/+700
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
| * revert to capsule representation of avatar colliderUbitUmarov2014-07-191-297/+28
| |
| * 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 ↵UbitUmarov2014-07-1621-91/+256
| | |\ | | | | | | | | | | | | into avination-current
| | * \ Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster ↵UbitUmarov2013-09-1936-381/+698
| | |\ \ | | | | | | | | | | | | | | | into avination-current
| * | \ \ Merge branch 'avination-current' into ubitworkUbitUmarov2013-06-083-320/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster ↵UbitUmarov2013-06-083-320/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | into avination-current
| * | | | | add indexes for new visual parameters shape_hover andUbitUmarov2013-06-071-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | APPEARANCEMESSAGE_VERSION. For reference only, this aren't used in sim for now
| * | | | | try to suspend and resume keyframes on copy to inventory to take copyUbitUmarov2013-06-061-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | doesn't destroy state
| * | | | | 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-063-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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | efect on all prims.
| * | | | | | let gravity modifier, friction, restitution and density changes be appliedUbitUmarov2013-05-292-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 notUbitUmarov2013-05-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | default cmf
| * | | | | | missing fileUbitUmarov2013-05-291-0/+5
| | | | | | |
| * | | | | | missing filesUbitUmarov2013-05-292-5/+6
| | | | | | |
| * | | | | | *** DANGER TESTING **** changed prims mesh generation hopefully removingUbitUmarov2013-05-299-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 attachmentsUbitUmarov2014-07-191-7/+9
| | | | | | |
* | | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie Thielker2014-06-21577-18116/+55262
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2014-01-2854-1518/+1993
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-284-24/+75
| | |\ \ \ \ \ \ \
| | | * | | | | | | Added osGetRegionSize(), which returns the region size in meters and ↵Oren Hurvitz2014-01-283-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recognizes megaregions
| | | * | | | | | | Convert tabs to spaces from previous commit 8c2b41b01Justin Clark-Casey (justincc)2014-01-281-27/+27
| | | | | | | | | |
| | | * | | | | | | Make inidirectory files supercede distro filesDev Random2014-01-271-27/+49
| | | | | | | | | |
| | * | | | | | | | Reinsert attachments list taking code in SP.MakeRootAgent()Justin Clark-Casey (justincc)2014-01-271-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-271-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | occur no matter which branch of the conditional is executed
| | * | | | | | | | Re-enabled NPCModuleTests.TestCreate()Justin Clark-Casey (justincc)2014-01-271-3/+1
| | | | | | | | | |
| | * | | | | | | | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-241-21/+19
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | minor: remove long unused state queue from "show queues" console reportsJustin Clark-Casey (justincc)2014-01-241-5/+3
| | | | | | | | | |
| | | * | | | | | | minor: correct the usage statement on the "show image queues" console ↵Justin Clark-Casey (justincc)2014-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | command - should not have been "image queues show"
| | | * | | | | | | Skip IClientAPIs that don't implement IStatsCollector (such as NPCAvatar) ↵Justin Clark-Casey (justincc)2014-01-241-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from the "show queues" console report to stop screwing up formatting. "show pquques" already did this
| | * | | | | | | | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-244-320/+362
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /