summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add an OSD to display game progress in the sceneAlexis Menard2009-04-2411-65/+320
|
* Merge branch 'kinetic-statemachine' into kinetic-animationsKent Hansen2009-04-2442-2484/+1178
|\ | | | | | | | | Conflicts: examples/animation/piemenu/qgraphicspiemenu_p.h
| * Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-04-241-4/+4
| |\
| * | Remove API for setting specific restore policies on states. We have no clearEskil Abrahamsen Blomfeldt2009-04-239-133/+73
| | | | | | | | | | | | | | | | | | use case for this, so it has been removed. If the requirement arises we can add it back in later. Since it no longer makes sense to have it in QAbstractState, the RestorePolicy enum has been moved to QStateMachine.
| * | Compile.Eskil Abrahamsen Blomfeldt2009-04-231-2/+0
| | |
| * | Remove specific RestorePolicy per state from example. The semantics for thisEskil Abrahamsen Blomfeldt2009-04-233-15/+0
| | | | | | | | | | | | | | | have changed to something which is more intuitive, so it is no longer useful for this case.
| * | kill the stateactions apiKent Hansen2009-04-2236-1720/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It just didn't give us that much. Typically you just reimplement onEntry/onExit/onTransition when you want to do something. We go back to the signals-and-slots approach: states have entered() and exited() signals that you can connect to. It's still possible to have an action-based API, but then you build it on top of the core API, which is OK. Replacing 4 public classes (and one layer in the hierarchy) with 2 signals feels good.
| * | Test for overriding default animations. This test defines the order ofEskil Abrahamsen Blomfeldt2009-04-221-0/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | precedence: 1. Specific animation for transition 2. Default animation for source state 3. Default animation for target state 4. Default animation
| * | Add tests for the removeDefaultAnimation* APIEskil Abrahamsen Blomfeldt2009-04-221-0/+127
| | |
| * | Add API for adding default animations to the state machine. This is especiallyEskil Abrahamsen Blomfeldt2009-04-214-4/+272
| | | | | | | | | | | | | | | | | | | | | useful when using the RestoreProperties policy, because this is intended to allow you to build a state machine without having each state consider all the possible properties that may be set by some state at some point. Default animations provide the same convenience for animated properties.
| * | QAnimationState is no more, so we remove the test for it. The relevant testsEskil Abrahamsen Blomfeldt2009-04-213-630/+327
| | | | | | | | | | | | have been ported to the new API and added to the QStateMachine autotest instead.
| * | doc: Document return value of QState::addTransition(QAbstractTransition*)Eskil Abrahamsen Blomfeldt2009-04-211-1/+2
| | |
| * | Have QState::addTransition(QAbstractTransition*) return the transition objectEskil Abrahamsen Blomfeldt2009-04-212-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | when it is added. Reduces the number of temporary variables you have to declare in your code since you can do things like: state->addTransition(new Transition())->addAnimation(new Animation()); Could also be used for error checking.
| * | compile.Eskil Abrahamsen Blomfeldt2009-04-211-3/+3
| | |
* | | Fix a bug in the ease{In,Out}Bounce easing functions + small cleanup.Jan-Arve Sæther2009-04-232-109/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug was in easeOutBounce_helper(), where the last else-block adjusted t wrong. It should adjust t so that the peak is at t == 0, but it adjusted it too little. The old code did t -= (2.25f/2.75f), but it should have been 21/22. The rest of the changes in that function is just simple mathematical rewrites (use a more readable fraction), and removed the b argument, since that was always 0. Finally, fixing the original bug also revealed a bug in the first line of easeOutBounce_helper(), where we always returned 1.0 for t == 1.0. That was wrong since it did not respect c.
* | | Remove trailing whitespaceJan-Arve Sæther2009-04-231-8/+8
| | |
* | | Remove trailing whitespaceJan-Arve Sæther2009-04-231-32/+32
| | |
* | | Moved the animation examples piemenu and photobrowser to examples/researchLeonardo Sobral Cunha2009-04-2316-0/+0
| | |
* | | Update copyright headers of animation examplesLeonardo Sobral Cunha2009-04-2354-110/+1937
| | |
* | | Fixes QPropertyAnimation's default start value update conditionLeonardo Sobral Cunha2009-04-223-20/+38
| | | | | | | | | | | | | | | | | | | | | The default start value is updated when the animation changes from Stopped to Running state. Reviewed-by: Jan-Arve
* | | Fixes for solution package.Jan-Arve Sæther2009-04-227-54/+89
| | |
* | | Expose QVariantAnimationPrivate::getInterpolator in the private headerLeonardo Sobral Cunha2009-04-212-2/+4
| | | | | | | | | | | | These interpolator functions might be useful for other internal classes.
* | | QPropertyAnimation reevaluates the default start value after each runLeonardo Sobral Cunha2009-04-213-7/+41
| |/ |/| | | | | | | | | | | | | When the start value is not explicitly defined, the property animation will set the default start to be the current property value when updating the animation's state to Running. Reviewed-by: Jan-Arve
* | update the package script according to class renamingKent Hansen2009-04-211-4/+4
|/
* Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-04-212-1/+36
|\
| * Fixes bug when adding the same child animation twice to the same groupLeonardo Sobral Cunha2009-04-212-1/+36
| | | | | | | | | | | | | | | | The child animation was removed twice from the group because in QAnimationGroup::insertAnimationAt the insertion in the list was done before removing the animation. Reviewed-by: Jan-Arve
* | include the right headerKent Hansen2009-04-212-2/+2
| |
* | compileEskil B2009-04-211-63/+48
| |
* | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-04-2127-782/+233
|\ \ | |/
| * don't assert if the signal is not validKent Hansen2009-04-211-1/+2
| |
| * compile fixThierry Bastian2009-04-201-1/+1
| |
| * remove QItemAnimation and add the interpolator for QColorThierry Bastian2009-04-207-511/+29
| |
| * cleanup in demoThierry Bastian2009-04-205-96/+30
| | | | | | | | sub-attaq doesn't use anymore animation private headers
| * iterationCount becomes loopCount againThierry Bastian2009-04-2016-176/+175
| |
* | compileKent Hansen2009-04-211-34/+34
| |
* | rename QTransition -> QActionTransitionKent Hansen2009-04-2113-87/+88
| |
* | don't assert if the signal is not validKent Hansen2009-04-211-1/+2
| |
* | initialize "for-future-expansion"-pointerKent Hansen2009-04-201-1/+1
|/
* Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-04-201-3/+4
|\
| * Fix compilation after a merge errorAlexis Menard2009-04-171-3/+4
| |
* | docKent Hansen2009-04-2013-6/+25
| |
* | more docKent Hansen2009-04-173-8/+12
| |
* | docKent Hansen2009-04-174-4/+5
| |
* | compileKent Hansen2009-04-171-0/+2
| |
* | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-04-17971-37275/+18765
|\ \ | |/
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animationsAlexis Menard2009-04-17971-37275/+18765
| |\ | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| | * Even more cleanups on the Change Log.Kavindra Devi Palaraja2009-04-171-165/+185
| | | | | | | | | | | | | | | Reviewed-by: TrustMe BT: Yes
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Kavindra Devi Palaraja2009-04-177-178/+11
| | |\
| | | * Fix obsolete version number in docs.Jason McDonald2009-04-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace with %VERSION%, so we don't need to fix this for every release. Task-number: 251417 Reviewed-by: Trust Me
| | | * Fix obsolete version number in docs.Jason McDonald2009-04-171-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use %VERSION% so that we don't have to fix this for every release. Task-number: 251418 Reviewed-by: Trust Me