diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 00000000..6cbf5a42 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,3 @@ +edubart - leader developer (project creator) +andrefaramir - scripting (implemented battle, hotkeys, chat, ..) +baxnie - inactive (implemented first game functionality) diff --git a/README.rdoc b/README.rdoc index 9989ae7d..e93b3136 100644 --- a/README.rdoc +++ b/README.rdoc @@ -31,15 +31,9 @@ We encourage you to contribute to OTClient! Please check out == Contact -You have 3 options, post at http://otclient.info/ , talk directly with us at #otclient irc.freenode.net or send +You have 3 options, use the forum at http://otclient.info/ , talk directly with us at #otclient irc.freenode.net or send an email directly to the project leader edub4rt@gmail.com -== Authors - -* edubart (project creator and leader developer) -* baxnie (official developer) -* andrefaramir (official developer) - == License OTClient is made available under the MIT License, thus this means that you can do whatever you want, commercial, non-commercial, closed or open. diff --git a/modules/client_terminal/terminal.lua b/modules/client_terminal/terminal.lua index 5ca9c0b1..da00194e 100644 --- a/modules/client_terminal/terminal.lua +++ b/modules/client_terminal/terminal.lua @@ -126,7 +126,6 @@ function Terminal.init() poped = true end end - terminalButton = TopMenu.addLeftButton('terminalButton', 'Terminal (Ctrl + T)', 'terminal.png', Terminal.toggle) Keyboard.bindKeyDown('Ctrl+T', Terminal.toggle) diff --git a/src/framework/graphics/graphics.cpp b/src/framework/graphics/graphics.cpp index f7d69292..a7481721 100644 --- a/src/framework/graphics/graphics.cpp +++ b/src/framework/graphics/graphics.cpp @@ -39,10 +39,26 @@ void Graphics::init() if(err != GLEW_OK) logFatal("Unable to init GLEW: ", glewGetErrorString(err)); - if(!GLEW_ARB_vertex_program || !GLEW_ARB_vertex_shader || - !GLEW_ARB_fragment_program || !GLEW_ARB_fragment_shader || - !GLEW_ARB_texture_non_power_of_two || !GLEW_ARB_multitexture) - logFatal("Some OpenGL 2.0 extensions is not supported by your system graphics, please try updating your video drivers or buy a new hardware."); + const char *requiredExtensions[] = { + "GL_ARB_vertex_program", + "GL_ARB_vertex_shader", + "GL_ARB_fragment_program", + "GL_ARB_fragment_shader", + "GL_ARB_texture_non_power_of_two", + "GL_ARB_multitexture" + }; + + std::stringstream ss; + bool unsupported = false; + for(auto ext : requiredExtensions) { + if(!glewIsSupported(ext)) { + ss << ext << std::endl; + unsupported = true; + } + } + + if(unsupported) + logFatal("The following OpenGL 2.0 extensions are not supported by your system graphics, please try updating your video drivers or buy a new hardware:\n", ss.str()); m_useFBO = m_useFBO && GLEW_ARB_framebuffer_object; m_generateHardwareMipmaps = m_generateHardwareMipmaps && m_useFBO; // glGenerateMipmap is supported when FBO is