Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2013-12-07 | 1 | -2/+0 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-10-06 | 1 | -1/+1 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-10-04 | 2 | -5/+41 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-09-07 | 1 | -0/+5 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-07-29 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-07-18 | 2 | -0/+98 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-07-04 | 2 | -3/+6 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-06-30 | 2 | -1/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-06-13 | 1 | -2/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-06-04 | 2 | -0/+1179 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-05-11 | 1 | -0/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-04-29 | 1 | -5/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-04-10 | 1 | -8/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-03-15 | 2 | -91/+108 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-02-28 | 2 | -4/+12 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-02-22 | 6 | -1/+746 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-02-10 | 2 | -6/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Rename Bounciness to Restitution | Melanie | 2013-02-07 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2013-02-05 | 3 | -4/+23 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'avination' into careminster | Melanie | 2012-12-18 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | Check database for root prim IDs only to try and get a handle on prim loss | Melanie | 2012-12-09 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-12-09 | 1 | -0/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-17 | 1 | -42/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-11-15 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-11-09 | 1 | -2/+92 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-11-08 | 2 | -5/+76 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-10-12 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-09-29 | 1 | -3/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminster | Melanie | 2012-09-27 | 1 | -0/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-08-31 | 1 | -219/+238 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix and finish the extra parameters storage system for MySQL | Melanie | 2012-08-15 | 1 | -1/+57 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a skeleton for a name value storage associated with regions | Melanie | 2012-08-15 | 2 | -0/+20 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'avination' into careminster | Melanie | 2012-07-11 | 1 | -2/+17 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix storing vehicle data | Melanie | 2012-07-07 | 1 | -2/+2 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add saving vehicle physics data to the database | Melanie | 2012-07-07 | 1 | -2/+17 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'avination' into careminster | Melanie | 2012-06-29 | 1 | -26/+34 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent bad prim in the database from crashing the sim, list affected | Melanie | 2012-06-26 | 1 | -26/+34 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'avination' into careminster | Melanie | 2012-06-11 | 1 | -2/+35 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Typo fix | Melanie | 2012-06-07 | 1 | -3/+5 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the ability to query the MYSQL databse for a list of the stored prim UUIDs | Melanie | 2012-06-07 | 1 | -0/+31 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-05-27 | 2 | -0/+74 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'avination' into careminster | Melanie | 2012-05-15 | 1 | -1/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port the mel/dahlia fix | Melanie | 2012-05-15 | 1 | -1/+8 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-30 | 9 | -439/+455 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-04-24 | 3 | -22/+42 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix an invalid cast that only showed at runtime | Melanie | 2012-03-20 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store and reload extra physics from database | Melanie | 2012-03-20 | 1 | -2/+20 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-03-20 | 1 | -14/+13 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-03-14 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a merge artefact | Melanie | 2012-03-09 | 1 | -4/+5 |