aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-01-311-1/+1
|\
| * Whitespace fix and removing unneccessary parenthesesMelanie2013-01-311-1/+1
| |
* | Merge branch 'avination' into careminsterMelanie2013-01-312-239/+239
|\ \
| * | Change keyframe motion to use a single timer for all objects. This is requiredMelanie2013-01-301-236/+229
| | | | | | | | | | | | | | | to prevent slippage between objects that are meant to move synchronously or keep their relative positions/rotations.
| * | Change default avatar replacements to be ruth rather than urban maleMelanie2013-01-281-13/+10
| | |
| * | Send moving_end event to scripts when keyframed motion ends.Melanie2013-01-271-0/+10
| | |
* | | Merge branch 'master' into careminsterMelanie2013-01-314-127/+199
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2013-01-313-20/+95
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2013-01-303-0/+25
| | |\ \
| | * | | Allow use of MaptileStaticUUID in Regions.ini to override the global setting ↵Jak Daniels2013-01-303-20/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in OpenSim.ini for each region. Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | | | Added option for UUID as command parameters. This lets the command handle ↵Dan Lake2013-01-311-0/+4
| | |/ / | |/| | | | | | | | | | the UUID parsing and type checking before the command is executed.
* | | | Merge branch 'master' into careminsterMelanie2013-01-3123-166/+974
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * | | Add JsonTestStore to determine if a JsonStore is associated withMic Bowman2013-01-303-0/+25
| |/ / | | | | | | | | | a particular UUID.
| * | * This adds a bit more to the previous flying roll effect by adding ↵teravus2013-01-301-10/+50
| | | | | | | | | | | | additional roll when pressing page down, and reducing your roll when pressing page up to make it feel more responsive and give the user more visual feedback.
| * | * Adds a satisfying angular roll when an avatar is flying and turning. ↵teravus2013-01-302-1/+82
| | | | | | | | | | | | (General, not physics). Makes flying not feel as stiff.
| * | Add JsonDestroyStore() basic regression testJustin Clark-Casey (justincc)2013-01-301-0/+15
| | |
| * | refactor: Make invocations of json store functions from the regression test ↵Justin Clark-Casey (justincc)2013-01-301-42/+17
| | | | | | | | | | | | simpler
| * | Add regression test for script func JsonRemoveValue()Justin Clark-Casey (justincc)2013-01-301-0/+52
| | |
| * | Fix issue where lsl -> c# generation in co-operative termination mode did ↵Justin Clark-Casey (justincc)2013-01-302-22/+171
| | | | | | | | | | | | | | | | | | | | | not correctly handle single statement versions of for, while and do-while loops. Add regression tests to validate the fix. This problem will not affect the default abort termination mode.
| * | BulletSim: fix physics repositioning when under ground to only happenRobert Adams2013-01-293-15/+50
| | | | | | | | | | | | for physical objects. Non-physical objects can go anywhere they want.
| * | minor: change name of json script tests to JsonStoreScriptModuleTests ↵Justin Clark-Casey (justincc)2013-01-291-1/+1
| | | | | | | | | | | | instead of copy/pasted LSL_ApiInventoryTests
| * | minor: remove EnableLogging() left over in CoopTerminationTestsJustin Clark-Casey (justincc)2013-01-291-1/+1
| | |
| * | Try ignoring json tests if they can't be run due to being on <=.net 3.5Justin Clark-Casey (justincc)2013-01-291-6/+17
| | |
| * | minor: Tidy up disabled logging on AssetTransactionModule for future use. ↵Justin Clark-Casey (justincc)2013-01-291-8/+10
| | | | | | | | | | | | Make it clear that transaction parameter to HandleUDPUploadRequest is an ID.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-01-2915-103/+529
| |\ \
| | * | BulletSim: enable angular vertical attraction.Robert Adams2013-01-282-3/+3
| | | | | | | | | | | | | | | | | | | | Increase terrain collision margin to help vehicles from tunneling into same.
| | * | BulletSim: first unit test: vehicle angular attractionRobert Adams2013-01-285-79/+150
| | | |
| | * | BulletSim: do not zero an avatar's standing velocity if it is standingRobert Adams2013-01-283-96/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | on a moving object. Rearrange pre/post action subscription code to put more in locks. Add meshmerizer params to BulletSimTestUtil scene creation (and fix line endings). Rebuilt version of DLLs and SOs with cleaned up code and no profiling for sure.
| | * | BulletSim: rename 'uint' to 'UInt32' to make clear the type that is passed ↵Robert Adams2013-01-281-14/+14
| | | | | | | | | | | | | | | | to unmanaged code.
| | * | BulletSim: fix the trimming of colliders so only the top 25 are returned.Robert Adams2013-01-282-4/+4
| | | |
| | * | BulletSim: simplify the initialization of some of the parameters.Robert Adams2013-01-272-32/+23
| | | | | | | | | | | | | | | | | | | | | | | | Disable vertical attraction for vehicles by default (for the moment). Fix bug where vehicle would go crazy when velocity got above a certain speed.
| | * | BulletSim: reinstate the supression of rotational velocity for vehiclesRobert Adams2013-01-271-1/+1
| | | |
| | * | BulletSim: add framework for BulletSim unit tests. No tests yet.Robert Adams2013-01-273-0/+193
| | | |
| | * | BulletSim: disable center-of-mass computation because it does not work yetRobert Adams2013-01-271-1/+1
| | | |
| | * | BulletSim: fix compile error from last commitRobert Adams2013-01-271-2/+2
| | | |
| | * | BulletSim: parameterize the value for gravity reduction for ground vehicles ↵Robert Adams2013-01-273-11/+18
| | | | | | | | | | | | | | | | on the ground. Set defaults for vehicle factors to one. Debug logging changes.
| | * | BulletSim: first attempt at reporting top collidersRobert Adams2013-01-275-11/+43
| | | |
| | * | BulletSim: parameterize several vehicle debugging values: physical linear ↵Robert Adams2013-01-273-9/+57
| | | | | | | | | | | | | | | | and angular force factors now default to less than 1 (0.2) vehicle friction and restitution now default to low values
| | * | BulletSim: finish the post step event for physical object actions. Modify ↵Robert Adams2013-01-273-13/+73
| | | | | | | | | | | | | | | | vehicle to use post step event for logging.
| * | | minor: remove some mono compile warnings in XEngine.csJustin Clark-Casey (justincc)2013-01-291-2/+0
| | | |
* | | | Merge branch 'avination' into careminsterMelanie2013-01-274-44/+318
|\ \ \ \ | | |_|/ | |/| |
| * | | Prevent items being destroyed by rename operations. Renaming of a wearable alsoMelanie2013-01-272-7/+9
| | | | | | | | | | | | | | | | | | | | sends an asset transaciton but it is empty. So we can't ignore name data when a transaction is present and can't treat every transaction as valid.
| * | | Reinstate cleaning objects from parcel when avatars sit on them. Instead do itMelanie2013-01-262-2/+2
| | | | | | | | | | | | | | | | properly for temp-on-rez. Auto-return overrides sitting. Temp does not.
| * | | Stop temp-on-rez object from being deleted while an avatar sits on themMelanie2013-01-261-1/+1
| | | |
| * | | Merge branch 'teravuswork' into avinationMelanie2013-01-262-7/+277
| |\ \ \
| | * | | * This update is ugly as sin, but it 'fills in the blanks' of your ↵teravus2013-01-261-4/+259
| | | | | | | | | | | | | | | | | | | | appearance when your inventory items go missing. This repairs appearance from missing wearables immediately on the V1 appearance pipeline, the second login on Firestorm. It only replaces the essential body parts that are missing.. hair, skin, eyes, shape... so if you delete all your wearables, you will rez naked. Anyway, this is still experimental.. I need another day of playing with this to handle all of the situations. One thing that I still need to do is try and get the assets.. and if we can't get the assets for some reason, skip and replace that part of the outfit.
| | * | | Merge remote-tracking branch 'remotes/origin/avination' into teravusworkteravus2013-01-268-51/+90
| | |\ \ \
| | * | | | * Handle a NRE with Baked Textures that may result in a failed appearance. ↵teravus2013-01-221-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | This may be an issue, or it may be a symptom.
| * | | | | bug fix: crash when too many collisions on a ode stepUbitUmarov2013-01-261-36/+40
| | |/ / / | |/| | |
* | | | | Merge branch 'master' into careminsterMelanie2013-01-272-7/+9
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
generated by cgit v1.1 at 2024-10-24 15:17:48 +0000