Commit Graph

738 Commits

Author SHA1 Message Date
Francisco Dans
224c14783f style 2015-01-08 18:33:12 +01:00
Francisco Dans
b95ab3bac5 refactors icon preloading to its own private method 2015-01-08 18:27:53 +01:00
Francisco Dans
45e577c872 defaults to point rendering in case marker-file errors, shows error in console 2015-01-08 18:09:55 +01:00
Francisco Dans
434684df09 removes a check I added previously by accident 2015-01-08 17:57:12 +01:00
Francisco Dans
4d596066df changes carto dependency declaration to master 2015-01-08 17:55:10 +01:00
Francisco Dans
368f5b1526 merge 2015-01-08 16:51:21 +01:00
Francisco Dans
b295bdbd5f fixes method call 2015-01-08 16:45:09 +01:00
Francisco Dans
d1c224ff13 preloads all icons before the animation is started 2015-01-08 16:25:42 +01:00
Francisco Dans
8241bd6c8c removes getIcons call 2015-01-08 16:25:02 +01:00
Francisco Dans
91b056329b removes regex icon parsing 2015-01-08 15:54:42 +01:00
Francisco Dans
37c35732d7 loads async icon files as they are needed 2015-01-07 17:42:50 +01:00
Francisco Dans
1113a100d1 gets icon filenames via regex 2015-01-07 17:42:19 +01:00
Francisco Dans
06ed46f6b8 extends events in pointrenderer 2015-01-07 17:41:37 +01:00
Francisco Dans
d98402d9cd adds icon preload before animation 2015-01-05 16:54:53 +01:00
Francisco Dans
5dc39a5e32 only start animator if assets are ready 2015-01-05 16:54:14 +01:00
Francisco Dans
3c41470d7a adjusts tile xy value when coordinates are out of bounds 2015-01-05 11:15:18 +01:00
Francisco Dans
c21c715bf4 removes img name declaration from condition statement 2015-01-02 10:43:43 +01:00
Francisco Dans
e9cece69bd 🐴 2014-12-30 15:37:10 +01:00
Francisco Dans
a30d5fc269 changes drawImage call to align svgs centre-centre 2014-12-30 15:33:40 +01:00
Francisco Dans
fc3584b01f saves svg icons in an object instead of loading them with every draw 2014-12-30 12:42:46 +01:00
Francisco Dans
2f8443fe6e removes ratio, since it'll never be called 2014-12-30 11:00:26 +01:00
Francisco Dans
ead86bad00 makes image object instead of passing just the name 2014-12-30 10:53:46 +01:00
Raul Ochoa
3cdd89ab24 Build latest changes 2014-12-19 11:01:04 +01:00
javi
731206090a fixed property name 2014-12-19 10:12:40 +01:00
javi
2074a720a1 merged 2014-12-19 09:33:31 +01:00
javi
1d5414a31d updated version 2014-12-19 09:32:35 +01:00
javi
994aeedf95 replaces line-color with marke prefixed 2014-12-19 09:30:43 +01:00
javi
05e1137fe9 added marker-width 2014-12-19 08:00:37 +01:00
javi
b4330f68a6 fixed stroke 2014-12-19 08:00:19 +01:00
Raul Ochoa
728136d964 Merge pull request #75 from CartoDB/74-instantiate-windshaft-provider-without-fetchmap
Adds option to not fetch map when instantiating a windshaft provider
2014-12-18 18:40:16 +01:00
Raul Ochoa
9c5c290c4e Adds option to not fetch map when instantiating a windshaft provider.
Closes #74
2014-12-18 17:10:37 +01:00
javi santana
20b88a72ff Merge pull request #73 from CartoDB/fix-marker-opacity
Fix marker fill opacity
2014-12-17 15:36:57 +01:00
Raul Ochoa
50605303f1 Fix marker fill opacity
Fixes #72
2014-12-17 15:34:45 +01:00
javi santana
2e79d7ee90 Merge pull request #71 from CartoDB/clear_color
Clear color
2014-12-17 11:44:25 +01:00
javi
27bba39f07 cartoons -> global composite operation mapping 2014-12-17 11:22:19 +01:00
javi
c3b159b64d use a function to transform comp-op to composite operation 2014-12-17 08:48:23 +01:00
javi
e9f738914c fixes cartocss comp-op conversion and adds clear color :D 2014-12-17 08:31:46 +01:00
Francisco Dans
d25011681a Merge pull request #69 from CartoDB/68-fix_extra_frame
check loop condition before render
2014-12-16 18:34:29 +01:00
javi santana
90de3db461 Merge pull request #70 from CartoDB/loop-by-default
Loop by default
2014-12-16 18:31:25 +01:00
Francisco Dans
68c68f3a02 reverts changes to dist in d82fe9d057 2014-12-16 18:29:59 +01:00
Francisco Dans
495082c29e Merge branch 'master' of https://github.com/cartodb/torque into loop-by-default 2014-12-16 18:25:38 +01:00
Francisco Dans
b1f6a46e8e uses proper condition for animation loop 2014-12-16 18:04:40 +01:00
Francisco Dans
08b66b3119 removes stupid console.log 2014-12-16 17:54:13 +01:00
Francisco Dans
d82fe9d057 sets loop to true by default 2014-12-16 17:52:17 +01:00
javi
8a8455922d check loop condition before render 2014-12-16 17:42:35 +01:00
Francisco Dans
f002f3d9d4 Merge pull request #67 from CartoDB/loop-option-14
Adding functionality to the loop option
2014-12-16 10:33:05 +01:00
Francisco Dans
43a3c64d21 uses stop function instead of pause to prevent looping 2014-12-16 09:45:23 +01:00
Francisco Dans
88ea3bee66 pauses animation at end if loop is false 2014-12-15 16:05:51 +01:00
Francisco Dans
ba1ae9856c adds loop option to gui 2014-12-15 16:04:53 +01:00
Raul Ochoa
a3916038e1 Merge pull request #66 from CartoDB/browserify
Library browserify
2014-12-11 16:56:49 +01:00