summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Warwick Allison2009-05-151-0/+1
|\ | | | | | | kinetic-declarativeui
| * compile (rand())Warwick Allison2009-05-151-0/+1
| |
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Warwick Allison2009-05-157-2/+250
|\ \ | |/ | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/gui/graphicsview/qgraphicsscene.cpp
| * Merge branch 'master' of ../master into contiguouscacheIan Walters2009-05-1436-76/+93
| |\
| | * Merge commit 'origin/4.5'Olivier Goffart2009-05-132-2/+22
| | |\
| | | * Adding documentation to the fancy browser exampleMorten Engvoldsen2009-05-122-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added documentation to the fancy browser example. Task-number:252097 Rev-by: Geir Vattekar Rev-by: Ariya Hidayat
| * | | Merge branch 'master' into contiguouscacheIan Walters2009-05-1236-46/+1471
| |\ \ \
| * | | | Update licensing headers.Ian Walters2009-04-073-0/+121
| | | | | | | | | | | | | | | | | | | | | | | | | Update files to have consistent licencesing with the rest of Qt.
| * | | | Merge branch 'master' into contiguouscacheIan Walters2009-04-0619-15/+1233
| |\ \ \ \
| * | | | | Rename OffsetVector to ContiguousCacheIan Walters2009-04-036-12/+12
| | | | | |
| * | | | | Squashed commit of the following:Rhys Weatherley2009-03-245-0/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 39de3862f5678b3226b4932eeb342c4a023d2f2b Author: Ian Walters <ian.walters@nokia.com> Date: Thu Feb 19 14:16:05 2009 +1000 Fixes: Test runs (and passes), doc links. Task: QT-308 Details: Minor changes related to the code having moved. commit 5a8910dd1018fb228d0e2e2819ea429577bfa834 Author: Ian Walters <ian.walters@nokia.com> Date: Thu Feb 19 09:47:20 2009 +1000 Fixes: Checkin of QOffsetVector stuff for branch Task: QT-308 Details: Files originally from research/qcircularbuffer This checkin likely won't compile. Just a copy for now.
* | | | | | spelWarwick Allison2009-05-132-2/+2
| | | | | |
* | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Alexis Menard2009-05-1236-79/+84
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | kinetic-declarativeui
| * | | | | Replace all instances of "Ctrl+Q" with QKeySequence::Quit.Norwegian Rock Cat2009-05-1234-74/+71
| | |_|/ / | |/| | | | | | | | | | | | | We introduce this new enum, we should be using it.
| * | | | Merge branch '4.5'Thiago Macieira2009-05-112-5/+13
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Only link against opengles .LIB files if on WinCETom Cooksey2009-05-111-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 251685 Reviewed-by: mauricek
| | * | | Fixing hellogl_es2 for Windows CEThomas Hartmann2009-05-081-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We hardcode the lib names for 4.5 Reviewed-by: Maurice
* | | | | Join some lines in examples.Martin Jones2009-05-117-237/+77
| | | | |
* | | | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2009-05-0760-252/+1855
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: src/corelib/animation/qabstractanimation.cpp src/corelib/animation/qabstractanimation_p.h src/corelib/animation/qpropertyanimation.cpp
| * | | | | Instead of adding animations for all properties to all transitions, we useEskil Abrahamsen Blomfeldt2009-05-061-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | the default animation concept, since this is its intended use.
| * | | | | Add chase state and ability to detect and fire at other tanks. This reveals anEskil Abrahamsen Blomfeldt2009-05-062-4/+92
| | | | | | | | | | | | | | | | | | | | | | | | assert in the state machine which needs to be debugged.
| * | | | | Avoid passage where the walls meet the edge of the scene rect.Eskil Abrahamsen Blomfeldt2009-05-061-5/+6
| | | | | |
| * | | | | get rid of marginKent Hansen2009-05-051-1/+2
| | | | | |
| * | | | | add event as argument to onEntry(), onExit() and onTransition()Kent Hansen2009-05-0515-50/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accessing the event can be useful. E.g., onEntry() can do some common event processing regardless of which transition caused the state to be entered; onTransition() can be used in combination with eventTest(), where eventTest() would first check that the input matches some criteria, and then the actual processing of that input would be done in onTransition.
| * | | | | Add randomness.Eskil Abrahamsen Blomfeldt2009-05-051-2/+2
| | | | | |
| * | | | | Make sure target state is set correctly. Also make sure eventTest() actuallyEskil Abrahamsen Blomfeldt2009-05-051-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | overrides the virtual function.
| * | | | | Set collidedLine for the implicit walls around the scene to allow for collisionEskil Abrahamsen Blomfeldt2009-05-051-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | response.
| * | | | | Make sure the correct position/direction is actually set at the end of aEskil Abrahamsen Blomfeldt2009-05-051-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | loop. Also make sure we set the direction to an angle within 360 degrees.
| * | | | | Fix support reverse actions. Logic was broken and would always return falseEskil Abrahamsen Blomfeldt2009-05-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | immediately for reverse actions, thus immediately stopping them.
| * | | | | Add unfinished "more advanced" AI for errorstate.Eskil Abrahamsen Blomfeldt2009-04-306-5/+184
| | | | | |
| * | | | | Make design better. Remove the Tank interface. This is now an implicit interfaceEskil Abrahamsen Blomfeldt2009-04-3016-86/+65
| | | | | | | | | | | | | | | | | | | | | | | | based on the meta-object system.
| * | | | | Add two AIs: They are both designed to do the same. Spin until they see a tankEskil Abrahamsen Blomfeldt2009-04-3014-26/+262
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and then fire. One of them has an error, which causes it to enter its error state. The errorstate example has been changed to handle this by disabling the tank. The rest of the tanks will keep working.
| * | | | | kill QStateMachine::animationsFinished(), introduce QState::polished()Kent Hansen2009-04-291-2/+2
| | | | | |
| * | | | | Compile against new QState::ChildMode API.Eskil Abrahamsen Blomfeldt2009-04-291-1/+1
| | | | | |
| * | | | | Kill gameOver signal as it was only used when you clicked the stop actionEskil Abrahamsen Blomfeldt2009-04-292-9/+6
| | | | | |
| * | | | | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-04-2921-117/+370
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/animation/sub-attaq/states.cpp
| | * | | | | Build fix for mingwThierry Bastian2009-04-2718-54/+52
| | | | | | |
| | * | | | | Add an OSD to display game progress in the sceneAlexis Menard2009-04-2411-65/+320
| | | | | | |
| * | | | | | replace QState::Type with QState::childMode propertyKent Hansen2009-04-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Result of API review.
| * | | | | | Adapt to recent API changes and bug fixes.Eskil Abrahamsen Blomfeldt2009-04-291-2/+6
| | | | | | |
| * | | | | | modifiers --> modifiersMaskKent Hansen2009-04-291-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Result of API review. A == comparison of the modifiers is not useful. The common case is you want to test if one or more modifiers are set, i.e. a mask check.
| * | | | | | make history state constructibleKent Hansen2009-04-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decided in API review. The intention of QHistoryState not being constructible was so that people wouldn't subclass it and reimplement onEntry()/onExit(), thinking that those functions would actually get called (which they won't). However, we recently added the entered() signal to QAbstractState, so people are going to connect to it and ask why they never get the signal for a QHistoryState. We might as well make QHistoryState constructible and just document that it doesn't make sense to subclass it.
| * | | | | | say hello (again) to QAbstract{State,Transition}::machine()Kent Hansen2009-04-292-37/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It's useful and it's simple for us to expose, so let's.
| * | | | | | Work around an oddity in parallel states that causes all regions to exitEskil Abrahamsen Blomfeldt2009-04-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if there is a transition from one of them (even if the target state of the transition is inside the region.)
| * | | | | | Some updates to the errorstate example.Eskil Abrahamsen Blomfeldt2009-04-2812-126/+270
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added cannon firing. There are some problems left: For some reason the parallel state group does not work properly, so only one tank moves even if you add more. There also seems to be something wrong with historyState->setDefaultState().
| * | | | | | compile after api changesKent Hansen2009-04-283-8/+8
| | | | | | |
| * | | | | | Really broken plugin for errorState. Don't try to use this yet, it doesn'tEskil Abrahamsen Blomfeldt2009-04-243-0/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | work at all.
| * | | | | | Unfinished tank AI game. The idea is that you plug in AIs for the tanks, andEskil Abrahamsen Blomfeldt2009-04-248-0/+619
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | one such plugin will have a run time error, so the game server needs to use errorState for handling errors.
| * | | | | Merge branch 'kinetic-statemachine' into kinetic-animationsKent Hansen2009-04-248-27/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/animation/piemenu/qgraphicspiemenu_p.h
| | * | | | | Remove API for setting specific restore policies on states. We have no clearEskil Abrahamsen Blomfeldt2009-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
generated by cgit v0.12 at 2025-02-13 14:55:54 (GMT)