aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-11-308-29/+44
|\
| * BulletSim: add expanded call to IMesher/Meshmerizer which enables/disables me...Robert Adams2012-11-294-10/+26
| * BulletSim: reverse direction of hover correction. Removes problem with vehicl...Robert Adams2012-11-291-8/+8
* | Merge branch 'master' into careminsterMelanie2012-11-3021-555/+962
|\ \ | |/
| * BulletSim: fix boats floating low by removing LIMIT_MOTOR_UP flag from TYPE_B...Robert Adams2012-11-281-3/+15
| * BulletSim: update DLLs and SOs to remove simulator crash when calling SetInte...Robert Adams2012-11-284-0/+0
| * 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
| | * 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 tw...Diva Canto2012-11-271-11/+15
| | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-11-27129-2768/+3848
| |\ \
| | * | BulletSim: reorganize linear movement routine into separate subroutines enabl...Robert Adams2012-11-271-58/+79
| | * | BulletSim: fix terrain mesh generation for problem with regions that have une...Robert Adams2012-11-271-6/+16
| | * | BulletSim: reorganize angular movement routine into separate subroutines enab...Robert Adams2012-11-271-95/+114
| | * | BulletSim: implementation of vertical attraction motor.Robert Adams2012-11-271-41/+62
| | * | BulletSim: add 'infinite' timescale that does not reduce motor target or fric...Robert Adams2012-11-271-10/+27
| | |/
| | * Fix database service unit test failures by temporarily reverting BasicDataSer...Justin Clark-Casey (justincc)2012-11-261-1/+7
| | * BulletSim: increase vehicle stability by suppressing Bullet's update to angul...Robert Adams2012-11-264-59/+26
| | * BulletSim: use m_angularMotor to do the basic movement. Add the setting of sa...Robert Adams2012-11-251-60/+64
| | * BulletSim: up the vehicle angular damping to 0.95. Still trying to overcome t...Robert Adams2012-11-251-2/+2
| | * BulletSim: organize MoveLinear code for understandability. Make LIMIT_MOTOR_U...Robert Adams2012-11-251-89/+40
| | * 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
| | * BulletSim: update DLLs and SOs with new collision margin setting function.Robert Adams2012-11-254-0/+0
| | * BulletSim: update OpenSimDefaults.ini with current default values for frictio...Robert Adams2012-11-251-21/+12
| | * BulletSim: clean up TODO list. It is kept somewhere wlse that should be more ...Robert Adams2012-11-252-18/+17
| | * BulletSim: small change to add position correction force with AddForce rather...Robert Adams2012-11-252-16/+22
| | * 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
| | * BulletSim: add parameter for terrain collision margin.Robert Adams2012-11-253-54/+45
| | * BulletSim: Add tables and initialization for different attributes for differe...Robert Adams2012-11-252-0/+198
| * | Prevent the core Groups module from being enabled when its name doesn't match...Diva Canto2012-11-271-0/+3
* | | Merge branch 'avination' into careminsterMelanie2012-11-252-2/+5
|\ \ \
| * \ \ Merge branch 'teravuswork' of careminster:/var/git/careminster into teravusworkteravus2012-11-240-0/+0
| |\ \ \
| | * | | * Fix a null ref error in /..../OpenSim/Region/ClientStack/Linden/Caps/GetMes...teravus2012-11-241-0/+2
| * | | | * Fix a null ref error in /..../OpenSim/Region/ClientStack/Linden/Caps/GetMes...teravus2012-11-241-0/+3
| |/ / /
| * | | Remove a superfluous newline from helpMelanie2012-11-231-2/+2
* | | | Merge branch 'master' into careminsterMelanie2012-11-2589-644/+974
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ...Justin Clark-Casey (justincc)2012-11-243-106/+83
| * | Fix regression TestDeleteSceneObjectAsyncToUserInventory by adding a BasicInv...Justin Clark-Casey (justincc)2012-11-241-7/+12
| * | Consistenly make NUnit test cases inherit from OpenSimTestCase which automati...Justin Clark-Casey (justincc)2012-11-2466-68/+83
| * | In ArchiverTests, use the local instantiated SceneManager rather than potenti...Justin Clark-Casey (justincc)2012-11-241-20/+7
| * | Fix bug where loading an OAR with a deeded parcel would always set the parcel...Justin Clark-Casey (justincc)2012-11-2414-240/+613
| * | minor: Add some currently commented out debug log lines for investigating iss...Justin Clark-Casey (justincc)2012-11-231-0/+5
| * | Make "show threads" and "thread abort" console commands available on all serversJustin Clark-Casey (justincc)2012-11-233-108/+103
| * | Make "force gc" console command available across all serversJustin Clark-Casey (justincc)2012-11-232-11/+12
| * | Make "show version" console command available across all serversJustin Clark-Casey (justincc)2012-11-232-8/+7
| * | Delete unused BaseHttpServer.HandleAgentRequest()Justin Clark-Casey (justincc)2012-11-231-53/+0