Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add an OSD to display game progress in the scene | Alexis Menard | 2009-04-24 | 11 | -65/+320 |
| | |||||
* | Merge branch 'kinetic-statemachine' into kinetic-animations | Kent Hansen | 2009-04-24 | 42 | -2484/+1178 |
|\ | | | | | | | | | Conflicts: examples/animation/piemenu/qgraphicspiemenu_p.h | ||||
| * | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-04-24 | 1 | -4/+4 |
| |\ | |||||
| * | | Remove API for setting specific restore policies on states. We have no clear | Eskil Abrahamsen Blomfeldt | 2009-04-23 | 9 | -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 Blomfeldt | 2009-04-23 | 1 | -2/+0 |
| | | | |||||
| * | | Remove specific RestorePolicy per state from example. The semantics for this | Eskil Abrahamsen Blomfeldt | 2009-04-23 | 3 | -15/+0 |
| | | | | | | | | | | | | | | | have changed to something which is more intuitive, so it is no longer useful for this case. | ||||
| * | | kill the stateactions api | Kent Hansen | 2009-04-22 | 36 | -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 of | Eskil Abrahamsen Blomfeldt | 2009-04-22 | 1 | -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* API | Eskil Abrahamsen Blomfeldt | 2009-04-22 | 1 | -0/+127 |
| | | | |||||
| * | | Add API for adding default animations to the state machine. This is especially | Eskil Abrahamsen Blomfeldt | 2009-04-21 | 4 | -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 tests | Eskil Abrahamsen Blomfeldt | 2009-04-21 | 3 | -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 Blomfeldt | 2009-04-21 | 1 | -1/+2 |
| | | | |||||
| * | | Have QState::addTransition(QAbstractTransition*) return the transition object | Eskil Abrahamsen Blomfeldt | 2009-04-21 | 2 | -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 Blomfeldt | 2009-04-21 | 1 | -3/+3 |
| | | | |||||
* | | | Fix a bug in the ease{In,Out}Bounce easing functions + small cleanup. | Jan-Arve Sæther | 2009-04-23 | 2 | -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 whitespace | Jan-Arve Sæther | 2009-04-23 | 1 | -8/+8 |
| | | | |||||
* | | | Remove trailing whitespace | Jan-Arve Sæther | 2009-04-23 | 1 | -32/+32 |
| | | | |||||
* | | | Moved the animation examples piemenu and photobrowser to examples/research | Leonardo Sobral Cunha | 2009-04-23 | 16 | -0/+0 |
| | | | |||||
* | | | Update copyright headers of animation examples | Leonardo Sobral Cunha | 2009-04-23 | 54 | -110/+1937 |
| | | | |||||
* | | | Fixes QPropertyAnimation's default start value update condition | Leonardo Sobral Cunha | 2009-04-22 | 3 | -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æther | 2009-04-22 | 7 | -54/+89 |
| | | | |||||
* | | | Expose QVariantAnimationPrivate::getInterpolator in the private header | Leonardo Sobral Cunha | 2009-04-21 | 2 | -2/+4 |
| | | | | | | | | | | | | These interpolator functions might be useful for other internal classes. | ||||
* | | | QPropertyAnimation reevaluates the default start value after each run | Leonardo Sobral Cunha | 2009-04-21 | 3 | -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 renaming | Kent Hansen | 2009-04-21 | 1 | -4/+4 |
|/ | |||||
* | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-04-21 | 2 | -1/+36 |
|\ | |||||
| * | Fixes bug when adding the same child animation twice to the same group | Leonardo Sobral Cunha | 2009-04-21 | 2 | -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 header | Kent Hansen | 2009-04-21 | 2 | -2/+2 |
| | | |||||
* | | compile | Eskil B | 2009-04-21 | 1 | -63/+48 |
| | | |||||
* | | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-04-21 | 27 | -782/+233 |
|\ \ | |/ | |||||
| * | don't assert if the signal is not valid | Kent Hansen | 2009-04-21 | 1 | -1/+2 |
| | | |||||
| * | compile fix | Thierry Bastian | 2009-04-20 | 1 | -1/+1 |
| | | |||||
| * | remove QItemAnimation and add the interpolator for QColor | Thierry Bastian | 2009-04-20 | 7 | -511/+29 |
| | | |||||
| * | cleanup in demo | Thierry Bastian | 2009-04-20 | 5 | -96/+30 |
| | | | | | | | | sub-attaq doesn't use anymore animation private headers | ||||
| * | iterationCount becomes loopCount again | Thierry Bastian | 2009-04-20 | 16 | -176/+175 |
| | | |||||
* | | compile | Kent Hansen | 2009-04-21 | 1 | -34/+34 |
| | | |||||
* | | rename QTransition -> QActionTransition | Kent Hansen | 2009-04-21 | 13 | -87/+88 |
| | | |||||
* | | don't assert if the signal is not valid | Kent Hansen | 2009-04-21 | 1 | -1/+2 |
| | | |||||
* | | initialize "for-future-expansion"-pointer | Kent Hansen | 2009-04-20 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-04-20 | 1 | -3/+4 |
|\ | |||||
| * | Fix compilation after a merge error | Alexis Menard | 2009-04-17 | 1 | -3/+4 |
| | | |||||
* | | doc | Kent Hansen | 2009-04-20 | 13 | -6/+25 |
| | | |||||
* | | more doc | Kent Hansen | 2009-04-17 | 3 | -8/+12 |
| | | |||||
* | | doc | Kent Hansen | 2009-04-17 | 4 | -4/+5 |
| | | |||||
* | | compile | Kent Hansen | 2009-04-17 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-04-17 | 971 | -37275/+18765 |
|\ \ | |/ | |||||
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animations | Alexis Menard | 2009-04-17 | 971 | -37275/+18765 |
| |\ | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp | ||||
| | * | Even more cleanups on the Change Log. | Kavindra Devi Palaraja | 2009-04-17 | 1 | -165/+185 |
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe BT: Yes | ||||
| | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Kavindra Devi Palaraja | 2009-04-17 | 7 | -178/+11 |
| | |\ | |||||
| | | * | Fix obsolete version number in docs. | Jason McDonald | 2009-04-17 | 1 | -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 McDonald | 2009-04-17 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use %VERSION% so that we don't have to fix this for every release. Task-number: 251418 Reviewed-by: Trust Me |