| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge commit '62a63f834b7cc056ee37c396034d0e268f66b4a8' into bigmerge | Melanie | 2011-10-25 | 1 | -5/+3 |
|\ |
|
| * | refactor: Use SOP.SitTargetAvatar instead of calling a special GetAvatarOnSit... | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -5/+3 |
* | | Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge | Melanie | 2011-10-25 | 1 | -3/+1 |
|\ \
| |/ |
|
| * | Implement osNpcSit(). This is still in development so don't trust it | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -2/+0 |
* | | Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge | Melanie | 2011-10-25 | 1 | -33/+8 |
|\ \
| |/ |
|
| * | fetch physical_prim switch from [Startup] config from inside scene, as is don... | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -34/+8 |
* | | Merge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmerge | Melanie | 2011-10-25 | 1 | -4/+4 |
|\ \
| |/ |
|
| * | remove now redundant m_physical_prim flag from SOP.ApplyPhysics() | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -4/+4 |
* | | Merge commit '3843efe478ed682fd08bf12ea8bd7377c68a36fb' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+6 |
|\ \
| |/ |
|
| * | Restore [Startup] physical_prim flag which can stop any prims being subject t... | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -1/+6 |
* | | Merge commit 'f2889d7ce97a01086dc7fc0690865a1eae452364' into bigmerge | Melanie | 2011-10-25 | 1 | -4/+0 |
|\ \
| |/ |
|
| * | remove redundant PhysActor.IsPhysical call from SOP.UpdatePrimFlags() as its ... | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -4/+0 |
* | | Merge commit '732e9373795a35ed1965bbb93a02117fcf0a8c3e' into bigmerge | Melanie | 2011-10-25 | 1 | -27/+21 |
|\ \
| |/ |
|
| * | refactor: Remove redundant code in SOP.UpdatePrimFlags() | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -27/+21 |
* | | Merge commit 'c93c9ea072f319125f466c913f5f4fe1f6864045' into bigmerge | Melanie | 2011-10-25 | 1 | -5/+17 |
|\ \
| |/ |
|
| * | factor common code out into SOP.RemoveFromPhysics() | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -5/+17 |
* | | Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+2 |
|\ \
| |/ |
|
| * | refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it s... | Justin Clark-Casey (justincc) | 2011-10-14 | 1 | -2/+2 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+7 |
|\ \
| |/ |
|
| * | Start recording object updates per second statistic (analogue of agent update... | Justin Clark-Casey (justincc) | 2011-10-11 | 1 | -1/+7 |
* | | Merge commit '56dbab35e122e724c9277b05820417a05ad8a1be' into bigmerge | Melanie | 2011-10-11 | 1 | -4/+0 |
|\ \
| |/ |
|
| * | Remove unimplementated UpdateMovement() methods from SOG, SOP. | Justin Clark-Casey (justincc) | 2011-10-01 | 1 | -4/+0 |
* | | Merge commit '2b2580e3a12d5c493f9a77bf9435ca32a0a0355c' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+6 |
|\ \
| |/ |
|
| * | Fix for rezzing and derezzing HUDs (see Mantis #5406). From now on updates ar... | Snoopy Pfeffer | 2011-09-25 | 1 | -1/+6 |
* | | Merge commit 'bec0cbe82b0de1b5fa8e214a0cc59d0db1f25959' into bigmerge | Melanie | 2011-10-11 | 1 | -14/+0 |
|\ \
| |/ |
|
| * | remove unused SOP.Create() method | Justin Clark-Casey (justincc) | 2011-09-23 | 1 | -14/+0 |
* | | Merge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
|\ \
| |/ |
|
* | | Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge | Melanie | 2011-10-11 | 1 | -14/+26 |
|\ \
| |/ |
|
| * | refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to refle... | Justin Clark-Casey (justincc) | 2011-09-15 | 1 | -14/+18 |
* | | Merge fixes, and fix the build | Tom | 2011-09-14 | 1 | -0/+8 |
* | | First set of merge fixes | Tom | 2011-09-07 | 1 | -37/+26 |
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -455/+497 |
|\ \
| |/ |
|
| * | stop passing FromUserInventoryItemID right down into the deserializer. | Justin Clark-Casey (justincc) | 2011-09-02 | 1 | -13/+2 |
| * | Move more of IAM.RezObject() into DoPreRezWhenFromItem() | Justin Clark-Casey (justincc) | 2011-09-02 | 1 | -3/+2 |
| * | refactor: use SOG register target waypoints and rots directly instead of call... | Justin Clark-Casey (justincc) | 2011-09-01 | 1 | -20/+0 |
| * | refactor: use ParentGroup.UUID directly instead of SOP.GetRootPartUUID() | Justin Clark-Casey (justincc) | 2011-09-01 | 1 | -17/+6 |
| * | Fix issue with llGetTorque() where it would only ever return a zero vector. | Justin Clark-Casey (justincc) | 2011-09-01 | 1 | -9/+0 |
| * | Remove pointless cluttering SOP.ParentGroup != null checks. | Justin Clark-Casey (justincc) | 2011-09-01 | 1 | -169/+113 |
| * | refactor: move SOP.IsAttachment and AttachmentPoint up into SOG to avoid poin... | Justin Clark-Casey (justincc) | 2011-08-27 | 1 | -35/+11 |
| * | refactor: simplify SOP.AttachedAvatar into SOG.AttachedAvatar | Justin Clark-Casey (justincc) | 2011-08-26 | 1 | -4/+1 |
| * | Fix exception when using BasicPhysics | Robert Adams | 2011-08-19 | 1 | -2/+2 |
| * | extend phantom flag regression test to toggle back off | Justin Clark-Casey (justincc) | 2011-08-06 | 1 | -0/+3 |
| * | refactor: Fold most SOP.ScriptSet* methods back into script code. Simplify. | Justin Clark-Casey (justincc) | 2011-08-06 | 1 | -25/+0 |
| * | Add regression test for setting phantom status on a scene object. This is no... | Justin Clark-Casey (justincc) | 2011-08-05 | 1 | -4/+3 |
| * | Comment out SOP logging message I accidentally left in | Justin Clark-Casey (justincc) | 2011-07-31 | 1 | -1/+1 |
| * | refactor: split out ninja joint part of SOP.DoPhysicsPropertyUpdate() so that... | Justin Clark-Casey (justincc) | 2011-07-31 | 1 | -71/+86 |
| * | minor: Add method doc to collision subscription methods. Change method case ... | Justin Clark-Casey (justincc) | 2011-07-30 | 1 | -1/+0 |
| * | Fix problem where sculpts were not getting physical proxies | Justin Clark-Casey (justincc) | 2011-07-22 | 1 | -2/+2 |
| * | Tidy up a superfluous AddPrimShape override in PhysicsScene | Careminster Team | 2011-07-19 | 1 | -1/+0 |
| * | On all undo/redo operations, consistently lock the undo object for everything... | Justin Clark-Casey (justincc) | 2011-07-19 | 1 | -5/+1 |