summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2009-03-25Merge branch 'eathena/master'Bjørn Lindeijer199-2635/+6093
Conflicts: A lot of files.
2009-03-23Merge branch 'aethyra/master'Bjørn Lindeijer115-1064/+2576
Conflicts: Many files.
2009-03-23Change version to 0.0.29 and label in the GUIJared Adams2-3/+12
2009-03-23Move all TMWServ-specific code to net/tmwservJared Adams72-225/+234
Also fix several instances where the same net handler was being used for both servers, and a few other related oddities.
2009-03-23Fix CommandHandler for TMWServJared Adams1-2/+4
2009-03-23Make some getters constJared Adams2-3/+3
2009-03-23Remove the CHATSKILL structJared Adams1-9/+0
2009-03-23Remove extra function for skill messagesJared Adams1-95/+89
2009-03-23Merge eA's command handling into CommandHandlerJared Adams10-627/+503
Also drop Aethyra's custom magic code
2009-03-22Move handling of eA skill messages to SkillHandlerJared Adams3-151/+132
2009-03-22Fix chat under eAthenaJared Adams3-79/+73
2009-03-22Fixed some compiler warningsBjørn Lindeijer3-10/+13
Superfluous semicolons, initialization order and signed/unsigned mismatches.
2009-03-22Fixed loading of units when skipping updatesBjørn Lindeijer1-2/+3
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer274-3569/+19796
This merge involved major changes on both sides, and as such took several weeks. Lots of things are expected to be broken now, however, we now have a single code base to improve and extend, which can be compiled to support either eAthena or tmwserv. In the coming months, the plan is to work towards a client that supports both eAthena and tmwserv, without needing to be recompiled. Conflicts: Everywhere!
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 Rice7-305/+18
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-19Updated Code::Blocks project fileBjørn Lindeijer1-2/+0
These files no longer exist, I removed them in commit 7e43b82e3b7cda034fab34c15ecfaa97c1a99146
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-18Merge branch 'master' of git@gitorious.org:tmw/eathenaPhilipp Sehmisch47-610/+1284
2009-03-18Updated project filePhilipp Sehmisch1-0/+2
2009-03-18Added an entry for Majin Sniper to the mailmap fileBjørn Lindeijer1-0/+1
To make sure he's recognized as being the same as "sniper"
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 Adams2-0/+4
2009-03-17Finish renaming gui/color.* to gui/palette.*Jared Adams2-4/+4
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>
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-18 18:52:23 +0000