aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Removed some whitespace errors - don't be naughty, don't use hard tabs!Melanie2012-03-061-11/+0
| | | | Also removed commented code block.
* make copied parts have diferent LocalIds than original. More building ↵UbitUmarov2012-03-062-5/+74
| | | | control for ubitODE. for all let physics know about linking of physical parts. Assume UNTESTED
* Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-063-7/+27
|\
| * Allow NPC to be removed by the owner of the parcel they're over.Melanie2012-03-051-2/+9
| | | | | | | | Don't allow NPC creation unless the prim owner has rez rights.
| * Teleport users to the cornfield when they are teleported withMelanie2012-03-051-3/+13
| | | | | | | | llTeleportAgentHome(). Don't try to teleport NPCs.
| * llListSort SL compatibility: When sorting strided list and the listMelanie2012-03-051-2/+5
| | | | | | | | | | | | length is not a multiple of the stride, return the original list. Also, enforce that sort is ascending only when the ascending parameter is 1, and not when it is != 0
* | update ubitOdeUbitUmarov2012-03-054-78/+297
| |
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-052-3/+15
|\ \ | |/
| * SL compatibility - return only points on segemtn, not ray in llCastRayMelanie2012-03-051-0/+5
| |
| * A stab at making llEjectFromLand work in all casesMelanie2012-03-051-3/+10
| |
* | update UbitOdeUbitUmarov2012-03-045-65/+69
| |
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-041-0/+2
|\ \ | |/
| * Zero velocity when drag-copyingMelanie2012-03-041-0/+2
| |
* | update UbitODEUbitUmarov2012-03-043-36/+55
| |
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-031-5/+3
|\ \ | |/
| * This still causes terrain artefactsMelanie2012-03-021-3/+3
| | | | | | | | | | | | Revert " fix my bug on ChODE terrain heightmap build" This reverts commit aa77d1d486f11da7dc841190f1ca85e085d0d648.
| * This still causes terrain artefactsMelanie2012-03-021-3/+1
| | | | | | | | | | | | Revert " fix the last fix. Regions are square but... Also remove the 0.5 offset in map position. It was apparently needed to fix we having nsamples = size and not size + 1." This reverts commit 15bc539bd49e7a09c1ec6e539871cde5eee6032e.
* | update ubitODEUbitUmarov2012-03-021-15/+45
| |
* | ubitODE bug fixUbitUmarov2012-02-291-1/+1
| |
* | update ubitODE to current working stateUbitUmarov2012-02-292-113/+199
| |
* | fixUbitUmarov2012-02-291-1/+3
| |
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-293-0/+28
|\ \ | |/
| * Fix and hook up llTeleportAgentMelanie2012-02-283-1/+7
| |
| * Implement llTeleportAgentMelanie2012-02-281-0/+22
| |
* | chODE: bad meshs get a a basic box or sphere geom with setted prim size. ↵UbitUmarov2012-02-292-503/+148
|/ | | | They will not colide if non-physical and Will collide with land if physical. assume UNTESTED
* made box a little largerUbitUmarov2012-02-281-6/+6
|
* A few blind changes to go try to go around bad mesh little box replacement failUbitUmarov2012-02-281-67/+50
|
* Really dirty hack to make sims start. Causes errors but the ting runs. RemoveMelanie2012-02-281-1/+5
| | | | when fixed right.
* Let inworld meshs colide as such and not as basic prim all the time. ↵UbitUmarov2012-02-272-5/+10
| | | | Removed also LOD, and outerskin on colision meshs.
* Merge branch 'ubitwork'Melanie2012-02-274-568/+378
|\
| * update ubitODE to my current working stateUbitUmarov2012-02-274-568/+378
| |
| * Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-2710-41/+93
| |\
| * \ Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-261-1/+1
| |\ \
* | | | Fix vehicles going physical stopping llTargetOmega parts (boat radar)Melanie2012-02-271-3/+5
| | | |
* | | | Fix NPC appearance setting to include attachments againMelanie2012-02-271-1/+4
| |_|/ |/| |
* | | Merge branch 'ubitwork'Melanie2012-02-262-3/+41
|\ \ \ | |/ /
| * | added in chODE GeomTriMeshDataDestroy to explicity release internal trimesh ↵UbitUmarov2012-02-262-3/+41
| | | | | | | | | | | | data.
* | | Make llSetKeyframedMotion prims waut at the borders of down sims and try againMelanie2012-02-262-0/+18
| | | | | | | | | | | | periodically.
* | | Move KeyframeMotion from SOG to SOP because we can't persist it anyMelanie2012-02-268-41/+75
| |/ |/| | | | | other way because SOG doesn't technically exist in the DB
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-260-0/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
| * Implement KeyframedMotion selection behaviorMelanie2012-02-263-2/+37
| |
* | Implement proper selection behaviorMelanie2012-02-263-2/+37
|/
* Fix deserialization of Buoyancy, Force and Torque. Remove debug from the newMelanie2012-02-265-11/+9
| | | | code.
* Fix an infinite recursion caused by checking the wrong values forMelanie2012-02-261-24/+27
| | | | Buoyancy, Force and Torque
* Serialize Keyframe motion for region crossingsMelanie2012-02-264-4/+96
|
* Zero force and torque on take so that items don't run away when rezzedMelanie2012-02-261-0/+2
|
* Merge branch 'ubitwork'Melanie2012-02-263-35/+98
|\
| * changed SOP Force and Torque, adding XML (de/)serialization, also changed ↵UbitUmarov2012-02-253-35/+98
| | | | | | | | Buoyance. PLEASE trap deserialization from inventory etc, making force and torque vector3.Zero, unless we want then to rez moving. (needs checking/testing as usual)
| * Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-252-8/+12
| |\
| * \ Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-242-1/+12
| |\ \