Skip to content

Commit

Permalink
Add The Masterplan
Browse files Browse the repository at this point in the history 
Update image file paths in css/haxe.io.css and styleguide/index.html
  • Loading branch information
@skial
skial committed Jun 26, 2014
1 parent 7eca12c commit 643c002
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 19 deletions.
28 changes: 14 additions & 14 deletions src/css/haxe.io.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -401,65 +401,65 @@ html[class="/"] footer {
}

#r201 {
background-image: linear-gradient(rgba(82,201,244,0.3),rgba(82,201,244,0.3)), url(/img/january-haxeflixel.png);
background-image: linear-gradient(rgba(82,201,244,0.3),rgba(82,201,244,0.3)), url(/img/201/january-haxeflixel.png);
}

#speaker_juraj {
background-image: linear-gradient(rgba(82,244,206,0.3),rgba(82,244,206,0.3)), url(/img/Juraj_Kirchheim_wwx_2013.jpg);
background-image: linear-gradient(rgba(82,244,206,0.3),rgba(82,244,206,0.3)), url(/img/wwx/2014/Juraj_Kirchheim_wwx_2013.jpg);
background-position: center;
}

#speaker_elliott {
background-image: linear-gradient(rgba(244,82,201,0.3),rgba(244,82,201,0.3)), url(/img/ElliottStoneham2014.jpg);
background-image: linear-gradient(rgba(244,82,201,0.3),rgba(244,82,201,0.3)), url(/img/wwx/2014/ElliottStoneham2014.jpg);
}

#speaker_justin {
background-image: linear-gradient(rgba(82,201,244,0.3),rgba(82,201,244,0.3)), url(/img/jjd-sailing.png);
background-image: linear-gradient(rgba(82,201,244,0.3),rgba(82,201,244,0.3)), url(/img/wwx/2014/jjd-sailing.png);
}

#speaker_caue {
background-image: linear-gradient(rgba(82,244,206,0.3),rgba(82,244,206,0.3)), url(/img/caue_waneck_wwx_2011_1.jpg);
background-image: linear-gradient(rgba(82,244,206,0.3),rgba(82,244,206,0.3)), url(/img/wwx/2014/caue_waneck_wwx_2011_1.jpg);
background-position: center;
}

#speaker_franco {
background-image: linear-gradient(rgba(244,82,201,0.3),rgba(244,82,201,0.3)), url(/img/franco_ponticelli_wwx_2011_3.jpg);
background-image: linear-gradient(rgba(244,82,201,0.3),rgba(244,82,201,0.3)), url(/img/wwx/2014/franco_ponticelli_wwx_2011_3.jpg);
}

#speaker_andreas {
background-image: linear-gradient(rgba(82,201,244,0.3),rgba(82,201,244,0.3)), url(/img/andreas_soderlund_wwx_2014.jpg);
background-image: linear-gradient(rgba(82,201,244,0.3),rgba(82,201,244,0.3)), url(/img/wwx/2014/andreas_soderlund_wwx_2014.jpg);
}

#speaker_hugh {
background-image: linear-gradient(rgba(82,244,206,0.3),rgba(82,244,206,0.3)), url(/img/hugh_sanderson_wwx_2012_3.jpg);
background-image: linear-gradient(rgba(82,244,206,0.3),rgba(82,244,206,0.3)), url(/img/wwx/2014/hugh_sanderson_wwx_2012_3.jpg);
background-position: center;
}

#r200 {
background-image: linear-gradient(rgba(244,82,201,0.3),rgba(244,82,201,0.3)), url(/img/BnXzIAqCMAEL5bc.png);
background-image: linear-gradient(rgba(244,82,201,0.3),rgba(244,82,201,0.3)), url(/img/200/kha.png);
background-position: center;
}

#r199 {
background-image: linear-gradient(rgba(82,201,244,0.3),rgba(82,201,244,0.3)), url(/img/haxor-knight.png);
background-image: linear-gradient(rgba(82,201,244,0.3),rgba(82,201,244,0.3)), url(/img/199/haxor-knight.png);
background-position: center;
}

#ld29 {
background-image: linear-gradient(rgba(82,244,206,0.3),rgba(82,244,206,0.3)), url(/img/ld-lich-king.png);
background-image: linear-gradient(rgba(82,244,206,0.3),rgba(82,244,206,0.3)), url(/img/ld/29/ld-lich-king.png);
}

#r198 {
background-image: linear-gradient(rgba(244,82,201,0.3),rgba(244,82,201,0.3)), url(/img/2982-shot1.png);
background-image: linear-gradient(rgba(244,82,201,0.3),rgba(244,82,201,0.3)), url(/img/198/beneath.png);
background-position: center;
}

