summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-08-14Can now build using cmake on OSXSocapex9-82/+89
Tested-by: Frost.
2012-08-12Fixed special keeping in list after serverside removeErik Schilling3-0/+11
Reviewed-by: Thorbjørn Lindeijer.
2012-08-12Fixed coding style in specialswindowErik Schilling1-16/+18
Reviewed-by: Thorbjørn Lindeijer.
2012-08-12Improved the layout of the specials windowThorbjørn Lindeijer2-25/+8
And removed the unused TabbedArea. Reviewed-by: Erik Schilling
2012-08-12Removed ImageLoader and ProxyImage classesThorbjørn Lindeijer9-200/+0
They allowed using gcn::Image, which in turns allows using gcn::Icon and gcn::ImageFont, but none of this is actually used anymore. Reviewed-by: Erik Schilling
2012-08-12Removed manual calling of glFlush and made glFinish optionalThorbjørn Lindeijer2-3/+31
Actually neither glFlush nor glFinish need to be called manually [1]. However, the rendering pipeline is then free to queue up future frames which can cause a lag which is especially noticable with mouse movement. To avoid this lag, we call glFinish after SDL_GL_SwapBuffers. This makes sure processing of the next frame does not start before the current frame is being displayed. [1] http://www.opengl.org/wiki/Common_Mistakes#glFinish_and_glFlush Reviewed-by: Yohann Ferreira Sounded-fine-to: Erik Schilling
2012-08-11Removed two unused variablesThorbjørn Lindeijer1-3/+0
Reviewed-by: Erik Schilling
2012-08-11Fixed handling of --chat-log-dir command line optionThorbjørn Lindeijer1-1/+2
It was also setting the screenshot directory. Reviewed-by: Erik Schilling
2012-08-08Changed to using delete_all instead of a loopTom Leese1-8/+2
Reviewed-by: Erik Schilling.
2012-08-07Fixed issue where previous special entries were drawn underneathTom Leese1-0/+7
Reviewed-by: Erik Schilling.
2012-08-05Fixed drawing issues with tiles that don't match the gridThorbjørn Lindeijer2-2/+7
An optimization in the tile layer rendering code meant for drawing repeated tiles faster was not taking into account the case where the tile width does not match the width of the tile grid. Reviewed-by: Stefan Beller
2012-08-05Enabled manaserv support in Code::Blocks projectThorbjørn Lindeijer1-0/+1
Reviewed-by: Erik Schilling
2012-08-05Removed linking with guichan_opengl from C::B projectThorbjørn Lindeijer1-1/+0
Actually we're not depending on this library. Reviewed-by: Erik Schilling
2012-08-05Enable OpenGL by default on all platformsThorbjørn Lindeijer2-6/+2
Before it was only enabled by default for Mac. Reviewed-by: Erik Schilling
2012-08-05Removed 'virtual' from methods of ImageThorbjørn Lindeijer4-26/+15
Maybe it used to be necessary for these methods to be virtual, but this is no longer the case. Hence we can avoid wasting CPU ticks searching through virtual function tables, especially for frequently used methods like getWidth, getHeight and setAlpha. MapLayer::getTile was inlined. Reviewed-by: Erik Schilling
2012-08-05Removed all the hardcoded sizes of the various setup tabsThorbjørn Lindeijer19-81/+66
Instead, support for dynamically adjusting layout was added to the Container class. Various other places were also adapted to use the new layout support in Container. Reviewed-by: Erik Schilling
2012-08-05Avoid copying surfaces unnecessarily for upload to textureThorbjørn Lindeijer2-26/+36
When uploading an SDL surface to an OpenGL texture, it was always making a copy that had the desired size and pixel format. Now this copy is no longer being made when the existing surface already has the target size and pixel format. In fact most images are already in 32-bit RGBA format after loading them. Reviewed-by: Erik Schilling
2012-08-05Specify a more specific image format when uploading texturesThorbjørn Lindeijer1-1/+1
While simply specifying "4 components" works, it is preferred to specify the actual image format like GL_RGBA8 in our case. http://www.opengl.org/wiki/Common_Mistakes#Image_precision Reviewed-by: Erik Schilling
2012-08-05Added support for ARB_texture_non_power_of_two extensionThorbjørn Lindeijer3-2/+7
If the graphics driver supports this, there is no need to create textures with power-of-two dimensions. It is then also preferred to use regular textures than relying on the older GL_ARB_texture_rectangle extension. Reviewed-by: Erik Schilling
2012-08-05Some cleanups in OpenGL codeThorbjørn Lindeijer2-49/+1
* Removed empty and unused function `setTargetPlane` * Removed duplicated enabling of `GL_VERTEX_ARRAY` * Removed strange smoothing code from `drawRescaledImage` Reviewed-by: Erik Schilling
2012-08-05Fixed mixup of parameter types in OpenGL codeThorbjørn Lindeijer1-4/+4
Textures were not rendering correctly on cards that did not support the GL_ARB_texture_rectangle extension, since the alternative code path was passing ints as floats and floats as ints to OpenGL. Reviewed-by: Erik Schilling
2012-08-05Fixed indentation of Image::_GLloadThorbjørn Lindeijer1-75/+75
Reviewed-by: Stefan Beller
2012-08-05Revert "Graphics: take only const pointers to images."Thorbjørn Lindeijer2-6/+6
This reverts commit 4eea727b7649726670d8963d11ab4fd429624b3e. It broke the overrides of the virtual functions and leaves the Graphics API in inconsistent state with some Image* being const and others not.
2012-08-05Add a checkbox to the debugging window to show being ids.Stefan Beller3-4/+46
Reviewed-by: Ablu Conflicts: src/gui/viewport.cpp
2012-08-05Graphics: take only const pointers to images.Stefan Beller2-6/+6
Acked-by: Erik Schilling
2012-08-04Enabled manaserv support in Code::Blocks projectThorbjørn Lindeijer1-0/+1
2012-08-04Fixed compile with MinGW/G++ 4.6.2Thorbjørn Lindeijer1-1/+1
It does not know 'ushort', and this variable should be 'size_t' anyway.
2012-08-04Removed linking with guichan_opengl from C::B projectThorbjørn Lindeijer1-1/+0
Actually we're not depending on this library.
2012-08-02Removing constructor of DebugSwitches.Stefan Beller1-15/+0
The class DebugSwitches is a derived class from Container, 'which automatically deletes its child widgets, so there is no need for such fragile cleanup code.' acked-by: bjorn
2012-08-02Add a checkbox to the debugging window to show being ids.Stefan Beller3-4/+46
Reviewed-by: Ablu
2012-08-02Changed color of download progressbarlpc2012submissionErik Schilling1-1/+1
2012-08-02Crash fix when re-entering the gameThorbjørn Lindeijer3-0/+15
Throw away the old layout rather than trying to reuse it and crashing cause of collisions.
2012-08-02Dynamically scaling background for login screenThorbjørn Lindeijer11-6/+65
Hacked Graphics::drawRescaledImage a bit to make it work...
2012-08-02Made download progress colorableErik Schilling4-2/+6
2012-08-02Enable OpenGL by default on all platformsThorbjørn Lindeijer2-6/+2
Before it was only enabled by default for Mac.
2012-08-02Tweaked default positions of chat and shortcut windowThorbjørn Lindeijer2-4/+4
Added some margin and made the shortcut window not movable/resizable.
2012-08-02Split off minimap window from mini status window and repositioned themThorbjørn Lindeijer9-50/+143
2012-08-02Changed default position and size of shortcut windowThorbjørn Lindeijer1-3/+4
2012-08-02Revert "Changed default position and size of chat window"Thorbjørn Lindeijer1-1/+1
This does not seem like a good idea at the moment. This reverts commit 7d0ba78e45a6f8d0e99dcde2a2f06fa98dfbee83.
2012-08-02Added parts of new background imageErik Schilling5-0/+19
2012-08-02Changed default position and size of chat windowThorbjørn Lindeijer1-1/+1
Moved it to the top-right.
2012-08-02[Hack] Removed emotion buttonjurkan1-1/+1
2012-08-02Removing the need to press space twice to close a dialog (probably a hack)jurkan1-0/+1
2012-08-02Embedded the minimap into the mini status windowThorbjørn Lindeijer8-105/+73
2012-08-01Some positioning changes in the game UIThorbjørn Lindeijer10-64/+78
Moved player status bars to the top-right, next to the window menu. Used the layout for dynamic adjustments to screen resolution.
2012-08-01Removed unused TabbedArea from SpecialsWindowThorbjørn Lindeijer2-15/+0
2012-08-01Improved the layout of the specials windowThorbjørn Lindeijer1-10/+8
Just in case I don't get around to do anything better...
2012-08-01Resized minimap + fixed clipErik Schilling1-7/+8
2012-08-01Fixed compile error when not compiling in C++11 modeThorbjørn Lindeijer1-1/+1
Qualifying enum values by the name of the enumeration is a C++11 feature.
2012-08-01Fixed color of npc dialog to black for lpcErik Schilling1-1/+1