summaryrefslogtreecommitdiff
path: root/src/CMakeLists.txt
AgeCommit message (Collapse)AuthorFilesLines
2011-04-09Renamed Listener to EventListenerThorbjørn Lindeijer1-2/+2
Makes it clear what kind of listener it is, since there are other listener classes as well. Acked-by: Jared Adams
2011-02-15Fix compilation on Haiku and set config and data paths for it.DarkWind1-1/+1
2011-02-01Merge branch '0.5'Thorbjørn Lindeijer1-5/+16
Conflicts: po/de.po src/game.cpp src/resources/wallpaper.cpp
2011-01-28Fix Windows build of the 0.5 version.Yohann Ferreira1-2/+2
The rc and specialfolders files where included with the manaserv specific files.
2011-01-26Prune the enet and manaserv files dependency of the 0.5 binary.Yohann Ferreira1-5/+16
Only using cmake conditions and an ifdef. This will greatly help packaging the mana 0.5 version on other distros.
2010-12-30Renamed protocol.h to manaserv_protocol.h to follow server's changes.Yohann Ferreira1-1/+1
I'll sync the two files as for the new enums in a separate commit. Trivial fix. Resolves: Mana-mantis #278.
2010-12-22Merge branch '0.5'Chuck Miller1-2/+0
2010-12-22Remove ambientoverlay class and filesChuck Miller1-2/+0
It was renamed and duplicated to "ambientlayer"
2010-11-15Remove the configlistener.h from the file listChuck Miller1-1/+0
Trivial fix
2010-11-09These files needed to be added to SRCS, not SRCS_MANAChuck Miller1-2/+2
Trivial fix
2010-08-26Merged testing branch into master.Yohann Ferreira1-2/+2
2010-08-16Move more to the event systemJared Adams1-1/+0
Most of Net::InventoryHandler is now done through events. The ActorSpriteManager was also replaced by events. A few odds and ends were taken care of too. Reviewed-by: Bertram
2010-08-15Merge branch '1.0'Chuck Miller1-3/+11
Conflicts: mana.cbp mana.files src/CMakeLists.txt src/Makefile.am src/utils/xml.cpp
2010-08-15Add included enet to CMakeBernd Wachter1-3/+9
2010-08-13Simplify handling of compressed filesJared Adams1-0/+2
ResourceManager will now check for ".gz" and act appropriately (unless told not to). Compression handling functions are now in new utils/zlib files, along with a function to load a file from drive, uncompressing it if it ends in ".gz". Reviewed-by: Freeyorp
2010-08-12Simplify working with the event systemJared Adams1-2/+0
EventManager has been merged into Event, with some new convinience methods added. Reviewed-by: Chuck Miller
2010-08-03Move Theme and UserPalette to the resources folderJared Adams1-4/+4
Reviewed-by: Yohann Ferreira
2010-08-03Merge remote branch 'origin/1.0'Jared Adams1-2/+2
Conflicts: src/net/tmwa/chathandler.cpp
2010-07-28Centralized configuration default values using the VariableData system.Yohann Ferreira1-0/+2
Please note that I didn't turned all the getValue() call into new ones, simply because I have to have config object initiated which is not forcefully the case the branding file. Resolves: Manasource Mantis #170.
2010-07-23Fixing compatibility with cmake 2.6.0Renato Alves1-2/+2
The syntax IF ((condition) OR (condition)) is not accepted by cmake prior to 2.6.4. The syntax IF (NOT (condition OR condition)) is also not accepted. The patch should address this without affecting newer versions. A newline character was also automatically added to the end of the file.
2010-07-17Move ManaServ defines into the netcodeChuck Miller1-0/+1
Reviewed-by: Jared Adams
2010-07-17Modify how attributes and stats are handledChuck Miller1-0/+2
Handling moved from LocalPlayer to PlayerInfo class Event system used to update windows Reviewed-by: Jared Adams
2010-07-13Add the foundation for the event systemChuck Miller1-0/+7
2010-07-10Add the specialdb.cpp and specialdb.h files to CMakeChuck Miller1-0/+2
2010-07-08Fix crash in picking up an item that no longer existsremoitnane1-0/+1
Adds ActorSpriteListener to manage ActorSprite destruction as recommended by Jaxad0127. This likewise includes the changes made by Bertram. Reviewed-by: Jaxad0127, Bertram. Resolves: Manasource Mantis #160
2010-06-10Merge BeingManager and FloorItemManager as ActorSpriteManagerJared Adams1-4/+2
No need for two different classes to manage ActorSprites. Reviewed-by: Chuck Miller
2010-05-21Merge branch '1.0'Thorbjørn Lindeijer1-0/+4
Conflicts: src/beingmanager.cpp src/beingmanager.h src/client.cpp src/localplayer.cpp
2010-05-17Remove Monster, Player, and NPC classesJared Adams1-8/+2
Instead of having these three subclasses with minor differences, this commit merges them back into Being. In the future, we can make Beings that are talkable to some, attackable by others, etc. This also puts back support for monster equipment. Also changes remaining references to Being::Type and the constants to refer to ActorSprite::Type. Reviewed-by: Freeyorp
2010-05-06Add support for floor item spritesJared Adams1-0/+7
This commit adds a sprite hierarchy (Sprite->ImageSprite,AnimatedSprite,CompundSprite; CompoundSprite,Actor->ActorSprite;ActorSprite->Being,FloorItem) to collect common functionailty into new base classes which will make other Mantis tickets easier to do. Also allows monsters to use particle effects. Reviewed-by: Bertram
2010-05-02Fix cmake builds for OS XBernd Wachter1-0/+2
2010-05-01Add chat logging.Andrei Karas1-0/+2
Add option in players setup page. Add command line option. Signed-off-by: Jared Adams <jaxad0127@gmail.com>
2010-04-25Make ManaServ player stats softcodedJared Adams1-0/+2
A new stats.xml file is parsed for player stats for ManaServ. The old hardcoded stats remain as backup. Reviewed-by: Bertram
2010-04-23Add an Actor class to replace the Sprite classJared Adams1-1/+2
The Actor class manages the Map reference, position vector, and alpha float. These are the common parts from it's children.
2010-04-17Changed eAthena protocol name to TmwAthena and changed the config files ↵Bertram1-48/+48
accordingly. This makes room for the actual eAthena protocol future inclusion.
2010-03-25Merge StorageWindow into InventoryWindowJared Adams1-2/+0
Reviewed-by: Chuck Miller
2010-03-15Add net/ea/token.h to CMakeLists.txt and Makefile.amThorbjørn Lindeijer1-0/+1
2010-03-14Add tooltips to hp, xp, mp bars.Andrei Karas1-0/+2
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
2010-03-12Split Palette into Theme and UserPaletteJared Adams1-0/+2
Themes can now control the colors they use. Colors in the Viewport (being names, particles, etc) can still be changed by the user. Also make ProgressBars more easily colored. DyePalette was made more flexible in the process. Also fixes comparing strings of different lengths insensitively. Reviewed-by: Thorbjørn Lindeijer
2010-03-05Rename SkinLoader to ThemeJared Adams1-2/+2
Also merge the guialpha ConfigListener into Theme. Reviewed-by: Thorbjørn Lindeijer
2010-03-02Revert "Merge WindowContainer into Viewport and remove extra members"Jared Adams1-0/+2
This reverts commit 67e678094b9fddd21fb3c690130e772937ab2746. Conflicts: src/gui/gui.cpp src/gui/viewport.cpp
2010-03-01Merge WindowContainer into Viewport and remove extra membersJared Adams1-2/+0
Reviewed-by: Chuck Miller
2010-02-25Added paste facility from the Wormux projectThorbjørn Lindeijer1-0/+8
With CMakeLists.txt adaptions from the Aethyra project. Reviewed-by: Bernd Wachter Reviewed-by: Jared Adams
2010-02-25Add support for special folder lookup on Win32Bernd Wachter1-1/+6
Reviewed-by: Jared Adams
2010-02-25Use recursive mkdir for config directories, fix log initializationBernd Wachter1-0/+2
Logger now logs to stdout by default, and allows logging without having a log file open. This allows using logger for error logging in early startup functions. Reviewed-by: Jared Adams
2010-02-24Add more to eAthena guild supportJared Adams1-0/+2
It's not complete yet, but it is closer. Also fix up handling of guild/party members. Reviewed-by: Chuck Miller
2010-02-22Cleanup some popup-related code and make sure BeingPopup is includedJared Adams1-0/+2
2010-02-21Made tick counter and framerate limiter work during login sequenceThorbjørn Lindeijer1-0/+2
Much code was moved from main() to the new Client::exec(). This new event loop now integrates with the Game class, so that the tick counter and framerate limiter apply universally. The Client class is also responsible for some things that used to be global variables. Mantis-issue: ...
2010-02-19Fixed a crash when trying to switch serversThorbjørn Lindeijer1-1/+1
Ownership of the charInfo global variable wasn't well defined. It was being locked, unlocked and generally modified from a lot of places, and somewhere in this mess it ended up crashing when switching servers. Now the CharHandler instances, for eAthena and manaserv respectively, own this list of characters. A new class, Net::Character wraps up the slot index in combination with the player dummy. The list is passed on to the CharSelectDialog each time it changes. Both related and unrelated cleanups were made as well. Reviewed-by: Jared Adams
2010-02-08Merge PartyWindow and GuildWindow into SocialWindowJared Adams1-8/+8
2010-02-07Nicer way of indicating that we're waiting on the serverThorbjørn Lindeijer1-0/+2
No longer a dialog with an annoying progress bar (due to going back and forth), but rather a progress indicator that integrates better with the background.