Skip to content

Commit 3b14ad4

Browse files
committed
Merge branch 'master' into gh-pages
Conflicts: .gitignore bundle.js
2 parents b205b94 + f54262d commit 3b14ad4

File tree

19 files changed

+1163
-1032
lines changed

19 files changed

+1163
-1032
lines changed

.gitignore

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
node_modules/*
2-
!node_modules/splash-*
3-
node_modules/splash-*/node_modules
4-
node_modules/splash-*/.gitignore
5-
node_modules/splash-*/.npmignore
1+
node_modules
2+
build/*.json

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# stack.gl

build/examples.json

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,52 +15,76 @@
1515
"featured": false,
1616
"i": 1
1717
},
18+
{
19+
"name": "kami",
20+
"link": "https://github.com/mattdesl/kami",
21+
"desc": "",
22+
"thumb": "http://imgur.com/j5W3Tuw.png",
23+
"featured": false,
24+
"i": 2
25+
},
1826
{
1927
"name": "run.south.im",
2028
"link": "http://run.south.im/",
2129
"desc": "",
2230
"thumb": "http://imgur.com/kZjW5QD.png",
2331
"featured": false,
24-
"i": 2
32+
"i": 3
2533
},
2634
{
2735
"name": "nodesource.com",
2836
"link": "http://nodesource.com/",
2937
"desc": "",
3038
"thumb": "http://imgur.com/tCKuJfx.png",
3139
"featured": false,
32-
"i": 3
40+
"i": 4
3341
},
3442
{
3543
"name": "voxel-mipmap-demo",
3644
"link": "https://github.com/mikolalysenko/voxel-mipmap-demo/",
3745
"desc": "",
3846
"thumb": "http://imgur.com/9eUBmfB.png",
3947
"featured": false,
40-
"i": 4
48+
"i": 5
4149
},
4250
{
4351
"name": "raymarch",
4452
"link": "https://github.com/mikolalysenko/raymarch/",
4553
"desc": "",
4654
"thumb": "http://imgur.com/NpvsXIH.png",
4755
"featured": false,
48-
"i": 5
56+
"i": 6
57+
},
58+
{
59+
"name": "moire #1",
60+
"link": "http://hughsk.io/moire-1",
61+
"desc": "",
62+
"thumb": "http://imgur.com/9tbJfnF.png",
63+
"featured": false,
64+
"i": 7
65+
},
66+
{
67+
"name": "campjs.com",
68+
"link": "http://campjs.com/",
69+
"desc": "",
70+
"thumb": "http://imgur.com/d47Vesp.png",
71+
"featured": false,
72+
"i": 8
4973
},
5074
{
5175
"name": "particle-excess-demo",
5276
"link": "https://github.com/hughsk/particle-excess-demo/",
5377
"desc": "",
5478
"thumb": "http://imgur.com/YyrtLqM.png",
5579
"featured": false,
56-
"i": 6
80+
"i": 9
5781
},
5882
{
5983
"name": "web-audio-analyser",
6084
"link": "https://github.com/hughsk/web-audio-analyser/",
6185
"desc": "",
6286
"thumb": "http://imgur.com/xhPfMFP.png",
6387
"featured": false,
64-
"i": 7
88+
"i": 10
6589
}
6690
]

0 commit comments

Comments
 (0)