summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Collapse)AuthorAgeFilesLines
* Move the mouse control of the game from the main file to the blocksAlan Alpert2009-07-235-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 overAlan Alpert2009-07-231-5/+7
|
* Move the Script interface of QmlComponent to QmlBindableComponentAlan Alpert2009-07-211-2/+2
|
* Update AnimatedImage item to be more similar to AnimationsAlan Alpert2009-07-202-2/+2
| | | | Now has playing and paused properties that should behave the same.
* Update Gnome theme to only spin on mouse over, like same-gnomeAlan Alpert2009-07-208-24/+56
| | | | | Note that currently we can only get mouse move signals if a button is pressed.
* Bug fixes for SameGame demoAlan Alpert2009-07-205-3/+0
| | | | pngs are now 40x40, swapping between themes works again.
* Use the images from Same Gnome as our second theme.Alan Alpert2009-07-208-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 Alpert2009-07-173-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 Brasser2009-07-171-3/+7
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Be faster.Warwick Allison2009-07-171-3/+7
| | | | | | | | | | | | Feel faster.
| * | Remove non-functioning opaque property.Michael Brasser2009-07-172-2/+2
| |/
* | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-07-178-4/+10
|\ \ | |/ | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Change the color of the particlesYann Bodson2009-07-164-1/+1
| |
| * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-162-0/+9
| |\ | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv Conflicts: src/declarative/fx/qfxitem.h src/declarative/util/qfxview.h src/gui/graphicsview/qgraphicsitem_p.h
| | * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-164-3/+20
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-1518-2/+388
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-07-152-0/+9
| | |\ \ \ | | | | | | | | | | | | | | | | | | kinetic-declarativeui
| | | * | | Added QTextListFormat::ListUpperRoman and QTextListFormat::ListLowerRoman ↵Nils Jeisecke2009-07-131-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for roman numbering of lists as supported by HTML/ODF Reviewed-by: Olivier Goffart Merge-request: 681
| | | * | | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-07-131-0/+1
| | | |\ \ \
| | | | * | | Fix initialization of the HTML 5 offline storage.Simon Hausmann2009-07-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Place the databases into the normal data location. Reviewed-by: Ariya
| * | | | | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-1621-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 Brasser2009-07-151-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 Brasser2009-07-132-3/+0
| | | | | | |
* | | | | | | SameGame notifies player of game overAlan Alpert2009-07-163-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | As requested by Aaron.
* | | | | | | Updates to the SameGame demoAlan Alpert2009-07-164-10/+9
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Tiles now fall down from the top, instead of the corner, and a bit of clean up.
* | | | | | Update SameGame particlesAlan Alpert2009-07-164-3/+20
| |_|_|_|/ |/| | | | | | | | | | | | | | Remove count:1 hack, make particles the right color.
* | | | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-07-151-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ \ \ Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-07-1518-1/+373
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | | Rework compiler to a two phase analyse/generate approachAaron Kennedy2009-07-151-2/+2
| | |/ / / / | |/| | | |
* | | | | | Restyle SameGame demo based on feedbackAlan Alpert2009-07-154-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 Alpert2009-07-1517-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 Allison2009-07-026-6/+6
|\ \ \ \ | |/ / / | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Add parameterized synthesized signalsAaron Kennedy2009-07-026-6/+6
| | | | | | | | | | | | | | | | Also changed syntax for emitting a signal to be consistent with normal QtScript.
* | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-06-3014-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 Brasser2009-06-292-22/+22
| | | |
| * | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-06-2614-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 Brasser2009-06-262-0/+3
| | | | |
| | * | | Rename NumericAnimation -> NumberAnimationMichael Brasser2009-06-2614-31/+31
| | | | |
| * | | | Update SetProperties to handle changing bindingsAaron Kennedy2009-06-269-159/+72
| |/ / / | | | | | | | | | | | | Also removed all uses of SetProperty
* | | | Smooth-scale Big Image while static.Warwick Allison2009-06-241-1/+14
|/ / /
* | | Optimize by using solid background.Warwick Allison2009-06-241-0/+1
| | |
* | | Don't be smooth while moving (or zooming).Warwick Allison2009-06-241-2/+2
| | |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Aaron Kennedy2009-06-19207-412/+420
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp
| * | Merge license header changes from 4.5Volker Hilsheimer2009-06-16204-406/+406
| |\ \ | | |/
| | * Cleanup our usage of the term "Qt Software".Jason McDonald2009-06-162-2/+2
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-16206-410/+410
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-125-6/+14
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm
| | * Fixed a compile failure on Solaris, really :)Trond Kjernåsen2009-06-101-9/+9
| | | | | | | | | | | | | | | | | | You can't static_cast from a signed to an unsigned type and vice versa. Reviewed-by: Kim
| | * Fixed non-working animations under X11 with the raster graphicssystem.Trond Kjernåsen2009-06-101-1/+1
| | | | | | | | | | | | Reviewed-by: jbache
| | * BT: QtDemo works far to sluggish on macRichard Moe Gustavsen2009-06-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically we need to revert more of Oliviers change. The reason is that we just cannot run the demo on mac without timer based updates (as opposed to graphics view itself tries to figure out when to update). The reason is that the demo uses QItemAnimations extensivelly, which again uses QTimelines, wich again uses separate timers. And on mac, because of coalesced updated, each item animation will result in an individual redrawing of the scene. Task-number: 255751 Reviewed-by: Olivier
generated by cgit v0.12 at 2025-01-07 22:15:09 (GMT)