Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-03-04 | 24 | -697/+1338 |
|\ | | | | | | | careminster | ||||
| * | Zero velocity when drag-copying | Melanie | 2012-03-04 | 1 | -0/+2 |
| | | |||||
| * | This still causes terrain artefacts | Melanie | 2012-03-02 | 1 | -3/+3 |
| | | | | | | | | | | | | Revert " fix my bug on ChODE terrain heightmap build" This reverts commit aa77d1d486f11da7dc841190f1ca85e085d0d648. | ||||
| * | This still causes terrain artefacts | Melanie | 2012-03-02 | 1 | -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. | ||||
| * | Fix and hook up llTeleportAgent | Melanie | 2012-02-28 | 3 | -1/+7 |
| | | |||||
| * | Implement llTeleportAgent | Melanie | 2012-02-28 | 1 | -0/+22 |
| | | |||||
| * | made box a little larger | UbitUmarov | 2012-02-28 | 1 | -6/+6 |
| | | |||||
| * | A few blind changes to go try to go around bad mesh little box replacement fail | UbitUmarov | 2012-02-28 | 1 | -67/+50 |
| | | |||||
| * | Really dirty hack to make sims start. Causes errors but the ting runs. Remove | Melanie | 2012-02-28 | 1 | -1/+5 |
| | | | | | | | | when fixed right. | ||||
| * | Let inworld meshs colide as such and not as basic prim all the time. ↵ | UbitUmarov | 2012-02-27 | 2 | -5/+10 |
| | | | | | | | | Removed also LOD, and outerskin on colision meshs. | ||||
| * | Merge branch 'ubitwork' | Melanie | 2012-02-27 | 4 | -568/+378 |
| |\ | |||||
| | * | update ubitODE to my current working state | UbitUmarov | 2012-02-27 | 4 | -568/+378 |
| | | | |||||
| | * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-02-27 | 10 | -41/+93 |
| | |\ | |||||
| | * \ | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-02-26 | 1 | -1/+1 |
| | |\ \ | |||||
| * | | | | Fix vehicles going physical stopping llTargetOmega parts (boat radar) | Melanie | 2012-02-27 | 1 | -3/+5 |
| | | | | | |||||
| * | | | | Fix NPC appearance setting to include attachments again | Melanie | 2012-02-27 | 1 | -1/+4 |
| | |_|/ | |/| | | |||||
| * | | | Merge branch 'ubitwork' | Melanie | 2012-02-26 | 2 | -3/+41 |
| |\ \ \ | | |/ / | |||||
| | * | | added in chODE GeomTriMeshDataDestroy to explicity release internal trimesh ↵ | UbitUmarov | 2012-02-26 | 2 | -3/+41 |
| | | | | | | | | | | | | | | | | data. | ||||
| * | | | Make llSetKeyframedMotion prims waut at the borders of down sims and try again | Melanie | 2012-02-26 | 2 | -0/+18 |
| | | | | | | | | | | | | | | | | periodically. | ||||
| * | | | Move KeyframeMotion from SOG to SOP because we can't persist it any | Melanie | 2012-02-26 | 8 | -41/+75 |
| | |/ | |/| | | | | | | | other way because SOG doesn't technically exist in the DB | ||||
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-02-26 | 0 | -0/+0 |
| |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | ||||
| | * | Implement KeyframedMotion selection behavior | Melanie | 2012-02-26 | 3 | -2/+37 |
| | | | |||||
| * | | Implement proper selection behavior | Melanie | 2012-02-26 | 3 | -2/+37 |
| |/ | |||||
| * | Fix deserialization of Buoyancy, Force and Torque. Remove debug from the new | Melanie | 2012-02-26 | 5 | -11/+9 |
| | | | | | | | | code. | ||||
| * | Fix an infinite recursion caused by checking the wrong values for | Melanie | 2012-02-26 | 1 | -24/+27 |
| | | | | | | | | Buoyancy, Force and Torque | ||||
| * | Serialize Keyframe motion for region crossings | Melanie | 2012-02-26 | 4 | -4/+96 |
| | | |||||
| * | Zero force and torque on take so that items don't run away when rezzed | Melanie | 2012-02-26 | 1 | -0/+2 |
| | | |||||
| * | Merge branch 'ubitwork' | Melanie | 2012-02-26 | 3 | -35/+98 |
| |\ | |||||
| | * | changed SOP Force and Torque, adding XML (de/)serialization, also changed ↵ | UbitUmarov | 2012-02-25 | 3 | -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 ubitwork | UbitUmarov | 2012-02-25 | 2 | -8/+12 |
| | |\ | |||||
| | * \ | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-02-24 | 2 | -1/+12 |
| | |\ \ | |||||
| * | | | | Implement llSetKeyframedMotion. No persistence, no region crossing. Yet. | Melanie | 2012-02-26 | 9 | -2/+493 |
| | |_|/ | |/| | | |||||
| * | | | Delay the sending of the initial werables update until the inventory and | Melanie | 2012-02-25 | 2 | -8/+12 |
| | | | | | | | | | | | | | | | | | | | | VFS in the viewer are ready. We're much faster than SL and that exposes this race condition. Also reinstate the extra avatar data send on login | ||||
| * | | | Merge branch 'ubitwork' | Melanie | 2012-02-24 | 1 | -5/+21 |
| |\ \ \ | | |/ / | | | / | | |/ | |/| | |||||
| | * | replace bad meshs by a small cube and log it. | UbitUmarov | 2012-02-24 | 1 | -5/+21 |
| | | | |||||
| * | | Try not to send the avatar updates on login. This may mean loggin in with | Melanie | 2012-02-24 | 1 | -1/+2 |
| | | | | | | | | | | | | invisible attachments again but could help the appearance issues. | ||||
| * | | Add a cache on GridService requests | Melanie | 2012-02-24 | 1 | -0/+10 |
| |/ | |||||
| * | stop using useless geom tricallback. | UbitUmarov | 2012-02-24 | 1 | -1/+2 |
| | | |||||
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-02-24 | 4 | -11/+33 |
| |\ | |||||
| | * | Prevent a nullref when nonphysical motion objects cross sim boundaries | Melanie | 2012-02-23 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-02-23 | 2 | -6/+9 |
| | |\ | |||||
| | * | | Correct sit position calculations | Melanie | 2012-02-23 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-02-23 | 1 | -5/+31 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-03-04 | 6 | -4/+53 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | ||||
| * | | | | | Add WebProfiles config to other config example | BlueWall | 2012-03-04 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' of /home/opensim/var/repo/opensim into v3_support | BlueWall | 2012-03-04 | 2 | -8/+3 |
| |\ \ \ \ \ | |||||
| | * | | | | | comment out "[CAPS]: ScriptTaskInventory Request" log spam | Justin Clark-Casey (justincc) | 2012-03-02 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | OpenID auth needs hashing before authenticating | BlueWall | 2012-03-02 | 2 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into v3_support | BlueWall | 2012-03-02 | 28 | -317/+275 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of /home/opensim/src/opensim into v3_support | BlueWall | 2012-02-29 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ |