Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix Flickr rotation | Yann Bodson | 2009-08-03 | 1 | -5/+6 |
| | |||||
* | Improve calculator demo and add missing text property to QmlPalette. | Yann Bodson | 2009-08-03 | 7 | -55/+25 |
| | |||||
* | Use new enum ints (should be ids!) | Warwick Allison | 2009-07-31 | 3 | -6/+6 |
| | |||||
* | Rename Rect.pen to Rect.border | Michael Brasser | 2009-07-31 | 9 | -11/+11 |
| | |||||
* | Rename centeredIn to centerIn. | Michael Brasser | 2009-07-31 | 8 | -9/+9 |
| | |||||
* | Introduce Loader item. | Michael Brasser | 2009-07-30 | 1 | -8/+8 |
| | | | | | The Loader item takes the qml/qmlItem functionality from Item and moves it to a specialized subclass. | ||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-07-29 | 2 | -10/+7 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Make SameGame Scalable | Alan Alpert | 2009-07-29 | 2 | -10/+7 |
| | | | | | | | | | | Resize your window and hit new game This may invalidate high scores. | ||||
* | | KeyActions::return -> KeyActions::keyReturn | Yann Bodson | 2009-07-29 | 2 | -2/+2 |
|/ | |||||
* | simplify the code. | Lars Knoll | 2009-07-29 | 1 | -4/+3 |
| | |||||
* | fix all examples after change to QGraphicsTransform::origin. | Lars Knoll | 2009-07-29 | 3 | -3/+3 |
| | |||||
* | fixes in examples and demos | Lars Knoll | 2009-07-29 | 3 | -3/+8 |
| | | | | | Fixed all examples and demos to work after the changes to Flipable and Rotation3D. | ||||
* | fix calculator example | Lars Knoll | 2009-07-29 | 1 | -10/+10 |
| | |||||
* | Fix for QmlPalette | Yann Bodson | 2009-07-28 | 1 | -0/+1 |
| | | | | | Add a colorGroup property and remove palette properties from the root context. | ||||
* | Missed a few files in the new samegame | Alan Alpert | 2009-07-28 | 2 | -0/+33 |
| | | | | Button and Dialog qml files were missed in the first commit | ||||
* | Repurpose SameGame to be slimmer | Alan Alpert | 2009-07-27 | 15 | -274/+42 |
| | | | | No theming and no selected, plus some cleanup. | ||||
* | Add a glowy effect like KSame to SameGame | Alan Alpert | 2009-07-27 | 1 | -0/+8 |
| | | | | Just want this in the repo, samegame is about to be majorly revised. | ||||
* | Some SameGame cleanup | Alan Alpert | 2009-07-23 | 2 | -22/+48 |
| | | | | Mostly commenting the JS code. | ||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-07-23 | 5 | -17/+28 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Move the mouse control of the game from the main file to the blocks | Alan Alpert | 2009-07-23 | 5 | -12/+21 |
| | | | | | | | | | | This allows for spin on hover - note that the code to spin back is in there but not working at the moment. | ||||
| * | SameGame should now correctly determine game over | Alan Alpert | 2009-07-23 | 1 | -5/+7 |
| | | |||||
* | | Move all QML types to Qt/4.6 namespace. | Warwick Allison | 2009-07-23 | 28 | -0/+56 |
|/ | | | | | Adjust examples and demos accordingly. As per QT-558 | ||||
* | Move the Script interface of QmlComponent to QmlBindableComponent | Alan Alpert | 2009-07-21 | 1 | -2/+2 |
| | |||||
* | Update AnimatedImage item to be more similar to Animations | Alan Alpert | 2009-07-20 | 2 | -2/+2 |
| | | | | Now has playing and paused properties that should behave the same. | ||||
* | Update Gnome theme to only spin on mouse over, like same-gnome | Alan Alpert | 2009-07-20 | 8 | -24/+56 |
| | | | | | Note that currently we can only get mouse move signals if a button is pressed. | ||||
* | Bug fixes for SameGame demo | Alan Alpert | 2009-07-20 | 5 | -3/+0 |
| | | | | pngs are now 40x40, swapping between themes works again. | ||||
* | Use the images from Same Gnome as our second theme. | Alan Alpert | 2009-07-20 | 8 | -12/+42 |
| | | | | | | Also stopped switching background as part of the theme, partly because SameGnome doesn't have a background image and partly because it wasn't working right anyway. | ||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-07-17 | 3 | -5/+8 |
|\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: demos/declarative/samegame/content/BoomBlock.qml | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-07-17 | 1 | -3/+7 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Be faster. | Warwick Allison | 2009-07-17 | 1 | -3/+7 |
| | | | | | | | | | | | | Feel faster. | ||||
| * | | Remove non-functioning opaque property. | Michael Brasser | 2009-07-17 | 2 | -2/+2 |
| |/ | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-07-17 | 6 | -4/+1 |
|\ \ | |/ | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Change the color of the particles | Yann Bodson | 2009-07-16 | 4 | -1/+1 |
| | | |||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-07-16 | 21 | -2/+405 |
| |\ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv Conflicts: src/declarative/fx/fx.pri | ||||
| * \ | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-07-15 | 1 | -1/+14 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv Conflicts: src/declarative/canvas/qsimplecanvas.cpp src/declarative/canvas/qsimplecanvasdebugplugin.cpp src/declarative/canvas/qsimplecanvasdebugplugin_p.h src/declarative/fx/qfxpainteditem.cpp src/declarative/util/qfxview.cpp tools/qmlviewer/qmlviewer.h | ||||
| * | | | Cleanup in preparation for key/focus handling. | Michael Brasser | 2009-07-13 | 2 | -3/+0 |
| | | | | |||||
* | | | | SameGame notifies player of game over | Alan Alpert | 2009-07-16 | 3 | -7/+29 |
| | | | | | | | | | | | | | | | | As requested by Aaron. | ||||
* | | | | Updates to the SameGame demo | Alan Alpert | 2009-07-16 | 4 | -10/+9 |
| |_|/ |/| | | | | | | | | | | | Tiles now fall down from the top, instead of the corner, and a bit of clean up. | ||||
* | | | Update SameGame particles | Alan Alpert | 2009-07-16 | 4 | -3/+20 |
| | | | | | | | | | | | | Remove count:1 hack, make particles the right color. | ||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-07-15 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-07-15 | 18 | -1/+373 |
| |\ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | Rework compiler to a two phase analyse/generate approach | Aaron Kennedy | 2009-07-15 | 1 | -2/+2 |
| | |/ / | |/| | | |||||
* | | | | Restyle SameGame demo based on feedback | Alan Alpert | 2009-07-15 | 4 | -53/+80 |
| |/ / |/| | | | | | | | | | | | | | | | | | | | | -Uses a more familar rule set -Default theme swapped -Sizing altered. Now the tiles are 40x40 so as to be able to be pretty and have shiny animations, board size is set by what can fit in the game canvas. | ||||
* | | | Initial commit of the Same Game demo. Compare to KSame if on KDE. | Alan Alpert | 2009-07-15 | 17 | -0/+359 |
| |/ |/| | | | | | | | This demo primarily demonstrates use of JS and dynamic creation with QML, by creating a functional and animated game entirely with QML & JS | ||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-07-02 | 6 | -6/+6 |
|\ \ | |/ | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Add parameterized synthesized signals | Aaron Kennedy | 2009-07-02 | 6 | -6/+6 |
| | | | | | | | | Also changed syntax for emitting a signal to be consistent with normal QtScript. | ||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-06-30 | 14 | -212/+128 |
|\ \ | |/ | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: demos/declarative/flickr/content/ImageDetails.qml | ||||
| * | Cleanup, fixes, and basic docs for XmlListModel. | Michael Brasser | 2009-06-29 | 2 | -22/+22 |
| | | |||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-06-26 | 14 | -31/+34 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: examples/declarative/states/states.qml examples/declarative/states/transitions.qml examples/declarative/tutorials/helloworld/t3/tutorial3.qml src/declarative/util/qmlanimation.cpp | ||||
| | * | Color property is required to be explicity set (at least for now). | Michael Brasser | 2009-06-26 | 2 | -0/+3 |
| | | |