| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-04-27 | 2 | -2/+2 |
| |\ | | | | | | | careminster | ||||
| | * | Help big boobies to dance (avatar visualParams). May not persist and need ↵ | UbitUmarov | 2012-04-26 | 2 | -2/+2 |
| | | | | | | | | | more lobe ? | ||||
| * | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-04-25 | 7 | -53/+158 |
| |\ \ | |/ | | | | | careminster | ||||
| | * | set PIDHoverTau and not PIDTau since all physics need that | UbitUmarov | 2012-04-25 | 1 | -5/+7 |
| | | | |||||
| | * | fix chODE loosing some part positions when doing isPhysical false | UbitUmarov | 2012-04-24 | 2 | -11/+42 |
| | | | |||||
| | * | SOG bug fix in UI object changes | UbitUmarov | 2012-04-24 | 1 | -11/+20 |
| | | | |||||
| | * | fix animations if sited in ground also | UbitUmarov | 2012-04-24 | 1 | -1/+1 |
| | | | |||||
| | * | let objects/avas push avas | UbitUmarov | 2012-04-24 | 1 | -2/+1 |
| | | | |||||
| | * | "save the catgirls" | UbitUmarov | 2012-04-24 | 2 | -18/+13 |
| | | | |||||
| | * | display heatbeat sleep time in stats. This may not be good for general use, ↵ | UbitUmarov | 2012-04-24 | 1 | -0/+5 |
| | | | | | | | | | but for testing/debug | ||||
| | * | fix Simulation time report | UbitUmarov | 2012-04-24 | 1 | -0/+7 |
| | | | |||||
| | * | some reduction on time resolution efects on spare time report | UbitUmarov | 2012-04-24 | 1 | -4/+8 |
| | | | |||||
| | * | *testing* changed stats time reports to be per reported frame and not ↵ | UbitUmarov | 2012-04-24 | 1 | -11/+64 |
| | | | | | | | | | acumulated in about 1second. Total Frame Time is not just 1/reported sim fps | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-04-25 | 1 | -15/+24 |
| |\ \ | |||||
| | * \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2012-04-25 | 39 | -769/+1283 |
| | |\ \ | |||||
| | * | | | Add try/catch around Json script method registration to avoild some issues | Mic Bowman | 2012-04-25 | 1 | -15/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | with .NET 3.5 vs 4.0 differences. See http://opensimulator.org/mantis/view.php?id=5971 | ||||
| * | | | | Adapt some TeleportWithMomentum calls | Melanie | 2012-04-25 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-04-25 | 3 | -19/+15 |
| |\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | | Slight rewording of output messages. | Diva Canto | 2012-04-24 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-04-24 | 2 | -1/+13 |
| | |\ \ \ | |||||
| | | * \ \ | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-04-25 | 1 | -0/+1 |
| | | |\ \ \ | |||||
| | | | * | | | zero out SP velocity before calling SP.Teleport(), as the client expects ↵ | Justin Clark-Casey (justincc) | 2012-04-25 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | (though this is also effectively done by physics at the moment) | ||||
| | | * | | | | Commit the avination Teleport() methods (adaptedto justincc's changes) | Melanie | 2012-04-25 | 1 | -1/+12 |
| | | |/ / / | |||||
| | * | | | | HG: Moved User-level code down to the HGEntityTransferModule where it belongs. | Diva Canto | 2012-04-24 | 2 | -14/+14 |
| | |/ / / | |||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-04-25 | 4 | -10/+39 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | | refactor: Combine ScenePresence.Teleport() and TeleportWithMomentum() | Justin Clark-Casey (justincc) | 2012-04-25 | 2 | -17/+1 |
| | | | | | | | | | | | | | | | | | These are identical apart from setting Velocity = zero, which has no practical effect anyway since this is zeroed when the avatar is added back to the physics scene. | ||||
| | * | | | Add regression test TestSameRegionTeleport() | Justin Clark-Casey (justincc) | 2012-04-25 | 3 | -1/+43 |
| | | | | | |||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-04-25 | 5 | -41/+50 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | ||||
| | * | | | Comment out some debug ATTACHMENTS log messages for now. | Justin Clark-Casey (justincc) | 2012-04-25 | 1 | -15/+14 |
| | | | | | |||||
| | * | | | Comment out the noisier AVFACTORY log messages for now. | Justin Clark-Casey (justincc) | 2012-04-25 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | | Permanently comment out warnings about ScenePresence not being found - this is entirely expected if the avatar has alraedy logged out or left the scene. | ||||
| | * | | | Improve teleport log debug and error messages to tell us who is teleporting. | Justin Clark-Casey (justincc) | 2012-04-25 | 1 | -3/+14 |
| | | | | | |||||
| | * | | | Minor improvements to logging | Oren Hurvitz | 2012-04-24 | 4 | -11/+16 |
| | | | | | | | | | | | | | | | | | Eliminated an extra newline in the console if the log line doesn't contain a category (example of a category: "[ASSETS]"). | ||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-04-24 | 11 | -332/+236 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | | | OSSL: fixed the threat level check for osParseJSONNew | Oren Hurvitz | 2012-04-24 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Restore _parent_scene.actor_name_map[prim_geom] = this; accidentally removed ↵ | Justin Clark-Casey (justincc) | 2012-04-24 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from ODEPrim.SetGeom. This occurred in 7a574be3fd from Sat 21 Apr 2012. This should fix collision detection. Mnay thanks to tglion for the spot and the fix in http://opensimulator.org/mantis/view.php?id=5988 | ||||
| | * | | | Changed the Map-related messages from Info to Debug. They're debug messages. | Diva Canto | 2012-04-23 | 4 | -8/+8 |
| | | | | | |||||
| | * | | | Add online/offline indicator to "friends show" region console command. | Justin Clark-Casey (justincc) | 2012-04-24 | 1 | -3/+14 |
| | | | | | | | | | | | | | | | | | Improve output table formatting. | ||||
| | * | | | Add osForceAttachToAvatar() and osForceDetachFromAvatar() | Justin Clark-Casey (justincc) | 2012-04-24 | 6 | -49/+127 |
| | | | | | | | | | | | | | | | | | | | | | | | | | These behave identically to llAttachToAvatar() and llDetachFromAvatar() except that they do not enforce the PERMISSION_ATTACH check Intended for use in completely controlled dedicated environments where these checks are more a UI hinderance than a help. Threat level high. | ||||
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-04-23 | 5 | -58/+100 |
| | |\ \ \ | |||||
| | * | | | | Replace common code to fetch self inventory item (as opposed to uuid) with ↵ | Justin Clark-Casey (justincc) | 2012-04-23 | 1 | -155/+76 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GetSelfInventoryItem() However, at some point it would be far more convenient to receive the TaskInventoryItem in the constructor rather than just the item UUID, so we don't have to constantly refetch our self item. | ||||
| | * | | | | refactor: Replace calls to InventorySelf() with existing m_itemID in LSL_Api | Justin Clark-Casey (justincc) | 2012-04-23 | 1 | -94/+42 |
| | | | | | | | | | | | | | | | | | | | | | There's no point look up an item ID that we already have. | ||||
| * | | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-04-23 | 7 | -502/+617 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | careminster | ||||
| | * | | | | ubitODE - do own timing control (as chODE does) until heartbeat does it right | UbitUmarov | 2012-04-23 | 2 | -21/+34 |
| | | | | | | |||||
| | * | | | | ubitODE - several changes... | UbitUmarov | 2012-04-23 | 3 | -431/+379 |
| | | | | | | |||||
| | * | | | | fix a bug i added fixing another.... | UbitUmarov | 2012-04-22 | 1 | -2/+5 |
| | | | | | | |||||
| | * | | | | ubitODE: - don't try to hover underground unless volumedetector (that ↵ | UbitUmarov | 2012-04-21 | 1 | -47/+93 |
| | | | | | | | | | | | | | | | | | | | | | doesn't colide with it) | ||||
| | * | | | | changed seletion code. SOP now knows about parts selection. UI actions are ↵ | UbitUmarov | 2012-04-20 | 3 | -24/+104 |
| | | | | | | | | | | | | | | | | | | | | | sent to SOP and this reports to SOG. Group is selected if any part is selected.sop.isSelect get() is only used in SOG. Will need to be improved for better performance on largelinksets. *UNTESTED* NEEDS CHECKING for side efects | ||||
| | * | | | | ubitODE: - Change triangles used in terrain height estimation | UbitUmarov | 2012-04-20 | 1 | -11/+28 |
| | | | | | | |||||
| | * | | | | ubitODE - again avatar/terrain collision. Reduce new viewers interpolators ↵ | UbitUmarov | 2012-04-20 | 1 | -6/+14 |
| | | | | | | | | | | | | | | | | | | | | | efects reporting null velocity and aceleration when stopped near the right position, where they can still have instantanius large values that can get magnified by interpolators, specially using diferent timing estimation. | ||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-23 | 13 | -124/+453 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |