| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Minehunt and abstractitemmodel examples use QSGview
Snake now using Particles 2.0
Minor examples and twitter have updated imports
Removed duplicate delegate example
Change-Id: I04f8f8aeb8ef34ab2a8678ccc1d6d594b9db166e
Reviewed-on: http://codereview.qt.nokia.com/3630
Reviewed-by: Bea Lam <bea.lam@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
And remove many duplicate and obsolete files
Change-Id: I5416b2b276893d85233918b1a24a30659830d42e
Reviewed-on: http://codereview.qt.nokia.com/3623
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
Change-Id: I7181c3d26e85459597f06bba174885ced40ffe1d
Reviewed-on: http://codereview.qt.nokia.com/3618
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Also make abstractitemmodel example compile in 5.0 and
remove obsolete files.
Change-Id: Ic09f3878bb0b070e0f77398599d39952758acb8f
Reviewed-on: http://codereview.qt.nokia.com/3615
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
Change-Id: I187acb734e78552088b85503dd3542e1b1101944
Reviewed-on: http://codereview.qt.nokia.com/3556
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
Change-Id: Ib506f6b1daf431135c6608bdf1c5ea3afe08b213
Reviewed-on: http://codereview.qt.nokia.com/3551
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
Change-Id: If29cf056b37fbc45e29d81dac43414261aa74034
Reviewed-on: http://codereview.qt.nokia.com/3545
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|/
|
|
|
|
|
| |
Change-Id: I5ca6a459df532a5c551430f3f1029ec961a75233
Reviewed-on: http://codereview.qt.nokia.com/3441
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Avoid hiding the Item properties, which still have an effect.
Change-Id: I2449c376fe0f2c769792e4bb7b23899672cce5e1
Reviewed-on: http://codereview.qt.nokia.com/3837
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Attributes and a sample function are now prepended to the vertex shader,
allowing many to become simple again.
Change-Id: Ie1fbc864bd0d58647cb67994b96c2cb88db92f10
Reviewed-on: http://codereview.qt.nokia.com/3839
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Inverse proportionality is now properly named, direct proportionality
is added, and constant as well (in case they all just draw towards a
point).
Change-Id: I6187c0df908fdf20e2bb0b0a1007ebcc38dd3ac2
Reviewed-on: http://codereview.qt.nokia.com/3868
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
The signal is now on the Emitter/Affector base type, but only
emitted if connected to (to save creating the v8 object)
Change-Id: Ib5522e0f760caa17a6ad731b2dfbce9994a7664e
Reviewed-on: http://codereview.qt.nokia.com/3393
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
| |
Change-Id: I368acd65e9d352ecc04f4f7aaa3efc43d4530530
Reviewed-on: http://codereview.qt.nokia.com/3440
Reviewed-by: Charles Yin <charles.yin@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Implementation for tabled and above is different, coming in a later
commit.
Change-Id: I7ad16a173521bdcef4ddb68f594be7c942ddb505
Reviewed-on: http://codereview.qt.nokia.com/3280
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Added an attached property type to the base positioner class.
This allows items within a positioner (Row, Column, Grid, Flow) to
determine their index inside the positioner, as well as whether
they are the first or last items. Non-visible items are ignored,
as in the positioner layout objects themselves. It may be useful
to expand this in the future to contain more information specific
to the positioner, for example row/column for Grid.
Task-number: QTBUG-19211
Change-Id: I10a8c9ca5528dd12811125cae8a9b4d2e3747972
Reviewed-on: http://codereview.qt.nokia.com/2983
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Some of them weren't scaling well when in the examples launcher.
Change-Id: Ib6049fb5b3c9a99775008ae9072750c2424ad6ed
Reviewed-on: http://codereview.qt.nokia.com/2857
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
|
|
|
|
|
|
|
| |
Change-Id: I9045f9b76f7c681cf828aa60659abb4c6b521e11
Reviewed-on: http://codereview.qt.nokia.com/2856
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
|
|
|
|
|
|
|
| |
Change-Id: I8498b2e574a32bfbab9f139e718424572b1258a0
Reviewed-on: http://codereview.qt.nokia.com/2855
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
|
|
|
|
|
|
|
|
|
|
| |
A little more imperative with dialogs controlled from script, but better
separation of GameArea and UI. Also removes old highscore script that
was never used.
Change-Id: Ib244acc90b0fc92b3a6534169e429b6acef0838e
Reviewed-on: http://codereview.qt.nokia.com/2798
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: Ie6a7e825afac9a969a71487b93800180ff3be90d
Reviewed-on: http://codereview.qt.nokia.com/2532
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
|
|
|
| |
The example is interesting as debugging tool too.
Change-Id: I9ba69a85f21b776bbfcc65469c8a0e90426f21fd
Reviewed-on: http://codereview.qt.nokia.com/2495
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: I4e6b068ca9ceb0b7f76a6548d1b7a8789bc4bf39
Reviewed-on: http://codereview.qt.nokia.com/2237
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The ShaderEffectItem was renamed to ShaderEffect to be consistent
with other QML element names. The GLSL uniform variable
qt_ModelViewProjectionMatrix was renamed to qt_Matrix which is
easier to type and remember. The GridMesh element was removed.
The mesh resolution is now specified simply with a QSize.
To make the transition easier, the old API will continue to work
for some time, but will output warnings if used. Eventually, I
will remove the old API completely.
Change-Id: Iec4f2aa624a2c76a7db6750c58f73dbcb316ab6a
Reviewed-on: http://codereview.qt.nokia.com/2270
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Adds the current position, velocity and acceleration.
While we're at it, renaming the velocity vars from sx,sy to vx,vy
Change-Id: I87f582169c7873c45a6fd453052b25c4dc940f3e
Reviewed-on: http://codereview.qt.nokia.com/2021
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
|
|
| |
Currently basic and can't access all properties.
Change-Id: I66efc235112cffcf1a3ca5cc69099a5d09ec7691
Reviewed-on: http://codereview.qt.nokia.com/1950
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
| |
Change-Id: Ie79859af8572c3c79185d98c54c2aae35190d257
Reviewed-on: http://codereview.qt.nokia.com/1908
Reviewed-by: Charles Yin <charles.yin@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Seems to work fine.
Change-Id: I2da6487a6b3a5dc9ce1fb2036450ef0a0588430f
Reviewed-on: http://codereview.qt.nokia.com/2149
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: I7e92414d397b8a0bfdd514c9045677cd00422263
Reviewed-on: http://codereview.qt.nokia.com/1627
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: I11ea38fc87373604debd469e03af3447b8adcecb
Reviewed-on: http://codereview.qt.nokia.com/985
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
| |
Change-Id: I72aacfcb72b90d4d18f95cef3038a169c991a336
Reviewed-on: http://codereview.qt.nokia.com/1480
Reviewed-by: Charles Yin <charles.yin@nokia.com>
|
|
|
|
|
|
| |
Change-Id: I41a280de2739ee08202f4be2519e5012870090f2
Reviewed-on: http://codereview.qt.nokia.com/1391
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
1. Only allow the context API calls inside onPaint() slot function,
makes the context2d handle invalid when out of scope.
2. requestPaint() method supports region parameter
3. Emit paint() signal in updatePolish() function to allow
threaded scene graph rendering work properly with context2d api
4. Allow request painting mutiple dirty regions between 2 frames.
5. Add svgpath for context2d
Change-Id: I5ec48f7c0eb6820d5c9c16a8d0dcc0aae8d0fd2f
Reviewed-on: http://codereview.qt.nokia.com/1465
Reviewed-by: Charles Yin <charles.yin@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: I21f935b6de8bdf6a5205f6048cdabf97e16b613a
Reviewed-on: http://codereview.qt.nokia.com/1060
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/declarative/qml/qdeclarativescarceresourcescriptclass.cpp
src/declarative/qml/qdeclarativescarceresourcescriptclass_p.h
Change-Id: I54e579307cbeafbbad21884218c5e797ba245c8b
|
| |
| |
| |
| |
| |
| |
| | |
Change-Id: I8a797b85f88370c6ddfe64d40a6888aba06998d7
Reviewed-on: http://codereview.qt.nokia.com/693
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
|
| |
| |
| |
| | |
Change-Id: I901532eafabc0344f3978c0093ee56ed230c74b0
|
| |
| |
| |
| | |
Change-Id: Ia54b5fd842d13c15c7914d1a1e6b2b2d5718bf81
|
| |
| |
| |
| |
| |
| |
| |
| | |
Replace old license header with correct one.
Change-Id: I492ddaaa0227b2c8faf11bdcd6e12e7231a54a10
Reviewed-on: http://codereview.qt.nokia.com/1312
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
Change-Id: I094383099bf116357a3bb6eed0052d6d14408558
Reviewed-on: http://codereview.qt.nokia.com/1059
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add TargetAffector
Fix for ParticlePainter offsets
Adds a particleStates property to ParticleSystem
Augment SpriteGoal to change system states as well
Also add 'collidingParticles' list to affector.
Particle Stochastic States Now actually working, and you can put
emitters, affectors and painters inside their targeted state.
Fireworks example uses states instead of delegates.
Replaced the delegate example with a text thing.
The examples launcher now also contains all the custom examples.
Adds CumulativeDirection and working null Affector (for affected
signal).
Add spaces after all flow control keywords.
Change-Id: I77b7e3044a9800dbfff6db833914d63127602cf5
Reviewed-on: http://codereview.qt.nokia.com/968
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
|
| |
And might do it again...
Caught up in this massive change were the following smaller ones:
-Some custom particle examples
-delegate property on ItemParticle and an example with it
|
|
|
|
| |
Also add burst(n,x,y) to ParticleEmitter, and a demo that uses both.
|
|
|
|
|
|
|
| |
Provides an area that can be used to handle events when other items are
dragged over it.
Task-number: QMLNG-32
|
|\
| |
| |
| |
| | |
Conflicts:
src/declarative/qml/qdeclarativeengine.cpp
|
| | |
|
| | |
|
| |
| |
| |
| | |
Functionality has been moved into qt_example.prf
|
| |
| |
| |
| | |
Change-Id: I75fd903e6a8160210652c2cec3c4636e908a9ade
|
| |
| |
| |
| |
| |
| | |
Not sure why it is here, but it shouldn't be.
Change-Id: I1a2f9cc994de13690bbc77d41005051e340291f7
|
| |
| |
| |
| |
| |
| | |
qtdeclarative should not depend on webkit.
Change-Id: I82e3f49dbe710e408c1a74911787541a9ea9efa1
|