summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-07-25Fixed UI layout after changing resolution in Setup dialogThorbjørn Lindeijer1-1/+2
It was doing the relayout using the unscaled screen dimensions.
2012-07-25Added an option to reduce input lagThorbjørn Lindeijer2-1/+31
Always enabled at the moment.
2012-07-25Corrected the minimum height shown in the video optionsThorbjørn Lindeijer1-1/+1
Actually for me it doesn't list 640x360 anyway, but it might for some people I guess.
2012-07-25Merge branch 'master' into lpc2012Erik Schilling4-2/+24
2012-07-25Prevented crash with nonexisting particle sprite.Erik Schilling1-2/+10
2012-07-25Added handler to display text particles sent by serverErik Schilling3-0/+14
Change is tested. Reviewed-by: bjorn.
2012-07-23Avoid 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.
2012-07-23Specify 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
2012-07-23Removed manual calling of glFlush / glFinishThorbjørn Lindeijer1-2/+0
This should never be needed [1]. [1] http://www.opengl.org/wiki/Common_Mistakes#glFinish_and_glFlush
2012-07-23Added 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.
2012-07-23Some 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`
2012-07-23Fixed 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.
2012-07-23Fixed indentation of Image::_GLloadThorbjørn Lindeijer1-75/+75
2012-07-23Revert "Leave the default values for OpenGL texture filters"Thorbjørn Lindeijer1-0/+1
This reverts commit 137ade7226af37d073a5755b90181275664dd65c. Turns out that when leaving the default values, the textures won't actually work since they are incomplete unless the mipmaps are generated (since GL_TEXTURE_MIN_FILTER is GL_NEAREST_MIPMAP_LINEAR by default). For now we don't want to generate mipmaps anyway since we're going for a pixely look, so revert the filters back to GL_NEAREST. The reason this had worked for me is because on my system the texture type GL_TEXTURE_RECTANGLE_ARB is used instead of GL_TEXTURE_2D and this texture type does not support mipmaps.
2012-07-22Replaced font with DejaVu Serif CondensedThorbjørn Lindeijer7-6/+6
Looks nicer in the game in my opinion.
2012-07-20Themed the remaining ui for the lpcErik Schilling26-0/+29
2012-07-20Removed options to configure particle and ambient effectsErik Schilling2-128/+4
As discussed on IRC we agreed to remove the particle and ambients effects options. They are important for the game play and should stay enabled. Also moved the remaining options right to the resolution selection since there is enough space for them now. Change is tested. Reviewed-by: bjorn.
2012-07-17Fixed pixel alignment drawing glitches in OpenGL modeThorbjørn Lindeijer1-1/+1
At some window sizes, lines would flicker in between the tiles. This happened when the window size was not dividable by the scaling factor. Fixed by setting a slightly smaller viewport in this case (which will hopefully not cause other issues).
2012-07-17Fill the window also in software rendering modeThorbjørn Lindeijer2-8/+9
Mouse handling is broken when the game only fills a subset of the screen, and this doesn't look very nice either. Do the same as done in OpenGL mode for now.
2012-07-17Enabled specials window by defaultErik Schilling1-2/+1
2012-07-17Added lpc window theme image to CMakeListsjurkan1-0/+1
Reviewed-by: Ablu.
2012-07-15Implemented client scaling in SDL modejurkan3-16/+48
2012-07-13Small optimization in OpenGL clip area codeThorbjørn Lindeijer1-11/+8
I added mScale later and forgot to make the clip area code use it.
2012-07-12Removed debug outputThorbjørn Lindeijer1-2/+0
2012-07-12Implemented scaling in OpenGL modeThorbjørn Lindeijer9-32/+72
The screen will be scaled up as much as possible, while keeping a minimum 'virtual' resolution of 640x360.
2012-07-09Fixed gender to male onlyjurkan1-0/+3
2012-07-06LPC gui theming (replaced windows through scrolls)jurkan5-19/+19
2012-06-26add option to use system enet headershasufell1-1/+10
Reviewed-by: Ablu.
2012-06-26don't overwrite system/environment CXXFLAGShasufell1-1/+1
Reviewed-by: Ablu.
2012-06-26make datadir an bindir paths modifiablehasufell1-2/+2
Reviewed-by: Ablu.
2012-06-08Made error on imageset loading a bit more informativeErik Schilling1-1/+2
Reviewed-by: bjorn.
2012-05-25Fixed skill display for manaservErik Schilling3-5/+12
- shows manaserv skills at all - shows the progress bar for manaserv skills again - shows the level for this skills (server side patch needed) TODO: URGENT: Fix attributes and skills getting stored in same list. Reviewed-by: Bertram.
2012-05-21Merge branch '0.6'Erik Schilling2-3/+3
2012-05-21Made pickup notifications to appear as particle instead of text by default0.6Erik Schilling1-2/+2
Reviewed-by: bjorn.
2012-05-10Corrected coordinates of window menujurkan1-1/+1
The window menu (the row of buttons at the top right in game) was displayed 3 pixels left of where it should be, which makes the setup button jump 3 pixels left when logging in. Reviewed-by: Ablu
2012-05-07Merge branch '0.6'Thorbjørn Lindeijer1-9/+9
2012-05-07Fixed wrong offset values for tab widget drawingjurkan1-9/+9
Mantis-Issue: 423 Reviewed-by: Thorbjørn Lindeijer
2012-05-06Small protocol fix for NPC messagesThorbjørn Lindeijer1-1/+1
They are no longer sent as fixed-length string since this doesn't work when the new protocol debugging mode is used. Reviewed-by: Ben Longbons
2012-05-05Merge branch '0.6'Thorbjørn Lindeijer6-6/+12
2012-05-05Added debugging mode to the protocolThorbjørn Lindeijer5-21/+119
This makes the client able to send and receive messages sent in debugging mode, where the contents of the messages are annotated. For messages sent from the client the debugging mode is currently always enabled. Later on this could be an internal option or controlled from the server side. Reviewed-by: Erik Schilling
2012-05-05Removed the shared base classes of MessageIn and MessageOutThorbjørn Lindeijer86-668/+612
There wasn't a whole lot gained by sharing a common base class, and it makes extending the manaserv Message{In,Out} classes with a debugging mode unnecessarily complicated. Reviewed-by: Yohann Ferreira
2012-05-05Fixed compilation errors and warnings with GCC 4.7Thorbjørn Lindeijer5-5/+11
Also, since GCC 4.7 there is a binary compatibility issue when linking with a Guichan that was not compiled in C++11 mode. This commit also allows compiling with GCC 4.7 with C++11 mode turned off. Reviewed-by: Erik Schilling
2012-04-19Client side fix for manaserv guild systemErik Schilling3-8/+39
- kick code untested because no kick button exists yet Reviewed-by: bjorn.
2012-04-12Revert "Default manaserv support to OFF for 0.6 release"Thorbjørn Lindeijer1-1/+1
This reverts commit 2ed8a171b63e6b58262801d1f0e0cd10ba265971. Conflicts: CMakeLists.txt
2012-04-04Fixed compiler warning because of uninitialized variableErik Schilling1-1/+1
2012-04-04Synced specials to latest manaserv changesErik Schilling5-44/+38
Reviewed-by: bjorn.
2012-04-04Enabled whispers in tabs by defaultErik Schilling1-1/+1
Reviewed-by: bjorn.
2012-04-02Merge branch '0.6'Thorbjørn Lindeijer25-36/+2872
2012-04-02Fixed problems with using the last emotev0.6.1Thorbjørn Lindeijer8-15/+12
The tmwa/BeingHandler was adjusting the effect id rather than the emote id, causing it to not find the last emote (and the rest of the emotes only worked correctly because the effect ids were consecutive in the same order as the emote ids). Furthermore, the EmoteShortcutContainer refused to draw the icon for the last emote due to an off-by-one error in dealing with the 1-adjusted emote ids used by the EmoteShortcut class. Also cleaned up some old remains of a player ignore strategy that used to use the two balloon emotes (this had been their original purpose). Reviewed-by: Erik Schilling
2012-04-02Potentially fixed problems with user agent in Windows buildsThorbjørn Lindeijer1-3/+5
The Windows releases have not been properly identifying themselves, and it seems to be due to a compiler issue, as discovered by Stefan Dombrowski (@cody). He did a similar change but didn't push it anywhere so I've redone it. The line that is now split up was very preprocessor-heavy, which may have been part of the problem, but we'll probably never know what it was exactly.