aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-12-0416-305/+768
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
| * Bug fix in OfflineMessageModule. Mantis #6446Diva Canto2012-12-041-1/+1
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-12-0418-322/+724
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-12-0314-287/+578
| | |\
| | | * BulletSim: Reduce idle region physics overhead where there are MANYRobert Adams2012-12-037-80/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | static objects by more restrictive selection of objects that collide with static objects. Rename collision mask fuctions from 'filter' to 'group' so it is clear what is being set. Rename BulletSimAPI.SetCollisionFilterMask() to SetCollisionGroupMask to match above. Restore passing of time step to linear and angular motion component routines. Use buffering vehicle physical parameter get/set routines consistantly. Make range enforcement clearer by using ClampInRange() function for parameter setting. Remove commented out experimental vehicle calculations.
| | | * BulletSim: rework angular corrections to remove any hybrid code and compute ↵Robert Adams2012-12-034-111/+115
| | | | | | | | | | | | | | | | absolute collections.
| | | * BulletSim: add stubs for generalization of preStep actions. Will eventually ↵Robert Adams2012-12-032-3/+22
| | | | | | | | | | | | | | | | replace the specialized vehicle processing with preStep event processing. Add TODO comments about this feature. Redo line endings in TODO file to be all Linux.
| | | * BulletSim: begin tracking a TODO list. There just are so many things to ↵Robert Adams2012-12-031-0/+112
| | | | | | | | | | | | | | | | remember to do.
| | | * BulletSim: revert angular vertical attraction from motor to code. The motor ↵Robert Adams2012-12-031-47/+19
| | | | | | | | | | | | | | | | code did not return the restoring difference but the current value. Remove unused commented out code.
| | | * BulletSim: format vehicle detail logging messages so vehicle changs are ↵Robert Adams2012-12-032-17/+17
| | | | | | | | | | | | | | | | grouped better in the log output.
| | | * BulletSim: localize vehicle property setting so the vehicle prim is only ↵Robert Adams2012-12-031-33/+128
| | | | | | | | | | | | | | | | updated at the end of the vehicle simulation step and the push of the physics property update event only happens if the properties are actually changed.
| | | * BulletSim: Add DumpActivationInfo2 function. Change static objects from ↵Robert Adams2012-12-014-10/+15
| | | | | | | | | | | | | | | | DISABLE_SIMULATION to ISLAND_SLEEPING. Update DLLs and SOs to add DumpActivationInfo2 function.
| | | * BulletSim: remove time scaling of computed vehicle absolute velocity since ↵Robert Adams2012-11-293-48/+73
| | | | | | | | | | | | | | | | Bullet will scale the movement by the time slice. Restore LIMIT_MOTOR_UP to definitition of BOAT simce some vehicle engines use it even for land vehicles. Push vehicle parameter updates through the regular property update to solve vehicles floating off when they should be stopped.
| | | * BulletSim: add copyright header where it is missing. Remove some unnecessary ↵Robert Adams2012-11-292-3/+31
| | | | | | | | | | | | | | | | 'using' requirements so testing framework is less complicated.
| | * | XmlRpcGridRouterBlueWall2012-12-034-19/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flesh out XmlRpcGridRouter to reap unused channels from gateway when scripts or objects are removed, or when the llCloseRemoteDataChannel is called. See: http://http://forge.opensimulator.org/gf/project/xmlrpcrouter/ or https://github.com/BlueWall/XmlRpcRouter for php gateway and test code.
| * | | Improvement in HGInstantMessageService: account for the existence of an ↵Diva Canto2012-12-042-10/+140
| | | | | | | | | | | | | | | | offline IM service.
* | | | Merge branch 'master' into careminsterMelanie2012-11-308-29/+44
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Physics/Manager/IMesher.cs
| * | | BulletSim: add expanded call to IMesher/Meshmerizer which enables/disables ↵Robert Adams2012-11-294-10/+26
| | | | | | | | | | | | | | | | mesh caching. Since BulletSim caches and tracks the unmanaged memory version of meshes, the Meshmerizer itself does not need to cache built meshes once BulletSim has made the physical proxy mesh.
| * | | BulletSim: reverse direction of hover correction. Removes problem with ↵Robert Adams2012-11-291-8/+8
| | |/ | |/| | | | | | | vehicles being orbited.
* | | Merge branch 'master' into careminsterMelanie2012-11-3016-534/+950
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Physics/Meshing/Meshmerizer.cs
| * | BulletSim: fix boats floating low by removing LIMIT_MOTOR_UP flag from ↵Robert Adams2012-11-281-3/+15
| | | | | | | | | | | | TYPE_BOAT definition.
| * | BulletSim: move GetWaterLevelAtXYZ from BSScene to BSPhysTerrain.Robert Adams2012-11-287-22/+63
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-11-273-4/+66
| |\
| | * Stop logging spurious asset data for {0} is zero length error for sculpts/meshJustin Clark-Casey (justincc)2012-11-282-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | ODEPrim, for instance, always hits this code path twice at the moment Firstly before any sculpt data has been loaded (hence the spurious message) Secondly when any sculpt data has been loaded or failed to load (when the message would be valid). Hence comment this out and rely on the message in ODEPrim.MeshAssetReceived() instead (though this is not ideal since it requires all physics plugins to copy/paste similar code).
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-11-284-205/+296
| | |\
| | * | Show many more primitive properties on console command "show part name/id/pos"Justin Clark-Casey (justincc)2012-11-281-3/+57
| | | |
| * | | Bug fix in Offline IM for inventory transfers. The items were being placed ↵Diva Canto2012-11-271-11/+15
| | |/ | |/| | | | | | | twice in the receiver's inventory.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-11-27120-2727/+3739
| |\ \
| | * | BulletSim: reorganize linear movement routine into separate subroutines ↵Robert Adams2012-11-271-58/+79
| | | | | | | | | | | | | | | | enabling external calibration routines and unit tests.
| | * | BulletSim: fix terrain mesh generation for problem with regions that have ↵Robert Adams2012-11-271-6/+16
| | | | | | | | | | | | | | | | unequal edge heights. Thanks UBit.
| | * | BulletSim: reorganize angular movement routine into separate subroutines ↵Robert Adams2012-11-271-95/+114
| | | | | | | | | | | | | | | | enabling external calibration routines and unit testing.
| | * | BulletSim: implementation of vertical attraction motor.Robert Adams2012-11-271-41/+62
| | | |
| | * | BulletSim: add 'infinite' timescale that does not reduce motor target or ↵Robert Adams2012-11-271-10/+27
| | |/ | | | | | | | | | friction.
| | * Fix database service unit test failures by temporarily reverting ↵Justin Clark-Casey (justincc)2012-11-261-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | BasicDataServiceTest extending OpenSimTestCase. Mono 2.4.3 doesn't like this when running nunit, with nunit throwing AssetTests`2 : System.MemberAccessException : Cannot create an instance of OpenSim.Data.Tests.AssetTests`2[TConn,TAssetData] because Type.ContainsGenericParameters is true. and similar. Mono 2.10.8.1 does not have this issue. So will wait until min version of mono bumps before restoring.
| | * BulletSim: increase vehicle stability by suppressing Bullet's update to ↵Robert Adams2012-11-264-59/+26
| | | | | | | | | | | | angular velocity.
| | * BulletSim: use m_angularMotor to do the basic movement. Add the setting of ↵Robert Adams2012-11-251-60/+64
| | | | | | | | | | | | same. Rename the angular forces and add comments to match MoveAngular to the form of MoveLinear.
| | * BulletSim: up the vehicle angular damping to 0.95. Still trying to overcome ↵Robert Adams2012-11-251-2/+2
| | | | | | | | | | | | the movement added by Bullet.
| | * BulletSim: organize MoveLinear code for understandability. Make ↵Robert Adams2012-11-251-89/+40
| | | | | | | | | | | | LIMIT_MOTOR_UP contribution a velocity and not a force.
| | * BulletSim: add ToString override to BSVMotor.Robert Adams2012-11-251-1/+6
| | |
| | * BulletSim: add BSVMotor as BSDynamics linear motor.Robert Adams2012-11-252-27/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly limit *_MOTOR_DECAY_TIMESCALE to 120 as per specs. Invode BSDynamics.Refresh() when vehicle type is changed. Previously the vehicle properties weren't getting set because the physical properties were set before the vehicle type was set. Add a "use name" to BSMotors for identification while debugging. Correct current and target confusion in BSVMotor design. Rename CurrentValueReductionTimescale to FrictionTimescale. Event more detailed logging.
| | * BulletSim: clean up TODO list. It is kept somewhere wlse that should be more ↵Robert Adams2012-11-252-18/+17
| | | | | | | | | | | | public. Add error logging for the detail log writer so a message is output when it cannot write to the specified logging directory. Modify friction defaults to be closer to ODE's values. Add new collision margin and vehicle angular damping parameters.
| | * BulletSim: small change to add position correction force with AddForce ↵Robert Adams2012-11-252-16/+22
| | | | | | | | | | | | rather than just storing it in the variable
| | * BulletSim: complete vector motor. Correct line endings.Robert Adams2012-11-251-104/+129
| | |
| | * BulletSim: add terrain collision margin and vehicle angular dampingRobert Adams2012-11-251-0/+7
| | | | | | | | | | | | | | | parameters to the parameter block. New API call for setting collision margin.
| | * BulletSim: add parameter for terrain collision margin.Robert Adams2012-11-253-54/+45
| | | | | | | | | | | | Add locking around unlikely but possible race conditions on terrain list.
| | * BulletSim: Add tables and initialization for different attributes for ↵Robert Adams2012-11-252-0/+198
| | | | | | | | | | | | different materials. For the moment, the per material tables are not used.
| * | Prevent the core Groups module from being enabled when its name doesn't ↵Diva Canto2012-11-271-0/+3
| | | | | | | | | | | | match the "default" ini choice
* | | Merge branch 'avination' into careminsterMelanie2012-11-252-2/+5
|\ \ \
| * | | * Fix a null ref error in ↵teravus2012-11-241-0/+3
| | | | | | | | | | | | | | | | /..../OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs:339
| * | | Remove a superfluous newline from helpMelanie2012-11-231-2/+2
| | | |
generated by cgit v1.1 at 2024-12-15 23:51:47 +0000