#r197 {
background-image: linear-gradient(rgba(82,201,244,0.3),rgba(82,201,244,0.3)), url(/img/Bl5DTmyCUAAiNC7.png);
background-image: linear-gradient(rgba(82,201,244,0.3),rgba(82,201,244,0.3)), url(/img/197/netwars.png);
}

#r196 {
background-image: linear-gradient(rgba(82,244,206,0.3),rgba(82,244,206,0.3)), url(/img/BlWDWimCIAANSq0.png);
background-image: linear-gradient(rgba(82,244,206,0.3),rgba(82,244,206,0.3)), url(/img/196/alleycats.png);
}

@media all and (min-width: 700px) {
Expand Down
Binary file added src/img/206/masterplan.mp4
View file
Binary file not shown.
9 changes: 8 additions & 1 deletion src/roundups/206.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ the metrodark theme.

![haxe hide social](/img/206/hide.png "HIDE on Ubuntu with the metrodark and mbo themes")

The guys that make up the [Shark Punch][tw7] team who are working on The Masterplan have
just been [Greenlit][l16] on Steam!

![haxe masterplan](/img/206/masterplan.mp4 "The Masterplan")

I came across this article titled [Summary on the use of OpenFL engine][l15] which
describes OpenFL, the improvements that have been contributed by the author, _I think_,
and the current risks by using OpenFL.
Expand All @@ -61,6 +66,7 @@ Lets finish off with a demo of HaxeStudio `0.3.5` by [Pah Arif][tw6].
[tw4]: https://twitter.com/As3Boyan "@As3Boyan"
[tw5]: https://twitter.com/monsterfacegame "@monsterfacegame"
[tw6]: https://twitter.com/misterpah "@misterpah"
[tw7]: https://twitter.com/SharkPunchHQ "@SharkPunchHQ"

[g1]: https://plus.google.com/u/0/100705622302444765857 "Jonas Nyström on Google+"

Expand Down Expand Up @@ -89,4 +95,5 @@ Lets finish off with a demo of HaxeStudio `0.3.5` by [Pah Arif][tw6].
[l12]: https://twitter.com/Ohmnivorus/status/481902872356200448
[l13]: https://github.com/clemos/haxe-sublime-bundle#shortcuts "SublimeText Haxe Bundle on GitHub"
[l14]: https://plus.google.com/u/0/100705622302444765857/posts/MgpQAvRx7Ba "HIDE Praise!"
[l15]: http://www.programering.com/a/MjN3EDNwATk.html "Summary on the use of OpenFL engine"
[l15]: http://www.programering.com/a/MjN3EDNwATk.html "Summary on the use of OpenFL engine"
[l16]: http://steamcommunity.com/sharedfiles/filedetails/?id=270375424 "The Masterplan has been Greenlit!"
8 changes: 4 additions & 4 deletions src/styleguide/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ <h1 id="Images">Images</h1>
<figure class="grid-1">
<input type="checkbox" id="pic0" />
<label for="pic0">
<img alt="lich king img haxe social" src="/img/ld-lich-king.png" title="A Glorious Escape for A Lich King" />
<img alt="lich king img haxe social" src="/img/ld/29/ld-lich-king.png" title="A Glorious Escape for A Lich King" />
</label>
<figcaption>A Glorious Escape for A Lich King</figcaption>
</figure>
Expand All @@ -168,21 +168,21 @@ <h1 id="Images">Images</h1>
<figure class="grid-1-3">
<input type="checkbox" id="pic1" />
<label for="pic1">
<img alt="lich king img haxe social" src="/img/ld-lich-king.png" title="A Glorious Escape for A Lich King" />
<img alt="lich king img haxe social" src="/img/ld/29/ld-lich-king.png" title="A Glorious Escape for A Lich King" />
</label>
<figcaption>A Glorious Escape for A Lich King</figcaption>
</figure>
<figure class="grid-1-3">
<input type="checkbox" id="pic2" />
<label for="pic2">
<img alt="HaxeFlixel Haxe teaching students" src="/img/BnVihhcIgAEtXK1.jpg" title="HaxeFlixel being taught!" />
<img alt="HaxeFlixel Haxe teaching students" src="/img/200/teach.jpg" title="HaxeFlixel being taught!" />
</label>
<figcaption>HaxeFlixel being taught!</figcaption>
</figure>
<figure class="grid-1-3">
<input type="checkbox" id="pic3" />
<label for="pic3">
<img alt="Kha Haxe Frame Animation social" src="/img/BnXzIAqCMAEL5bc.png" title="Kha Frame Animation Demo" />
<img alt="Kha Haxe Frame Animation social" src="/img/200/kha.png" title="Kha Frame Animation Demo" />
</label>
<figcaption>Kha Frame Animation Demo</figcaption>
</figure>
Expand Down

0 comments on commit 643c002

Please sign in to comment.