diff --git a/CREDITS.md b/CREDITS.md index e46f8bc28..3e3b2c363 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -1,14 +1,17 @@ Programming Alec "Aloshi" Lofquist - http://www.aloshi.com +UI Art & Design + Nils Bonenberger -Resources + +Libraries ========= PugiXML http://pugixml.org/ -SDL 1.2 +SDL 2 http://www.libsdl.org/ FreeImage @@ -16,3 +19,16 @@ FreeImage FreeType http://www.freetype.org + +cURL + http://curl.haxx.se/ + +Boost + http://www.boost.org/ + + +Resources +========= + +Open Sans font + http://www.google.com/fonts/specimen/Open+Sans \ No newline at end of file diff --git a/data/converted/on_svg.cpp b/data/converted/on_svg.cpp index a8c533a3f..7e3143077 100644 --- a/data/converted/on_svg.cpp +++ b/data/converted/on_svg.cpp @@ -2,8 +2,8 @@ #include "../Resources.h" -const size_t on_svg_size = 1148; -const unsigned char on_svg_data[1148] = { +const size_t on_svg_size = 1146; +const unsigned char on_svg_data[1146] = { 0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73, 0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20, 0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22, @@ -55,68 +55,68 @@ const unsigned char on_svg_data[1148] = { 0x22,0x70,0x72,0x65,0x73,0x65,0x72,0x76,0x65,0x22, 0x3e,0x0d,0x0a,0x3c,0x67,0x3e,0x0d,0x0a,0x09,0x3c, 0x70,0x61,0x74,0x68,0x20,0x66,0x69,0x6c,0x6c,0x3d, - 0x22,0x23,0x46,0x46,0x46,0x46,0x46,0x46,0x22,0x20, - 0x64,0x3d,0x22,0x4d,0x33,0x39,0x2e,0x36,0x36,0x34, - 0x2c,0x30,0x48,0x34,0x2e,0x32,0x35,0x32,0x43,0x31, - 0x2e,0x39,0x31,0x34,0x2c,0x30,0x2c,0x30,0x2c,0x31, - 0x2e,0x39,0x31,0x34,0x2c,0x30,0x2c,0x34,0x2e,0x32, - 0x35,0x32,0x76,0x31,0x33,0x2e,0x34,0x35,0x35,0x63, - 0x30,0x2c,0x32,0x2e,0x33,0x33,0x39,0x2c,0x31,0x2e, - 0x39,0x31,0x34,0x2c,0x34,0x2e,0x32,0x35,0x32,0x2c, - 0x34,0x2e,0x32,0x35,0x32,0x2c,0x34,0x2e,0x32,0x35, - 0x32,0x68,0x33,0x35,0x2e,0x34,0x31,0x32,0x0d,0x0a, - 0x09,0x09,0x63,0x32,0x2e,0x33,0x33,0x39,0x2c,0x30, - 0x2c,0x34,0x2e,0x32,0x35,0x32,0x2d,0x31,0x2e,0x39, - 0x31,0x33,0x2c,0x34,0x2e,0x32,0x35,0x32,0x2d,0x34, - 0x2e,0x32,0x35,0x32,0x56,0x34,0x2e,0x32,0x35,0x32, - 0x43,0x34,0x33,0x2e,0x39,0x31,0x36,0x2c,0x31,0x2e, - 0x39,0x31,0x34,0x2c,0x34,0x32,0x2e,0x30,0x30,0x33, - 0x2c,0x30,0x2c,0x33,0x39,0x2e,0x36,0x36,0x34,0x2c, - 0x30,0x4c,0x33,0x39,0x2e,0x36,0x36,0x34,0x2c,0x30, - 0x7a,0x22,0x2f,0x3e,0x0d,0x0a,0x3c,0x2f,0x67,0x3e, - 0x0d,0x0a,0x3c,0x70,0x61,0x74,0x68,0x20,0x66,0x69, + 0x22,0x23,0x37,0x37,0x37,0x37,0x37,0x37,0x22,0x20, + 0x64,0x3d,0x22,0x4d,0x31,0x35,0x2e,0x37,0x35,0x34, + 0x2c,0x37,0x2e,0x34,0x36,0x31,0x63,0x2d,0x32,0x2e, + 0x33,0x31,0x39,0x2c,0x30,0x2d,0x33,0x2e,0x36,0x34, + 0x33,0x2c,0x31,0x2e,0x34,0x33,0x34,0x2d,0x33,0x2e, + 0x36,0x34,0x33,0x2c,0x33,0x2e,0x35,0x31,0x38,0x63, + 0x30,0x2c,0x32,0x2e,0x30,0x38,0x33,0x2c,0x31,0x2e, + 0x33,0x32,0x35,0x2c,0x33,0x2e,0x35,0x32,0x31,0x2c, + 0x33,0x2e,0x36,0x34,0x33,0x2c,0x33,0x2e,0x35,0x32, + 0x31,0x0d,0x0a,0x09,0x09,0x63,0x32,0x2e,0x33,0x32, + 0x2c,0x30,0x2c,0x33,0x2e,0x36,0x34,0x34,0x2d,0x31, + 0x2e,0x34,0x33,0x37,0x2c,0x33,0x2e,0x36,0x34,0x35, + 0x2d,0x33,0x2e,0x35,0x32,0x31,0x43,0x31,0x39,0x2e, + 0x33,0x39,0x39,0x2c,0x38,0x2e,0x38,0x39,0x35,0x2c, + 0x31,0x38,0x2e,0x30,0x37,0x34,0x2c,0x37,0x2e,0x34, + 0x36,0x31,0x2c,0x31,0x35,0x2e,0x37,0x35,0x34,0x2c, + 0x37,0x2e,0x34,0x36,0x31,0x7a,0x22,0x2f,0x3e,0x0d, + 0x0a,0x09,0x3c,0x70,0x61,0x74,0x68,0x20,0x66,0x69, 0x6c,0x6c,0x3d,0x22,0x23,0x37,0x37,0x37,0x37,0x37, - 0x37,0x22,0x20,0x64,0x3d,0x22,0x4d,0x32,0x33,0x2e, - 0x37,0x30,0x34,0x2c,0x31,0x35,0x2e,0x37,0x31,0x35, - 0x68,0x31,0x2e,0x39,0x38,0x38,0x56,0x38,0x2e,0x36, - 0x30,0x32,0x68,0x30,0x2e,0x30,0x32,0x37,0x6c,0x35, - 0x2e,0x39,0x30,0x36,0x2c,0x37,0x2e,0x31,0x31,0x33, - 0x68,0x32,0x2e,0x33,0x33,0x32,0x56,0x36,0x2e,0x32, - 0x34,0x34,0x68,0x2d,0x31,0x2e,0x39,0x38,0x37,0x76, - 0x37,0x2e,0x31,0x31,0x34,0x68,0x2d,0x30,0x2e,0x30, - 0x32,0x37,0x6c,0x2d,0x35,0x2e,0x38,0x36,0x36,0x2d, - 0x37,0x2e,0x31,0x31,0x34,0x68,0x2d,0x32,0x2e,0x33, - 0x37,0x33,0x56,0x31,0x35,0x2e,0x37,0x31,0x35,0x7a, - 0x0d,0x0a,0x09,0x20,0x4d,0x31,0x35,0x2e,0x37,0x35, - 0x34,0x2c,0x31,0x34,0x2e,0x35,0x63,0x2d,0x32,0x2e, - 0x33,0x31,0x38,0x2c,0x30,0x2d,0x33,0x2e,0x36,0x34, - 0x33,0x2d,0x31,0x2e,0x34,0x33,0x38,0x2d,0x33,0x2e, - 0x36,0x34,0x33,0x2d,0x33,0x2e,0x35,0x32,0x31,0x63, - 0x30,0x2d,0x32,0x2e,0x30,0x38,0x34,0x2c,0x31,0x2e, - 0x33,0x32,0x34,0x2d,0x33,0x2e,0x35,0x31,0x38,0x2c, - 0x33,0x2e,0x36,0x34,0x33,0x2d,0x33,0x2e,0x35,0x31, - 0x38,0x63,0x32,0x2e,0x33,0x32,0x2c,0x30,0x2c,0x33, - 0x2e,0x36,0x34,0x35,0x2c,0x31,0x2e,0x34,0x33,0x34, - 0x2c,0x33,0x2e,0x36,0x34,0x35,0x2c,0x33,0x2e,0x35, - 0x31,0x38,0x0d,0x0a,0x09,0x43,0x31,0x39,0x2e,0x33, - 0x39,0x38,0x2c,0x31,0x33,0x2e,0x30,0x36,0x33,0x2c, - 0x31,0x38,0x2e,0x30,0x37,0x34,0x2c,0x31,0x34,0x2e, - 0x35,0x2c,0x31,0x35,0x2e,0x37,0x35,0x34,0x2c,0x31, - 0x34,0x2e,0x35,0x20,0x4d,0x31,0x35,0x2e,0x37,0x35, - 0x34,0x2c,0x31,0x35,0x2e,0x39,0x38,0x63,0x34,0x2e, - 0x31,0x37,0x2c,0x30,0x2c,0x35,0x2e,0x37,0x39,0x38, - 0x2d,0x32,0x2e,0x33,0x33,0x36,0x2c,0x35,0x2e,0x37, - 0x39,0x38,0x2d,0x35,0x2e,0x30,0x30,0x31,0x63,0x30, - 0x2d,0x32,0x2e,0x36,0x36,0x39,0x2d,0x31,0x2e,0x36, - 0x32,0x38,0x2d,0x35,0x2e,0x30,0x30,0x31,0x2d,0x35, - 0x2e,0x37,0x39,0x38,0x2d,0x35,0x2e,0x30,0x30,0x31, - 0x0d,0x0a,0x09,0x63,0x2d,0x34,0x2e,0x31,0x36,0x38, - 0x2c,0x30,0x2d,0x35,0x2e,0x37,0x39,0x36,0x2c,0x32, - 0x2e,0x33,0x33,0x32,0x2d,0x35,0x2e,0x37,0x39,0x36, - 0x2c,0x35,0x2e,0x30,0x30,0x31,0x43,0x39,0x2e,0x39, - 0x35,0x38,0x2c,0x31,0x33,0x2e,0x36,0x34,0x35,0x2c, - 0x31,0x31,0x2e,0x35,0x38,0x36,0x2c,0x31,0x35,0x2e, - 0x39,0x38,0x2c,0x31,0x35,0x2e,0x37,0x35,0x34,0x2c, - 0x31,0x35,0x2e,0x39,0x38,0x22,0x2f,0x3e,0x0d,0x0a, - 0x3c,0x2f,0x73,0x76,0x67,0x3e,0x0d,0x0a + 0x37,0x22,0x20,0x64,0x3d,0x22,0x4d,0x33,0x39,0x2e, + 0x36,0x36,0x34,0x2c,0x30,0x48,0x34,0x2e,0x32,0x35, + 0x32,0x43,0x31,0x2e,0x39,0x31,0x34,0x2c,0x30,0x2c, + 0x30,0x2c,0x31,0x2e,0x39,0x31,0x34,0x2c,0x30,0x2c, + 0x34,0x2e,0x32,0x35,0x32,0x76,0x31,0x33,0x2e,0x34, + 0x35,0x35,0x63,0x30,0x2c,0x32,0x2e,0x33,0x33,0x39, + 0x2c,0x31,0x2e,0x39,0x31,0x34,0x2c,0x34,0x2e,0x32, + 0x35,0x32,0x2c,0x34,0x2e,0x32,0x35,0x32,0x2c,0x34, + 0x2e,0x32,0x35,0x32,0x68,0x33,0x35,0x2e,0x34,0x31, + 0x32,0x0d,0x0a,0x09,0x09,0x63,0x32,0x2e,0x33,0x33, + 0x39,0x2c,0x30,0x2c,0x34,0x2e,0x32,0x35,0x32,0x2d, + 0x31,0x2e,0x39,0x31,0x33,0x2c,0x34,0x2e,0x32,0x35, + 0x32,0x2d,0x34,0x2e,0x32,0x35,0x32,0x56,0x34,0x2e, + 0x32,0x35,0x32,0x43,0x34,0x33,0x2e,0x39,0x31,0x36, + 0x2c,0x31,0x2e,0x39,0x31,0x34,0x2c,0x34,0x32,0x2e, + 0x30,0x30,0x33,0x2c,0x30,0x2c,0x33,0x39,0x2e,0x36, + 0x36,0x34,0x2c,0x30,0x7a,0x20,0x4d,0x31,0x35,0x2e, + 0x37,0x35,0x34,0x2c,0x31,0x35,0x2e,0x39,0x37,0x39, + 0x63,0x2d,0x34,0x2e,0x31,0x36,0x38,0x2c,0x30,0x2d, + 0x35,0x2e,0x37,0x39,0x36,0x2d,0x32,0x2e,0x33,0x33, + 0x34,0x2d,0x35,0x2e,0x37,0x39,0x36,0x2d,0x35,0x0d, + 0x0a,0x09,0x09,0x63,0x30,0x2d,0x32,0x2e,0x36,0x36, + 0x39,0x2c,0x31,0x2e,0x36,0x32,0x38,0x2d,0x35,0x2e, + 0x30,0x30,0x31,0x2c,0x35,0x2e,0x37,0x39,0x36,0x2d, + 0x35,0x2e,0x30,0x30,0x31,0x63,0x34,0x2e,0x31,0x37, + 0x2c,0x30,0x2c,0x35,0x2e,0x37,0x39,0x38,0x2c,0x32, + 0x2e,0x33,0x33,0x32,0x2c,0x35,0x2e,0x37,0x39,0x38, + 0x2c,0x35,0x2e,0x30,0x30,0x31,0x43,0x32,0x31,0x2e, + 0x35,0x35,0x32,0x2c,0x31,0x33,0x2e,0x36,0x34,0x34, + 0x2c,0x31,0x39,0x2e,0x39,0x32,0x34,0x2c,0x31,0x35, + 0x2e,0x39,0x37,0x39,0x2c,0x31,0x35,0x2e,0x37,0x35, + 0x34,0x2c,0x31,0x35,0x2e,0x39,0x37,0x39,0x7a,0x20, + 0x4d,0x33,0x33,0x2e,0x39,0x35,0x37,0x2c,0x31,0x35, + 0x2e,0x37,0x31,0x35,0x0d,0x0a,0x09,0x09,0x68,0x2d, + 0x32,0x2e,0x33,0x33,0x32,0x4c,0x32,0x35,0x2e,0x37, + 0x32,0x2c,0x38,0x2e,0x36,0x30,0x32,0x68,0x2d,0x30, + 0x2e,0x30,0x32,0x37,0x76,0x37,0x2e,0x31,0x31,0x33, + 0x68,0x2d,0x31,0x2e,0x39,0x38,0x38,0x56,0x36,0x2e, + 0x32,0x34,0x34,0x68,0x32,0x2e,0x33,0x37,0x33,0x6c, + 0x35,0x2e,0x38,0x36,0x35,0x2c,0x37,0x2e,0x31,0x31, + 0x34,0x68,0x30,0x2e,0x30,0x32,0x37,0x56,0x36,0x2e, + 0x32,0x34,0x34,0x68,0x31,0x2e,0x39,0x38,0x37,0x56, + 0x31,0x35,0x2e,0x37,0x31,0x35,0x7a,0x22,0x2f,0x3e, + 0x0d,0x0a,0x3c,0x2f,0x67,0x3e,0x0d,0x0a,0x3c,0x2f, + 0x73,0x76,0x67,0x3e,0x0d,0x0a }; diff --git a/data/resources/on.svg b/data/resources/on.svg index 7a9f81ad5..ec61bdc64 100644 --- a/data/resources/on.svg +++ b/data/resources/on.svg @@ -4,11 +4,11 @@ - + + -