Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-09-29 | 29 | -1485/+2258 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Get rid of some unnecessary casts in RemoteAdminPlugin. | Justin Clark-Casey (justincc) | 2012-09-29 | 1 | -5/+5 | |
| | * | | | | | | | | | | | | Fix bug where debug http level 6 could not be specified. Also converts newli... | Justin Clark-Casey (justincc) | 2012-09-29 | 2 | -5/+5 | |
| | * | | | | | | | | | | | | Fire EventManager.TriggerOnAttach (and hence LSL attach event) when an object... | Justin Clark-Casey (justincc) | 2012-09-29 | 2 | -14/+18 | |
| | * | | | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-09-29 | 19 | -1376/+2154 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | testing for xml-rpc errors in git repo. | nebadon | 2012-09-28 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | | BulletSim: update SOs and DLLs | Robert Adams | 2012-09-28 | 4 | -0/+0 | |
| | | * | | | | | | | | | | | | BulletSim: remember to release the physical body and shape when a prim is des... | Robert Adams | 2012-09-28 | 2 | -16/+16 | |
| | | * | | | | | | | | | | | | BulletSim: add separate runtime and taint-time linkset children lists to keep... | Robert Adams | 2012-09-27 | 3 | -80/+93 | |
| | | * | | | | | | | | | | | | BulletSim: rename some constraint variables to be consistant with other name ... | Robert Adams | 2012-09-27 | 7 | -116/+231 | |
| | | * | | | | | | | | | | | | BulletSim: remove the trailing spaces from lines to make git happier | Robert Adams | 2012-09-27 | 10 | -276/+275 | |
| | | * | | | | | | | | | | | | BulletSim: remove the unused body management code from BSPrim. There is no go... | Robert Adams | 2012-09-27 | 1 | -374/+0 | |
| | | * | | | | | | | | | | | | BulletSim: Fix linkset crash. Caused by the different body and shape | Robert Adams | 2012-09-27 | 9 | -94/+182 | |
| | | * | | | | | | | | | | | | BulletSim: Terrain sets proper collision flags on creation. | Robert Adams | 2012-09-27 | 4 | -52/+56 | |
| | | * | | | | | | | | | | | | BulletSim: btGhostObjects working to make 'volume detect' work. | Robert Adams | 2012-09-27 | 8 | -194/+268 | |
| | | * | | | | | | | | | | | | BulletSim: renamed members of BulletShape, BulletSim and BulletBody | Robert Adams | 2012-09-27 | 11 | -270/+482 | |
| | | * | | | | | | | | | | | | BulletSim: fix regression that caused cylindar shapes to have a box collision... | Robert Adams | 2012-09-27 | 1 | -1/+9 | |
| | | * | | | | | | | | | | | | BulletSim: complete code for managed code shape and body tracking. Not debugged. | Robert Adams | 2012-09-27 | 5 | -130/+675 | |
| | | * | | | | | | | | | | | | BulletSim: add class and infrastructure for shape and object | Robert Adams | 2012-09-27 | 5 | -39/+192 | |
| | | * | | | | | | | | | | | | BulletSim: Convert BSCharacter to use common BSPhysObject code and variables. | Robert Adams | 2012-09-27 | 5 | -117/+113 | |
| | | * | | | | | | | | | | | | BulletSim: move a bunch of common logic out of BSPrim and BSCharacter | Robert Adams | 2012-09-27 | 7 | -416/+361 | |
| | * | | | | | | | | | | | | | Extend attachment regression test to check for appropriate attach event firing. | Justin Clark-Casey (justincc) | 2012-09-29 | 1 | -25/+49 | |
| | |/ / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | Comment out unused RestPlugins text in OpenSimDefaults.ini | Justin Clark-Casey (justincc) | 2012-09-28 | 1 | -24/+25 | |
| | * | | | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-09-28 | 6 | -47/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-09-27 | 9 | -118/+314 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | another osgitbot test from github.. mistakes were made! | nebadon | 2012-09-27 | 1 | -1/+1 | |
| | | | * | | | | | | | | | | | another test to see if gitbot is alive yet | nebadon | 2012-09-27 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | | Removed the bits about the TOSModule. That module doesn't go into core. WARNI... | Diva Canto | 2012-09-27 | 5 | -47/+0 | |
| | * | | | | | | | | | | | | | Lock GDI+ portion og VectorRenderModule.GetDrawStringSize() to prevent concur... | Justin Clark-Casey (justincc) | 2012-09-28 | 1 | -6/+11 | |
| * | | | | | | | | | | | | | | Merge branch 'avination' into careminster | Melanie | 2012-09-27 | 36 | -475/+1637 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Remove a core undo call that we don't need. | Melanie | 2012-09-27 | 1 | -2/+0 | |
| * | | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-09-27 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | just testing to see if pcampbot is alive yet | nebadon | 2012-09-26 | 1 | -0/+1 | |
| | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge commit '2bf42f30af5030890b8e3ff5bb29074a1f0e9085' into careminster | Melanie | 2012-09-27 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | Add MaxPrimsUndo config setting to [Startup] section of OpenSim.ini. | Justin Clark-Casey (justincc) | 2012-09-27 | 7 | -19/+20 | |
| | * | | | | | | | | | | | | | Don't store undo states if a scene object is manipulated when it is not in a ... | Justin Clark-Casey (justincc) | 2012-09-26 | 2 | -3/+26 | |
| | * | | | | | | | | | | | | | refactor: Change control structures in SOP.StoreUndoState() to reduce nesting. | Justin Clark-Casey (justincc) | 2012-09-26 | 1 | -45/+43 | |
| | * | | | | | | | | | | | | | Make it possible to rescale SOGs when they are not in a scene. | Justin Clark-Casey (justincc) | 2012-09-26 | 2 | -34/+40 | |
| * | | | | | | | | | | | | | | Make it possible to rescale SOGs when they are not in a scene. | Justin Clark-Casey (justincc) | 2012-09-27 | 2 | -31/+42 | |
| * | | | | | | | | | | | | | | Merge commit '327320d1a7acbba969d26c281f92f64ce8ff365f' into careminster | Melanie | 2012-09-27 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | Enforce existing 5 action hardcoded undo limit. | Justin Clark-Casey (justincc) | 2012-09-26 | 3 | -27/+65 | |
| | * | | | | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-09-26 | 7 | -12/+41 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Add basic undo/redo regression tests. | Justin Clark-Casey (justincc) | 2012-09-26 | 3 | -8/+137 | |
| * | | | | | | | | | | | | | | Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminster | Melanie | 2012-09-27 | 12 | -19/+147 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Use GridUser properly for foreign users. | Diva Canto | 2012-09-26 | 5 | -8/+35 | |
| | * | | | | | | | | | | | | | Show the user's home url too on the console command. | Diva Canto | 2012-09-26 | 1 | -4/+3 | |
| | * | | | | | | | | | | | | | Not really a change, just added a reminder to fix something here. | Diva Canto | 2012-09-26 | 1 | -0/+3 | |
| | |/ / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-09-25 | 4 | -234/+248 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-09-25 | 1 | -35/+65 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-09-25 | 4 | -191/+364 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ |