summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2009-03-23Merge branch 'aethyra/master'Bjørn Lindeijer110-1039/+2336
Conflicts: Many files.
2009-03-22Fixed some compiler warningsBjørn Lindeijer3-10/+13
Superfluous semicolons, initialization order and signed/unsigned mismatches.
2009-03-19Be sure to free the window iconJared Adams1-1/+5
2009-03-19Throttle framerates down to save CPU cycles. Now that we're getting highIra Rice3-18/+25
framerates in OpenGL even on older hardware, this should be done to conserve on CPU usage, rather than stressing it with more frames than the monitor can render. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-19Be sure to free the window iconJared Adams1-1/+5
2009-03-19Reduced down label code.Ira Rice1-29/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-19Forgot to remove some now unneeded includes.Ira Rice4-4/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-19Made the plus and minus buttons in the last commit look moreIra Rice5-10/+12
aesthetically pleasing. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-19Reformatted the item amount window and the buy/sell windows so thatIra Rice10-62/+156
their guis are similarly laid out. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-19Simplified trading dialog controls.Ira Rice3-36/+22
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-19Some minor cleanups in a few windows and build scripts, as well asIra Rice6-303/+16
fixing tables to correct the highlights to draw where they're supposed to, as well as at the opacity they're supposed to. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-19Make sure positionable dialogs start out centeredJared Adams23-20/+57
2009-03-19Port Progressbar to TextRendererMajin Sniper1-23/+8
2009-03-19Port Progressbar to TextRendererMajin Sniper2-14/+10
2009-03-19Fixed SDL_ttf include againBjørn Lindeijer1-1/+1
Please set up your include path if this include doesn't work for you.
2009-03-18Fix up the NPC interraction widnows a bitJared Adams14-45/+81
2009-03-18A few more fixes in the ItemAmount dialogJared Adams1-1/+5
2009-03-18Clean up TtemAmount dialog and add an All buttonJared Adams2-27/+33
2009-03-18Clean up TtemAmount dialog and add an All buttonJared Adams2-27/+33
2009-03-18Fix up the NPC interraction widnows a bitJared Adams12-21/+44
2009-03-18Windows compilation fixesPhilipp Sehmisch2-2/+2
2009-03-18Fixed a broken Mac include for SDL_ttfBjørn Lindeijer2-4/+4
Reviewed-by: trapdoor
2009-03-17Add the TextPreview widget to CBP and CMakeJared Adams1-0/+2
2009-03-17Finish renaming gui/color.* to gui/palette.*Jared Adams1-2/+2
2009-03-17Added an image merge feature loosely based on a merge function found inIra Rice5-29/+117
the open source project Wormux. To improve SDL performance, the number of layers that are pushed out to the hardware or software buffers should be reduced, which is where this function comes into play, as it combines two surfaces together so that the number of blit operations is reduced. This function is currently not used, but will be used once a good way to link each of the target systems is determined so that it only initiates when SDL is enabled, as well as making sure that each hook that uses this function is benefiting from it sufficiently. At the moment, it's suspected that the particle engine will likely be the most likely to benefit from this function, followed by tile drawing, then sprite drawing. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-16Applied a similar optimization as in commitIra Rice2-29/+58
d654758ef63f6515d678ceaf77d63a2693e08fb7, but for SDL instead. This currently doesn't buy too much, but it's a little better than it used to be. TODO: Find out why SDL is bottlenecked, and try to bring its performance up to OpenGL levels, if possible. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-16Optimising OpenGLGraphics::drawImagePatternSteve Cotton2-0/+57
2009-03-16Rename the old Palette class to DyePaletteSteve Cotton2-10/+10
Having two classes called Palette makes the program crash, when compiled without optimisation.
2009-03-16Code reformattingSteve Cotton2-6/+6
Cherry-picking changes from Bjørn's 1b3cb122be1a418ce82b66fb9ce1ecf3aa5813fb Mainly making sure 'const std::string &' is used everywhere instead of 'std::string const &'. The former has always been the preferred order in this project.
2009-03-15Fixed BuySell dialog to remember its position. For proper configurationIra Rice1-0/+1
saving, this needed a window name set. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-15Overrode the reset window function in the chat window to also reset theIra Rice7-9/+27
position of the recorder, as well as fixed resetting the help window, and exposing the buy/sell window to being resettable, as well as remembering its previous position. All windows should now be covered by the reset button on the setup pane. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-15Fixed color previews for item types.Ira Rice1-0/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-15Fix some mem leaksJared Adams12-22/+42
2009-03-14Improved pulsating algorithm to look better for impure colors.Ira Rice1-3/+3
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-14Fixed default size for the debug window.Ira Rice1-1/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-14Removed a redundant widget resize function in the shortcut window.Ira Rice2-16/+7
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-14Exposed a few more windows to the reset button on the setup window.Ira Rice5-21/+33
These windows required an external declaration to reset. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-14Exposed a few more windows to the reset window button under the setupIra Rice2-1/+6
dialog. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-14Made the slider editable when pulse gradient is selected.Ira Rice3-13/+56
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-14Added a pulse effect into the palette class, which uses the set colorIra Rice3-41/+39
and pulsates back and forth between it and black. Added directly after the spectrum effect. Also modified the gradient delay to be a lot farther out, so that we don't end up with a Pokemon seizure causing disaster (the speed was the same, as well as the colors. The new speed should be a lot more considerate of people who are prone to having issues from that speed of color changing). TODO: Modify the palette class to allow for updating the color for the pulse gradient without needing to have it applied first. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-14Modified the equipment window to use the highlight color for selections.Ira Rice1-16/+18
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-14Fixed item popups in the equipment window to display the proper itemIra Rice1-2/+4
type colors. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-14Fixed a label in the status window to use the label widget inside theIra Rice1-1/+1
gui folder. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-14Added the label classes that were accidently left out in commitIra Rice2-0/+123
3575c7a606c2d24c0d444e9999892c0390fa5ae8 Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-14Exposed the progress bar colors to the color management tab.Ira Rice11-19/+66
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-14Made a label class derived from the guichan label class which utilizesIra Rice29-176/+171
the palette colors. While technically, this can be accomplished through other means, it's rather clumsy overall, and is prone to introducing in programmer errors. This commit finally catches every case where text is used, and applies the text color from the color dialog to each of them appropriately. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-14Fixed sliders to initialize their alpha values on loading, instead ofIra Rice1-0/+10
only using alpha values after the first change. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-14Got rid of two direct references to the color black. These now alwaysIra Rice2-2/+4
pull from the stored text color. This should help in situations in which the user has their own custom skin in the future, and needs to adjust text colors to be more friendly to a darker skin. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-14Code cleanup in the color/palette codeMajin Sniper2-12/+9
2009-03-14Commented up item popups, speech bubbles, as well as only update itemIra Rice7-9/+80
info on item change. Also fixed color updating for item shortcuts and item links, as the displayed colors wouldn't update on change on color change in the setup color dialog. Signed-off-by: Ira Rice <irarice@gmail.com>