summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2009-03-26Fixed duplicate check for item namesBjørn Lindeijer2-5/+5
2009-03-26Fix the ColorTypes MacroMajin Sniper2-8/+10
2009-03-27Compile warning fixesBjørn Lindeijer6-25/+21
Mostly unsigned/signed mismatches and an unused variable.
2009-03-27Fix the ColorTypes MacroMajin Sniper2-8/+10
2009-03-27Fixed duplicate check for item namesBjørn Lindeijer1-4/+4
2009-03-26Changed includes in utils/ dictory to new guidelinesBjørn Lindeijer9-14/+15
2009-03-26Fix some bugs with whispers under eAthenaJared Adams1-16/+26
2009-03-26Some code cleanups (mostly reducing how many calculations need to beIra Rice13-126/+84
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-26Fix talking to NPCsJared Adams1-1/+1
2009-03-26Add ChannelTab for chat channelsJared Adams12-41/+216
This fixes TMWServ compilation form the previous commit.
2009-03-26Move ChatWindow over to ChatTabsJared Adams8-416/+520
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 Rice7-69/+62
dfcc6397848d4597b386b688f689352de6c19ae2 Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-26Fixes to file headers and header guardsBjørn Lindeijer90-447/+445
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 Lindeijer22-219/+190
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 Lindeijer59-130/+130
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-25Merge branch 'origin/master'Bjørn Lindeijer6-8/+106
Conflicts: .mailmap
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 Lindeijer185-2582/+5836
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 Rice2-4/+5
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-24Remove some unneeded #ifdefs in SpriteDefJared Adams2-4/+0
2009-03-24Forgot to add eAthena's item handlerJared Adams2-0/+102
2009-03-24Updated version to 0.0.29 in all the other placesThorbjørn Lindeijer2-4/+4
2009-03-23Merge branch 'aethyra/master'Bjørn Lindeijer110-1039/+2336
Conflicts: Many files.
2009-03-23Change version to 0.0.29 and label in the GUIJared Adams1-2/+11
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 Lindeijer2-6/+6
Superfluous semicolons, initialization order and signed/unsigned mismatches.
2009-03-22Fixed map name saving in the engine class. Somehow, the const getsIra Rice3-7/+7
overridden after map_path, so the saved map path needs to get saved before that. Signed-off-by: Ira Rice <irarice@gmail.com>
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 Lindeijer249-3557/+19017
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>