aboutsummaryrefslogtreecommitdiffstats
path: root/src/particles
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.7' into 5.8Simon Hausmann2016-11-151-2/+4
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-151-2/+4
| |\
| | * Fix crash when using custom OpenGL functionsJesus Fernandez2016-11-071-2/+4
* | | QML: Make Heap::Object and all subclasses trivialErik Verbruggen2016-10-061-3/+4
* | | Merge dev into 5.8Oswald Buddenhagen2016-08-221-1/+2
|\ \ \
| * | | Particles: fix incorrect usage of 'range for' with Qt containersAnton Kudryavtsev2016-08-201-1/+2
* | | | Have proper OpenGL checks in QQuickFBO and image particlesLaszlo Agocs2016-08-181-0/+10
|/ / /
* | | Private export the Particle EmitterAriel Molina2016-08-121-1/+1
* | | QtQuick: fix use-after-free of shader property connectionsErik Verbruggen2016-07-111-1/+1
* | | QtQuick: clean up shader effect property connectionsErik Verbruggen2016-07-052-8/+13
* | | Merge remote-tracking branch 'origin/dev' into HEADLaszlo Agocs2016-05-241-1/+1
|\| |
| * | V4: allow inlining of ExecutionEngine::{qml,js}Engine()Erik Verbruggen2016-05-201-1/+1
* | | Merge remote-tracking branch 'origin/dev' into wip/scenegraphngLaszlo Agocs2016-05-243-5/+9
|\| |
| * | Particles: Invalidate all group IDs when groups are reset.Erik Verbruggen2016-04-282-3/+9
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-271-2/+0
| |\|
| | * Drop the class name from shader effect material keysUlf Hermann2016-04-201-2/+0
* | | Add the skeleton for the new, more generic shader effect implLaszlo Agocs2016-04-131-0/+1
* | | Prefix GL-specific shader effect codeLaszlo Agocs2016-04-132-21/+21
|/ /
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-081-0/+0
|\|
| * Purge sRGB chunks from PNG.Edward Welbourne2016-03-241-0/+0
* | Replace qQNaN() and friends with qt_qnan().Erik Verbruggen2016-04-051-2/+3
* | Particles: half the number of calls to emittersChanged.Erik Verbruggen2016-03-083-1/+9
* | Particles: factor out t^2.Erik Verbruggen2016-03-081-12/+20
* | Particles: consistently use floats for particle data calculations.Erik Verbruggen2016-03-082-64/+64
* | Particles: make many QQuickParticleData members inlinable.Erik Verbruggen2016-03-082-109/+105
* | Particles: replace a QSet<int> with a bit vector for group data.Erik Verbruggen2016-03-082-10/+70
* | Particles: Shrink QQuickParticleData by 2 pointers.Erik Verbruggen2016-03-0818-186/+183
* | Particles: reduce excessive hash accesses to a more passable level.Erik Verbruggen2016-03-0410-92/+192
* | Particles: inline 4 methods.Erik Verbruggen2016-03-044-46/+27
* | Particles: code clean-up.Erik Verbruggen2016-03-046-36/+69
* | Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-03-011-3/+3
|\|
| * standardize statement order in project files a bitOswald Buddenhagen2016-02-251-2/+1
| * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-251-1/+2
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-02-121-1/+1
|\|
| * Fix negative emitRate causing app to hangMitch Curtis2016-02-041-1/+1
* | Updated license headersJani Heikkinen2016-01-1961-854/+1220
* | Particles: fix expensive iteration over QHash::keys()Anton Kudryavtsev2016-01-182-5/+9
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-101-2/+2
|\|
| * Fix typos in ParticleSystem documentationMitch Curtis2016-01-041-2/+2
* | QtDeclarative: use prefix ++/-- for iterator typesAnton Kudryavtsev2016-01-091-1/+1
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-181-5/+5
|\|
| * Particle Turbulence image now reads correctly from QRC or local filesAriel Molina2015-12-081-1/+2
| * Turbulence was accidentally deactivated on geometry changedAriel Molina2015-12-081-1/+0
| * Correct heightmap values for TurbulenceAriel Molina2015-12-071-3/+3
* | Replace all occurrences of qSNaN() with qQNaN()Ulf Hermann2015-12-071-2/+2
* | Private export the ParticleSystem and AffectorAriel Molina R2015-11-242-5/+7
|/
* Add missing "We mean it" comments to private headers.Friedemann Kleint2015-10-0631-0/+341
* Move remaining objects to new constructor syntaxLars Knoll2015-09-221-4/+3
* Merge remote-tracking branch 'origin/5.5' into 5.6Ulf Hermann2015-08-181-1/+1
|\
| * Doc: replace Mac OS X with OS XNico Vertriest2015-07-151-1/+1