Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | ... ossl merge issue | UbitUmarov | 2015-09-28 | 1 | -0/+1 |
* | bad merge? | UbitUmarov | 2015-09-01 | 1 | -2/+1 |
|\ | |||||
| * | Merge branch 'master' into careminster | Melanie | 2014-01-28 | 1 | -0/+1 |
| |\ | |||||
| * \ | Merge branch 'avination' into careminster | Melanie | 2013-03-03 | 1 | -1/+0 |
| |\ \ | |||||
| | * | | Remove osParseJSONNew because it's "object" return type is not useful for LSL | root | 2013-02-25 | 1 | -1/+0 |
| * | | | Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminster | Melanie | 2013-01-16 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-10-26 | 1 | -0/+24 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-10-03 | 1 | -0/+24 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-09-07 | 1 | -1/+24 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-08-31 | 1 | -0/+6 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-08-29 | 1 | -0/+59 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-08-24 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-08-03 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-07-28 | 1 | -0/+16 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-07-20 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-07-11 | 1 | -2/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-07-05 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-04-27 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-04-24 | 1 | -0/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-04-11 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-03-27 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-03-18 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-03-14 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-03-03 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-01-27 | 1 | -19/+36 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-01-21 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-01-13 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-01-12 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Fix some syntax issues | Melanie | 2012-01-06 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add osNpcPlayAnimation and osNpcStopAnimation which respect ownership as well | Melanie | 2012-01-06 | 1 | -0/+2 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add osNpcCreateOwned to create an owned NPC. Those can be sensed only by the ... | Melanie | 2012-01-06 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-01-06 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2011-12-12 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'de161585c0960a93911f446f0179441ba5470245' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -2/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | root | 2011-06-30 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-12 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-12 | 1 | -7/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-17 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-16 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-18 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clone cmGetAvatarList into osGetAvatarList for more generic use. | Melanie Thielker | 2010-06-11 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add two new osFunctions: | Melanie Thielker | 2010-06-02 | 1 | -0/+4 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-21 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2010-01-03 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2009-12-31 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2009-12-14 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move osFunctions into a new Careminster script interface | CasperW | 2009-12-09 | 1 | -5/+0 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable scripting interface for windlight | unknown | 2009-12-09 | 1 | -1/+6 |