Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | bad merge? | UbitUmarov | 2015-09-01 | 1 | -3/+68 |
|\ | |||||
| * | take taints check terrain out of Onframe event and add a new event for it. S... | UbitUmarov | 2015-08-27 | 1 | -0/+23 |
| * | replace debug msgs by others | UbitUmarov | 2014-08-03 | 1 | -4/+4 |
| * | several debug msgs, need to be removed asap | UbitUmarov | 2014-08-03 | 1 | -0/+5 |
| * | Merge branch 'master' into careminster | Melanie | 2013-10-04 | 1 | -3/+3 |
| |\ | |||||
| * \ | Merge branch 'master' into careminster | Melanie | 2013-07-24 | 1 | -3/+3 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into careminster | Melanie | 2013-06-30 | 1 | -0/+31 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-06-04 | 1 | -0/+23 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-02-15 | 1 | -0/+55 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-01-26 | 1 | -0/+56 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-01-04 | 1 | -8/+5 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'avination' into careminster | Melanie | 2012-11-17 | 1 | -0/+13 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Pipe Throttle Update Event to EventManager, client --> ScenePresence --> Even... | teravus | 2012-11-04 | 1 | -0/+13 |
| * | | | | | | | | | Merge branch 'avination' into careminster | Melanie | 2012-11-04 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | more debug | UbitUmarov | 2012-10-28 | 1 | -0/+2 |
| * | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-10-12 | 1 | -3/+17 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge commit '77355295dadaf3be54ac29d6b3d30901e95c0a32' into careminster | Melanie | 2012-09-27 | 1 | -2/+190 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-09-24 | 1 | -6/+166 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-09-16 | 1 | -5/+132 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Add support for the extra params to scene and the event manager | Melanie | 2012-08-15 | 1 | -0/+23 |
| * | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-07-28 | 1 | -6/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-07-19 | 1 | -10/+41 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Replace PollServiceRequestManager with older version, add extra logging to | Melanie | 2012-07-17 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-06-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-05-13 | 1 | -0/+25 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-05-09 | 1 | -0/+24 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-04-07 | 1 | -0/+49 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-03-29 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-03-28 | 1 | -2/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-03-20 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-03-07 | 1 | -5/+20 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-02-18 | 1 | -3/+79 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-02-03 | 1 | -0/+48 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-01-05 | 1 | -0/+24 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2011-12-18 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into bigmerge | Melanie | 2011-11-19 | 1 | -10/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into bigmerge | Melanie | 2011-11-17 | 1 | -8/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -6/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 1 | -0/+48 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an event for an orderly region shutdown that fires once per region before | Melanie | 2011-05-24 | 1 | -0/+25 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-27 | 1 | -0/+30 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-27 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-23 | 1 | -0/+35 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 1 | -8/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-07 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, because | Melanie Thielker | 2010-09-06 | 1 | -1/+25 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-06 | 1 | -3/+94 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-11 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new global event : OnTerrainUpdate | Tom Grimshaw | 2010-06-26 | 1 | -0/+24 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename Meta7Windlight to LightShare | Melanie | 2010-03-30 | 1 | -2/+2 |