Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'avination' into careminster | Melanie | 2012-08-20 | 1 | -6/+2 |
|\ | |||||
| * | Fix scripted detach of temp attachments | Melanie | 2012-08-20 | 1 | -6/+2 |
| | | |||||
* | | Merge branch 'avination' into careminster | Melanie | 2012-08-20 | 3 | -1/+12 |
|\ \ | |/ | |||||
| * | Make the console output from the reigon console hookable | Melanie | 2012-08-18 | 2 | -0/+11 |
| | | |||||
| * | Fix a typo | Melanie | 2012-08-18 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-08-18 | 7 | -37/+47 |
|\ \ | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | | integrating redundant code into operator | SignpostMarv | 2012-08-18 | 2 | -14/+7 |
| | | | |||||
| * | | Rot2Quaternion is now redundant | SignpostMarv | 2012-08-18 | 2 | -12/+11 |
| | | | |||||
| * | | constructor means not having to manually refer to individual properties | SignpostMarv | 2012-08-18 | 3 | -6/+6 |
| | | | |||||
| * | | implicit operators mean one does not need to instantiate new objects manually | SignpostMarv | 2012-08-18 | 2 | -7/+5 |
| | | | |||||
| * | | adding missing refactor for LSL_Vector | SignpostMarv | 2012-08-18 | 1 | -1/+1 |
| | | | |||||
| * | | Implementing operators & constructors for Quaternion | SignpostMarv | 2012-08-18 | 1 | -0/+18 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-08-18 | 0 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | Fix the whitespace formatting error introduced by the last patch | Melanie | 2012-08-18 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-08-18 | 9 | -124/+119 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | | refactoring for Vector3 operator & constructor tweaks | SignpostMarv | 2012-08-18 | 9 | -125/+119 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-08-18 | 23 | -347/+469 |
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-08-18 | 23 | -346/+469 |
| |\ | |||||
| | * | When reporting a thread timeout, create a copy of the info rather than ↵ | Justin Clark-Casey (justincc) | 2012-08-18 | 1 | -1/+14 |
| | | | | | | | | | | | | | | | | | | | | | passing the original ThreadWatchdogInfo structure. This is to avoid the possibility of misleading reporting if a watchdog update outraces an alarm. Should address any remaining issues from http://opensimulator.org/mantis/view.php?id=6012 | ||||
| | * | adding null return to fix building | SignpostMarv | 2012-08-17 | 1 | -1/+1 |
| | | | |||||
| | * | fixing bug that get/set the wrong property for prim types other than sphere ↵ | SignpostMarv | 2012-08-17 | 2 | -3/+6 |
| | | | | | | | | | | | | & box | ||||
| | * | implemented | SignpostMarv | 2012-08-17 | 3 | -0/+64 |
| | | | |||||
| | * | attempt to handle InvalidCastException in a manner similar to Second Life | SignpostMarv | 2012-08-17 | 2 | -2/+17 |
| | | | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-08-17 | 2 | -17/+33 |
| | |\ | |||||
| | | * | BulletSim: Properly regenerate hulls when objects made physical. | Robert Adams | 2012-08-17 | 2 | -17/+33 |
| | | | | | | | | | | | | | | | | | | | | This fixes the problem of non-base shapes (cubes and spheres) falling through the terrain. | ||||
| | * | | Add information to ThreadStackSize about possibly increasing if suffering ↵ | Justin Clark-Casey (justincc) | 2012-08-17 | 1 | -1/+3 |
| | |/ | | | | | | | | | | StackOverflowExceptions during script conversion/compilation (e.g. on Windows 64-bit) | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-08-17 | 7 | -278/+149 |
| | |\ | |||||
| | | * | BulletSim: restore most of the Detail logging statements. Will have | Robert Adams | 2012-08-17 | 4 | -40/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | no effect on non-logging running. Capture region name that is passed to the physics engine and use it for detail logging file name prefix. Fix problem with avatars dropping when flying across region boundries. | ||||
| | | * | Modify order of code so SOP doesn't set the physics actor flying | Robert Adams | 2012-08-17 | 1 | -7/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | property multiple times every time Update is called. This eliminates zillions of settings which is better for BulletSim. The should be no functionality change. | ||||
| | | * | BulletSim: add parameters and functionality to specify the mesh | Robert Adams | 2012-08-17 | 4 | -48/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | level of detail for large meshes. Remove parameter and code for DetailLog (conditional logging into regular log file). | ||||
| | | * | BulletSim: comments and parameter changes in dynamics engine. | Robert Adams | 2012-08-17 | 2 | -26/+30 |
| | | | | |||||
| | | * | BulletSim: in BSDynamics, merge 'flags' and 'hoverFlags' as they are defined ↵ | Robert Adams | 2012-08-17 | 1 | -158/+20 |
| | | | | | | | | | | | | | | | | for the same bits and it makes the code less complicated. | ||||
| | * | | minor: Make xengine debug message on script load a scripting loading message ↵ | Justin Clark-Casey (justincc) | 2012-08-17 | 1 | -7/+9 |
| | |/ | | | | | | | | | | | | | | | | instead. This is more useful if compilation fails due to an uncatchable exception since we know what was being compiled. | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-08-17 | 8 | -3/+28 |
| | |\ | |||||
| | | * | Correct an exception report in SceneObjectPart so it outputs the stack. | Robert Adams | 2012-08-15 | 1 | -1/+1 |
| | | | | |||||
| | | * | BulletSim: make it so objects in a linkset do not generate collisions with ↵ | Robert Adams | 2012-08-15 | 3 | -2/+27 |
| | | | | | | | | | | | | | | | | each other. | ||||
| | | * | BulletSim: update DLLs and SOs to fix the problem with avatars jumping ↵ | Robert Adams | 2012-08-15 | 4 | -0/+0 |
| | | | | | | | | | | | | | | | | around at altitudes less than 25m. | ||||
| | * | | adding a clip method to handle Vector3 objects to enable a minor amount of ↵ | SignpostMarv | 2012-08-17 | 2 | -6/+11 |
| | |/ | | | | | | | | | | refactoring | ||||
| | * | enables configurable minimum sizes for physical & non-physical prims | SignpostMarv | 2012-08-15 | 7 | -42/+149 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-08-16 | 19 | -235/+483 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | | Do a proper null check to avoid the overloaded operator == trap | Melanie | 2012-08-16 | 1 | -1/+1 |
| |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-08-15 | 18 | -234/+482 |
| |\ | |||||
| | * | Don't enable the thread watchdog until all regions are ready. | Justin Clark-Casey (justincc) | 2012-08-15 | 2 | -7/+33 |
| | | | | | | | | | | | | This is to avoid false positives when the machine is under heavy load whilst starting up. | ||||
| | * | adding ATTACH_*_PEC constants | SignpostMarv | 2012-08-15 | 1 | -0/+2 |
| | | | |||||
| | * | BulletSim: update DLLs and SOs | Robert Adams | 2012-08-15 | 4 | -0/+0 |
| | | | |||||
| | * | BulletSim: add physics logging parameters to OpenSimDefaults.ini. Remove ↵ | Robert Adams | 2012-08-15 | 1 | -12/+17 |
| | | | | | | | | | | | | trailing semis from some the of the value definitions. | ||||
| | * | BulletSim: add hinge constraint. | Robert Adams | 2012-08-15 | 3 | -6/+126 |
| | | | | | | | | | | | | | | | | | | | | | Update BulletSimAPI with new constraint related function calls. Reorganize locking in BS6DofConstraint. Update BS6DofConstraint to do constraint reset correctly. Add new 'midpoint' construction of 6Dof constraint. | ||||
| | * | BulletSim: add locking to constraintCollection and rename some of the public ↵ | Robert Adams | 2012-08-15 | 2 | -147/+197 |
| | | | | | | | | | | | | method variables to reduce confusion between a physics scene and the real scene. | ||||
| | * | BulletSim: clean up detail logging by adding many more debug log statements ↵ | Robert Adams | 2012-08-15 | 5 | -34/+44 |
| | | | | | | | | | | | | and then commenting out most of the additions. | ||||
| | * | BulletSim: don't recreate mesh unless it needs it when rebuilding the hull. ↵ | Robert Adams | 2012-08-15 | 1 | -15/+15 |
| | | | | | | | | | | | | Make sure the collisionCollection is reallocated each tick to fix race condition of it being cleared while still in use. |