aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager/PhysicsScene.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-08-071-1/+2
|\
| * BulletSim: add implementation of 'physSetLinksetType' and 'physGetLinksetType'Robert Adams2013-08-021-1/+2
* | Merge branch 'master' into careminsterMelanie2013-07-241-0/+9
|\ \ | |/
| * Revert "Revert "Add experimental stubs for an extension function interface on...Robert Adams2013-07-231-0/+9
| * Revert "Add experimental stubs for an extension function interface on both"Robert Adams2013-07-221-9/+0
| * Add experimental stubs for an extension function interface on bothRobert Adams2013-07-221-0/+9
| * Add some more code from Avination. This changes physics actor stuff aroundMelanie2013-02-071-0/+6
* | Merge branch 'master' into careminsterMelanie2013-02-041-2/+2
|\ \ | |/
| * Correct spelling mistake in new RayFilterFlags, LSLPhanton -> LSLPhantomJustin Clark-Casey (justincc)2013-02-021-2/+2
| * Add the Avination physics raycast glue so Core Physics can implement raycastMelanie2013-01-231-0/+39
* | Merge branch 'avination' into careminsterMelanie2013-01-241-1/+1
|\ \
| * | Fix a type (Suports => Supports). Also put the normal terrain collision checkMelanie2013-01-231-1/+1
* | | Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminsterMelanie2013-01-161-2/+9
|\ \ \ | |/ / |/| / | |/
| * BulletSim: add osGetPhysicsEngineType() LSL function and updateRobert Adams2013-01-111-2/+9
| * missing changed fileUbitUmarov2012-10-181-1/+1
* | *TEST* avatar unscripted sit. Some guessing/automationUbitUmarov2013-01-021-2/+19
* | fixUbitUmarov2012-12-181-1/+1
* | *TESTP unscripted sit: missing filesUbitUmarov2012-12-171-0/+5
* | fix let other phys plugins work.. broken when added feetOffsetUbitUmarov2012-12-111-8/+2
* | create a new ode character also with the new informationUbitUmarov2012-12-071-2/+16
* | move terrain geom to own ode space. Limit range on raycast if includesUbitUmarov2012-10-091-0/+3
* | missing changed fileUbitUmarov2012-10-031-1/+1
* | Merge branch 'master' into careminsterMelanie2012-08-011-0/+5
|\ \ | |/
| * Create the ability for physics modules to request assets on demand byMelanie2012-08-011-0/+5
* | Merge branch 'master' into careminsterMelanie2012-05-311-0/+14
|\ \ | |/
| * Add an optional mechanism for physics modules to collect and return arbitrary...Justin Clark-Casey (justincc)2012-05-311-0/+14
* | ubitODE + physmanager: - Revised use of ODE collisions categories and bits(fl...UbitUmarov2012-04-161-0/+40
* | Tell physics about physics shape when creating. Added some virtual methods to...UbitUmarov2012-03-211-0/+7
* | initial steps to support physical phantomsUbitUmarov2012-03-111-3/+6
* | Added simple binary serializer/deserializer to chODE. 100% untested and most ...UbitUmarov2012-02-171-0/+6
* | changes in physics manager, needed for UbitODEUbitUmarov2012-02-081-1/+9
* | Merge branch 'master' into bigmergeMelanie2011-11-281-1/+1
|\ \ | |/
| * remove some mono compiler warningsJustin Clark-Casey (justincc)2011-11-251-1/+1
* | Merge branch 'master' into bigmergeMelanie2011-11-241-8/+2
|\ \ | |/
| * Comment out uncalled OdeScene.UnCombine()Justin Clark-Casey (justincc)2011-11-221-8/+2
* | Merge commit '03202ada2918c0c0837e8de50e3a0436e4407c91' into bigmergeMelanie2011-10-251-0/+5
|\ \ | |/
| * Store scene identifier passed in to OdeScene for later debug messagesJustin Clark-Casey (justincc)2011-10-181-0/+5
* | Merge commit 'f2132329a358db2c66c29501d35ef54eae8d6eed' into bigmergeMelanie2011-10-251-1/+0
|\ \ | |/
| * refactor: make methods that do not need to be public in ODE private or intern...Justin Clark-Casey (justincc)2011-10-151-1/+0
* | Merge commit '77c65951e06c1d309f2bc8f6d2451b2b9a82c9df' into bigmergeMelanie2011-10-251-88/+4
|\ \ | |/
| * Extract NullPhysicsScene from PhysicsScene to improve code readabilityJustin Clark-Casey (justincc)2011-10-141-88/+4
* | Merge commit '227db07f2ff8a1ba840a0d3018bb242a34d6038f' into bigmergeMelanie2011-10-251-1/+22
|\ \ | |/
| * refactor: move 3x copy/pasted ode structure removal code in ODECharacter into...Justin Clark-Casey (justincc)2011-10-131-1/+22
* | Resolve merge commits, stage 1Tom2011-09-041-12/+27
|\ \ | |/
| * refactor: centralize prim geom removal code from four places to oneJustin Clark-Casey (justincc)2011-08-011-0/+4
| * Removed unused AddPrimShape methods in PhysicsScene caused by merge conflictsDan Lake2011-07-201-14/+0
| * Fix some local id issues in physics glueroot2011-07-151-12/+7
| * Port implementation of llCastRay() from Aurora.Justin Clark-Casey (justincc)2011-07-121-1/+23
* | Fox some local id issues in physics glueMelanie2011-07-151-12/+7
* | Revert "Add localid support to ch0de properly"Melanie2011-07-151-7/+12