Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Restored random choice of volume problems.HEADmaster | pmoxhay | 2010-01-12 | 1 | -1/+1 |
| | |||||
* | Tips and pours the containers; problem 9 only. | pmoxhay | 2010-01-11 | 2 | -33/+136 |
| | |||||
* | Merge branch 'master' of gitorious@git.sugarlabs.org:math/mainline | pmoxhay | 2010-01-08 | 2 | -127/+46 |
|\ | |||||
| * | Add small rotation when pouring volumes. Clean up VolumeObject drawing code. | Wade Brainerd | 2010-01-08 | 2 | -127/+46 |
| | | |||||
* | | Merge branch 'master' of gitorious@git.sugarlabs.org:math/mainline | pmoxhay | 2009-12-31 | 3 | -20/+17 |
|\ \ | |/ | |||||
| * | Fix bug in MoveableObject's overridden move method. | Wade Brainerd | 2009-12-31 | 3 | -6/+4 |
| | | |||||
| * | Take scale into account when redrawing objects. | Wade Brainerd | 2009-12-31 | 2 | -14/+13 |
| | | | | | | | | Rewrite VolumeObject.get_bounds. | ||||
* | | Minor change in volumeobject.py?s | pmoxhay | 2009-12-31 | 1 | -1/+1 |
|/ | |||||
* | Animation added! | pmoxhay | 2009-12-30 | 5 | -57/+175 |
| | |||||
* | Minor bug fix in MovableObject. | pmoxhay | 2009-06-17 | 1 | -2/+3 |
| | |||||
* | Restored choice of problem type. | pmoxhay | 2009-06-16 | 1 | -1/+1 |
| | |||||
* | Fixed some tabbing issues in cutting problems. | pmoxhay | 2009-06-16 | 2 | -1/+19 |
| | |||||
* | Fixed some tabbing issues in amount problems. | pmoxhay | 2009-06-16 | 4 | -22/+28 |
| | |||||
* | Added key presses for getting next problem. | pmoxhay | 2009-06-15 | 2 | -6/+8 |
| | |||||
* | Can now get next problem by key press; fixed tab problem when arrow is showing. | pmoxhay | 2009-06-15 | 4 | -15/+58 |
| | |||||
* | Adjusted bounds of line segment drop target | pmoxhay | 2009-06-15 | 1 | -1/+2 |
| | | | | so moving line segments by key press works better. | ||||
* | Fixed bug: line segment had been disappearing | pmoxhay | 2009-06-15 | 5 | -3/+17 |
| | | | | | | when moving from one drop target to the other. The bounds of the movable line segment had to be adjusted by 2 pixels. | ||||
* | Line segment drops targets now correctly hilited when moving by key press. | pmoxhay | 2009-06-14 | 2 | -2/+4 |
| | |||||
* | Minor corrections to shapes and subshapes in cutting problems. | pmoxhay | 2009-06-13 | 2 | -16/+17 |
| | |||||
* | Restore random choice of length problems. | pmoxhay | 2009-06-13 | 1 | -1/+1 |
| | |||||
* | Fixed bug: now avoids spurious length comparisons. | pmoxhay | 2009-06-13 | 2 | -8/+174 |
| | |||||
* | Updated TODO. | pmoxhay | 2009-06-10 | 2 | -2/+42 |
| | |||||
* | Scissors don't drop back on and recut the shapes. | pmoxhay | 2009-06-10 | 4 | -57/+212 |
| | | | | Check all code on intersection of two polygons. | ||||
* | Wider AnswerBox for amount problems. | pmoxhay | 2009-06-07 | 6 | -42/+118 |
| | |||||
* | Fixed some issues with amount comparisons. | pmoxhay | 2009-06-06 | 5 | -135/+43 |
| | |||||
* | Volume comparison fits into AnswerBox. | pmoxhay | 2009-06-05 | 4 | -34/+102 |
| | |||||
* | Doesn't repeat recently used problems. | pmoxhay | 2009-06-05 | 15 | -159/+307 |
| | | | | | | Fix bug with line segment drops getting rejected. Progresses to next level once >, <, = problems for a given level are solved correctly. | ||||
* | Amounts no longer disappear in AnswerBox. | pmoxhay | 2009-06-03 | 2 | -3/+9 |
| | |||||
* | Masses no longer disappear in AnswerBox. | pmoxhay | 2009-06-03 | 3 | -63/+338 |
| | |||||
* | Shapes don't disappear (except for masses, amounts). | pmoxhay | 2009-06-02 | 10 | -77/+144 |
| | | | | | | Letters don't repeat from problem to problem. Start registering errors and regulating going from one problem type to another. | ||||
* | Doesn't repeat color choice from problem to problem. | pmoxhay | 2009-06-01 | 6 | -26/+56 |
| | | | | | This may help children perceive that a new problem is being presented. | ||||
* | Modified TODO. | pmoxhay | 2009-06-01 | 1 | -1/+1 |
| | |||||
* | Increased number of cutting problems. | pmoxhay | 2009-06-01 | 2 | -33/+344 |
| | | | | Incorporated new algorithm for determining whether two shapes overlap. | ||||
* | Increased number of mass problems. | pmoxhay | 2009-05-28 | 3 | -9/+39 |
| | |||||
* | Increased number of volume problems. | pmoxhay | 2009-05-27 | 2 | -37/+153 |
| | |||||
* | Removed some area problems (long skinny rectangles) that didn't work well | pmoxhay | 2009-05-26 | 3 | -39/+23 |
| | | | | | with translate-rotate; also problems where one shape is much larger than the other. | ||||
* | Fixed behavior of lengths when clicked inside answer box. | pmoxhay | 2009-05-26 | 4 | -23/+14 |
| | |||||
* | Improved appearance of model object for amount comparisons. | pmoxhay | 2009-05-21 | 4 | -9/+16 |
| | |||||
* | Another small fix for DropTarget hiliting. | pmoxhay | 2009-04-10 | 2 | -0/+4 |
| | |||||
* | DropTargets now hilite correctly. | pmoxhay | 2009-04-10 | 3 | -1/+9 |
| | |||||
* | Small fixes to make borders of drop targets draw fully. | pmoxhay | 2009-04-07 | 4 | -4/+5 |
| | |||||
* | Removed some unused stuff from ShapeObject. | Wade Brainerd | 2009-04-06 | 5 | -76/+45 |
| | |||||
* | Factor move function into MovableObject, remove duplication. | Wade Brainerd | 2009-04-06 | 15 | -277/+67 |
| | | | | Also simplify some of the SVG based objects. | ||||
* | Fix AmountObject drawing. | Wade Brainerd | 2009-04-06 | 1 | -44/+21 |
| | |||||
* | Tidy up grid code a bit. | Wade Brainerd | 2009-04-06 | 21 | -227/+49 |
| | |||||
* | Switch AmountProblem to use new AmountObject instead of ShapeObject. | Wade Brainerd | 2009-04-06 | 2 | -28/+157 |
| | |||||
* | Fix GroupObject get_bounds to include moon. | Wade Brainerd | 2009-04-05 | 1 | -2/+2 |
| | |||||
* | Fix drawing of balance when objects are dropped. | Wade Brainerd | 2009-04-05 | 1 | -0/+2 |
| | |||||
* | Simplify problem selection a bit. | Wade Brainerd | 2009-04-05 | 1 | -24/+5 |
| | |||||
* | Simplify ThreeDObject drawing a bit. | Wade Brainerd | 2009-04-05 | 1 | -20/+11 |
| |