| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-14 | 0 | -0/+0 |
| |\ | |||||
| | * | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2010-10-15 | 0 | -0/+0 |
| | |\ | |||||
| | * | | one more silly line ending thing.... *If you have problems, fetch the tree ↵ | Teravus Ovares (Dan Olivares) | 2010-10-15 | 1 | -71/+71 |
| | | | | | | | | | | | | | | | | | | | and rebase. Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com> | ||||
| * | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-14 | 1 | -71/+71 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | one more silly line ending thing.... | Teravus Ovares (Dan Olivares) | 2010-10-14 | 1 | -71/+71 |
| | |/ | | | | | | | *If you have problems, fetch the tree and rebase. | ||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-14 | 3 | -24/+75 |
| |\ \ | |/ | |||||
| | * | more work in progress on mesh physics - still non-functional | dahlia | 2010-10-14 | 3 | -24/+75 |
| | | | |||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-14 | 6 | -6/+63 |
| |\ \ | |/ | |||||
| | * | libomv update to support headerless llsd binary deserialization needed for ↵ | Latif Khalifa | 2010-10-14 | 6 | -6/+63 |
| | | | | | | | | | | | | | mesh asset decoding Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com> | ||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-14 | 1 | -70/+80 |
| |\ \ | |/ | |||||
| | * | laying some groundwork for mesh physics | dahlia | 2010-10-14 | 1 | -70/+80 |
| | | | |||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-14 | 2 | -4/+4 |
| |\ \ | |/ | |||||
| | * | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2010-10-14 | 4 | -108/+171 |
| | |\ | |||||
| | * | | * Replacing Magic numbers with Enums | Teravus Ovares (Dan Olivares) | 2010-10-14 | 2 | -4/+4 |
| | | | | |||||
| * | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-14 | 2 | -3/+7 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Don't distroy attachments when using viewer 2.1+, strip multiple attachment data | Latif Khalifa | 2010-10-14 | 1 | -0/+4 |
| | | | | |||||
| | * | | Kill some magic numbers in the mesh upload module and change the mesh asset | Melanie | 2010-10-14 | 1 | -3/+3 |
| | | | | | | | | | | | | | type from 45 to 49 to match OMV trunk | ||||
| * | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-14 | 2 | -105/+164 |
| |\ \ \ | |/ / | |||||
| | * | | Added manual xml2 serialization. Rewired only save xml2, not oars yet. Seems ↵ | Diva Canto | 2010-10-14 | 2 | -105/+164 |
| | |/ | | | | | | | to be generating xml's that are successfully parsed. Needs more testing. | ||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-14 | 7 | -15645/+15726 |
| |\ \ | |/ | |||||
| | * | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2010-10-14 | 2 | -0/+6 |
| | |\ | | | | | | | | | | Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com> | ||||
| | * | | Updated to libomv-opensim r3449 | Latif Khalifa | 2010-10-14 | 7 | -15645/+15726 |
| | | | | |||||
| * | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-14 | 2 | -0/+6 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | * A few additional cleanup elements | Teravus Ovares (Dan Olivares) | 2010-10-14 | 2 | -0/+6 |
| | |/ | | | | | | | | | * At this point, I want to make sure to thank the fabulous developers of the LibOpenMetaverse library for tirelessly keeping things updated and hammering away at the protocols and providing excellent tools to figure out where things go wrong. * Special thanks to John Hurliman and Latif Khalifa for their valuable insight. | ||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-14 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | * Whoops, That was supposed to use the HTTP VERB 'GET' not 'POST' | Teravus Ovares (Dan Olivares) | 2010-10-14 | 1 | -1/+1 |
| | | | | | | | | | * At this point. Visually, Mesh works OK. Remember peeps, this is still highly experimental from the viewer side as well as the Simulator side. There are known problems with the new beta viewers and attachment breaking so be careful until that's fixed. Additionally there some new properties in the Mesh Viewer that determine physics settings that are non-functional. More work will be done on that. | ||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-14 | 3 | -16/+35 |
| |\ \ | |/ | |||||
| | * | * Tweaked the upload response and now at least uploading the mesh works. | Teravus Ovares (Dan Olivares) | 2010-10-14 | 3 | -16/+35 |
| | | | | | | | | | * Binary error on downloading the mesh though.. so still not yet working. | ||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-14 | 1 | -9/+17 |
| |\ \ | |/ | |||||
| | * | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2010-10-14 | 2 | -3/+4 |
| | |\ | |||||
| | * | | Rename file + more testing and tweaking | Teravus Ovares (Dan Olivares) | 2010-10-14 | 1 | -9/+17 |
| | | | | |||||
| * | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-14 | 2 | -3/+4 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Kill some magic numbers in the caps module | Melanie | 2010-10-14 | 2 | -3/+4 |
| | |/ | |||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-13 | 3 | -1/+451 |
| |\ \ | |/ | |||||
| | * | * Partially complete stuff for Mesh support that Melanie wanted to see ↵ | Teravus Ovares (Dan Olivares) | 2010-10-14 | 3 | -1/+451 |
| | | | | | | | | | | | | | | | before it was done. * Shouldn't break the build. * Doesn't work yet either. | ||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-13 | 5 | -27890/+27890 |
| |\ \ | |/ | |||||
| | * | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2010-10-13 | 4 | -216/+35 |
| | |\ | | | | | | | | | | | | | Conflicts: bin/OpenSimDefaults.ini | ||||
| | * | | * Normalizing endlines so git stops complaining about them being inconsistent. | Teravus Ovares (Dan Olivares) | 2010-10-13 | 5 | -27893/+27893 |
| | | | | | | | | | | | | | * People will hate me for updating OpenSimDefaults.. but meh. Gotta be done or git is unhappy. | ||||
| | * | | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2010-10-13 | 3 | -15/+1389 |
| | |\ \ | |||||
| | * | | | *typical non-effectual commit to trigger a build | Teravus Ovares (Dan Olivares) | 2010-10-13 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-13 | 1 | -204/+14 |
| |\ \ \ \ | | |_|/ | |/| | | |||||
| | * | | | Added SOP.MediaUrl and Shape.Media to the deserialization | Diva Canto | 2010-10-13 | 1 | -204/+14 |
| | | | | | |||||
| * | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-13 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | fix build break | Justin Clark-Casey (justincc) | 2010-10-13 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-13 | 2 | -2/+12 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-13 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | * | | | | Correctly update the LastSeen field | Melanie Thielker | 2010-10-13 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Ensure no UUID.Zero region ID is ever written to presence. Add a Migration | Melanie Thielker | 2010-10-13 | 2 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | | to add a LastSeen field of type "Timestamp" to Presence for MySQL | ||||
| * | | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-13 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-10-13 | 1 | -9/+8 |
| | |\ \ \ \ | | |/ / / | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |