summaryrefslogtreecommitdiff
path: root/src/gui
AgeCommit message (Collapse)AuthorFilesLines
2009-03-27Fix some problems with NPC dialogsJared Adams3-16/+0
NPCListDialog couldn't be opened because of infinite recursion, and it and NPCTextDialog both had resize bugs.
2009-03-27Merge branch 'aethyra/master'Bjørn Lindeijer20-318/+303
Conflicts: src/beingmanager.cpp src/gui/confirm_dialog.cpp src/gui/inventorywindow.cpp src/gui/inventorywindow.h src/gui/label.cpp src/gui/label.h src/gui/popup.cpp src/gui/popup.h src/gui/scrollarea.cpp src/gui/skin.cpp src/gui/skin.h src/gui/speechbubble.cpp src/gui/window.cpp src/gui/window.h src/localplayer.h src/main.cpp src/net/ea/playerhandler.cpp src/resources/ambientoverlay.h src/resources/dye.cpp src/resources/imagewriter.cpp src/resources/itemdb.cpp src/shopitem.cpp
2009-03-27Fixed some compiler warningsBjørn Lindeijer4-33/+32
Fixed a faulty == statement that should have been an assignment and a mismatched 'else' block.
2009-03-27Moved choosing of random death message to a functionBjørn Lindeijer1-1/+2
Also dynamically calculated the size of the array, so that you don't have to count the messages manually. :P
2009-03-27Changed the includes for the net/tmwserv/ directoryBjørn Lindeijer1-0/+2
2009-03-27Include statement cleanup for net/ea/ directory.Bjørn Lindeijer6-28/+26
2009-03-26Major clean up of ChatTab handlingJared Adams11-118/+69
ChatTabs now manage their own adding/removal from the chat window, which lost most of it's chat related messages. Whisper handling is stil done by the ChatWindow, but it no longer manages any other tabs. ChannelTab handling is now the sole responsability of the Channels they are attached to. The general tab is handled by Game.
2009-03-26Add WhisperTabsJared Adams5-1/+176
2009-03-26Removed setting and getting parent windows for popup classes, as thisIra Rice2-11/+1
wasn't really useful or used at all. Also removed some unneeded includes in the popup class. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-26Removed getting and setting a parent window from the popup class, sinceIra Rice3-18/+3
this currently does not provide any useful functionality to popups, as well as doing anything for that matter. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-26Fixed popup comment. This got chopped off some time when it was firstIra Rice1-2/+6
created. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-26Some code style commits influenced by TMW commitIra Rice1-12/+5
1715d0afe44a282a356ca88e47c92ec556f094dd Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-27Fixed name of "UpdateSliders" and reduced redundant docsBjørn Lindeijer6-59/+25
2009-03-27Fixed include structure in resource/ directoryBjørn Lindeijer8-102/+105
There is also a new rule that trivial constructors and destructors should no longer be trivially "documented", since this just takes up space with no gain.
2009-03-26Compile warning fixesBjørn Lindeijer6-37/+33
Mostly unsigned/signed mismatches and an unused variable.
2009-03-26Fix the ColorTypes MacroMajin Sniper2-8/+10
2009-03-27Compile warning fixesBjørn Lindeijer5-24/+20
Mostly unsigned/signed mismatches and an unused variable.
2009-03-27Fix the ColorTypes MacroMajin Sniper2-8/+10
2009-03-26Some code cleanups (mostly reducing how many calculations need to beIra Rice12-123/+81
done in certain statements, rearranging arguements to make them look cleaner, or overall making the code slightly more flexible) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-26Add ChannelTab for chat channelsJared Adams6-26/+164
This fixes TMWServ compilation form the previous commit.
2009-03-26Move ChatWindow over to ChatTabsJared Adams5-415/+514
TMWServ compilation is likely not functional after this, I didn't check. THe next commit will address that.
2009-03-26First batch of include cleanupBjørn Lindeijer13-61/+64
Since the relative includes are getting ugly and somewhat inconvenient, we'll switch to includes relative to the project root. We've done this for a while already with tmwserv. Another rule which we've always had but was never written down, is that each source file first includes its own header. This is common practice and ensures each header compiles without needing other stuff to be included first. Somebody using Code::Blocks might want to fix the project file by adding the 'src' directory to the list of include paths.
2009-03-25Make sure the correct color for the pulse gradient shows up on theIra Rice1-0/+1
slider as well, rather than just in the preview, on startup. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-25Merged relevent changes from TMW commitIra Rice4-26/+24
dfcc6397848d4597b386b688f689352de6c19ae2 Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-26Fixes to file headers and header guardsBjørn Lindeijer33-170/+168
Mostly removal of branding for tmwserv related files, as was done for the eAthena client before.
2009-03-26Remove redundancy, fix variable names and other code cleanupsBjørn Lindeijer13-126/+114
2009-03-25Don't crash cause of deleting a model twiceBjørn Lindeijer1-3/+0
This reverts commit c2e4a7a70971355f1446bb01053af8a1da8c98e1.
2009-03-25A host of code style fixesBjørn Lindeijer33-79/+84
Mostly putting & and * in the right place and making some getters const.
2009-03-25Fixed some headers of recently added filesBjørn Lindeijer4-14/+10
2009-03-25Don't crash cause of deleting a model twiceBjørn Lindeijer1-3/+0
This reverts commit c2e4a7a70971355f1446bb01053af8a1da8c98e1.
2009-03-25Merge branch 'eathena/master'Bjørn Lindeijer121-1675/+4522
Conflicts: A lot of files.
2009-03-25Fixed a static leak in skin loading.Ira Rice1-0/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-25Relaxed collision and fringe naming slightly so that they just need toIra Rice1-1/+1
start with collision or fringe, instead of being required to be the same case throughout the beginning of the layer name. Also made a default name for popup menus so that their skins can also be changed by users. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-25Modified skin loading to save and load a skin's XML path, as well asIra Rice9-58/+142
modified the skin loading method to take a default value, in case the value in the configuration file fails to load for one reason or another. While this doesn't directly expose skinning on a per window basis to the user at the moment, it does allow people to change what skins get loaded with which windows now without needing to modify the code. TODO: Determine a decent approach to allowing the user to change their window skins in game, as well as moving all widget skin loading to the skin class (for instance, the button skins, progressbar skins, etc.) so that different skin configurations can use different widget skins. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-25Moved the responsibility for skin alpha adjustment to the Skin class.Ira Rice6-113/+63
This fixes a break that occured where skins wouldn't update in real time in the client, due to being passed a reference, rather than getting the skin itself. Signed-off-by: Ira Rice <shogun@odin.(none)>
2009-03-23Merge branch 'aethyra/master'Bjørn Lindeijer83-880/+1974
Conflicts: Many files.
2009-03-23Move all TMWServ-specific code to net/tmwservJared Adams9-11/+13
Also fix several instances where the same net handler was being used for both servers, and a few other related oddities.
2009-03-23Make some getters constJared Adams2-3/+3
2009-03-23Merge eA's command handling into CommandHandlerJared Adams4-493/+76
Also drop Aethyra's custom magic code
2009-03-22Move handling of eA skill messages to SkillHandlerJared Adams2-150/+3
2009-03-22Fix chat under eAthenaJared Adams2-75/+69
2009-03-22Fixed some compiler warningsBjørn Lindeijer2-6/+6
Superfluous semicolons, initialization order and signed/unsigned mismatches.
2009-03-22Fixed some compiler warningsBjørn Lindeijer3-10/+13
Superfluous semicolons, initialization order and signed/unsigned mismatches.
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer94-534/+6131
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-19Throttle framerates down to save CPU cycles. Now that we're getting highIra Rice1-14/+18
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-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>
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-04-21 21:54:51 +0000