summaryrefslogtreecommitdiff
path: root/src/resources
AgeCommit message (Collapse)AuthorFilesLines
2011-04-09Removed a lot of useless "documentation"Thorbjørn Lindeijer8-55/+4
I have to admit I contributed a large part of these. Sorry for that. Less empty space, more attention to the code. Acked-by: Jared Adams
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-04-09Removed the Mana namespaceThorbjørn Lindeijer2-6/+6
It's just an annoyance when it's only applied to a few classes. Either we place everything in this namespace or nothing, and at the moment I don't see any rationale for placing everything in a Mana namespace. Acked-by: Jared Adams
2011-04-09Moved Channels to Mana::Event::ChannelThorbjørn Lindeijer2-4/+4
Acked-by: Jared Adams
2011-04-09Moved Events to Mana::Event::TypeThorbjørn Lindeijer1-1/+1
Acked-by: Jared Adams
2011-04-07Fix compiler warning about incorrect use of the logger's log memberChuck Miller1-1/+1
Reviewed-By: Jared Adams
2011-03-04Empty std::string don't need to be constructed from ""Thorbjørn Lindeijer1-3/+3
2011-02-21Merge branch '0.5'Thorbjørn Lindeijer1-2/+4
Translation file updates ignored. Conflicts: src/client.cpp src/commandhandler.cpp src/gui/popupmenu.cpp src/localplayer.cpp
2011-02-20Add support for CSV map dataJared Adams1-1/+34
Reviewed-by: Freeyorp
2011-02-19Minor code formatting and fixed a comment.Yohann Ferreira1-2/+4
Trivial fix.
2011-02-10Add support for CSV map dataJared Adams1-1/+34
Reviewed-by: Freeyorp
2011-02-10Merge branch '0.5'Stefan Dombrowski1-2/+2
2011-02-10Add support for zlib map layer compression.Andrei Karas1-2/+2
Reviewed-by: Bertram
2011-01-27Fix the wallpapers loading broken logic.Yohann Ferreira1-6/+10
Trivial.
2011-01-24Refactored the item loading in a more extensible and per protocol way.Yohann Ferreira3-285/+577
This will greatly help into upgrading the need of each protocol separately. This is the first step to a new item and equipment system for manaserv. A subclassing of the EquipmentWindow will be done in the next commit, as requested by Thorbjorn. Reviewed-by: Thorbjorn.
2011-01-19Fix the wallpapers loading broken logic.Yohann Ferreira1-5/+3
Trivial.
2011-01-13Made the client handle better the lack of items.xml file.Yohann Ferreira2-3/+15
Now the client returns to server choice dialog with a warning instead of aborting. I'm kinda certain I'm not the only one getting crazy with such a lazy behaviour. Reviewed-by: Jaxad.
2011-01-13Removed the unused and undefined setWeaponType() function.Yohann Ferreira1-2/+0
Trivial.
2011-01-13Moved the normalize() function in strungUtils where it belongs.Yohann Ferreira1-8/+2
(Preparation for bringing a smaller item loading refactoring patch.) Trivial.
2010-12-22Merge branch '0.5'Chuck Miller2-164/+0
2010-12-22Remove ambientoverlay class and filesChuck Miller2-164/+0
It was renamed and duplicated to "ambientlayer"
2010-12-06Removed superfluous #includes taken from checkheaders list.Yohann Ferreira1-2/+0
Resolves: Mana-Mantis #265. Trivial fix.
2010-12-05Add support for tiles with spacingStefan Dombrowski3-5/+8
Now the map from the Mana server's example data is shown properly. Reviewed-by: Jaxad0127
2010-11-13Replace config listeners with the event systemChuck Miller2-7/+11
Reviewed-by: Jared Adams
2010-11-11Fix unloading of the emote databaseChuck Miller1-0/+3
Trivial fix
2010-11-07Convert the emote system to use particlesChuck Miller2-70/+62
Reviewed-by: Jared Adams
2010-11-01Merge branch '0.5' of gitorious.org:mana/manaYohann Ferreira10-52/+208
Conflicts: src/being.cpp src/client.cpp src/commandhandler.cpp src/gui/setup_video.cpp src/gui/socialwindow.cpp src/gui/viewport.cpp src/gui/widgets/browserbox.cpp src/gui/widgets/itemcontainer.cpp src/imageparticle.cpp src/localplayer.cpp src/localplayer.h src/map.cpp src/net/tmwa/beinghandler.cpp src/particle.cpp src/particle.h src/player.cpp src/player.h
2010-10-22Turned the OpenGL and disable transparency options as static members.Yohann Ferreira4-41/+56
- Now OpenGL and the transparency disabling are set at startup and not read again for displaying graphics, preventing graphic errors before startup. - We also agreed long time ago that SDL specific functions should have a SDL prefix. The header has been rearranged a bit to do so. - Also fixed a possible discrepancy in the hasAlphaChannel() function. Reviewed-by: CodyMartin. Resolves: Mana-Mantis: #260.
2010-10-17Added Low CPU Mode toggle in video setup. Defaults to On.madcamel@gmail.com1-0/+4
This disables the Image::setAlpha() function, which uses 60% of the client's CPU cycles. When enabled, visual quality is slightly decreased, especially with the particle system. Toggling this setting On from an Off state requires a client restart or the graphics look quite funny. Bertram's addition: - Renamed 'Low CPU' to 'Disable transparency (Low CPU)' in the gui for better understanding. - Removed the sprite display with 30% opacity when disabling transparency since it made monsters and drops be drawn above all layers at full opacity. - Made the OpenGL mode disable the 'low CPU mode'. - Fixed the GUI logic as much as possible. Please note that the GUI opacity slider stays enabled when transparency is disabled even if told to be disabled in that case. Reviewed-by: CodyMartin, 4144, MadCamel.
2010-10-16Implement opacity cache for SDL surfaces.Andrei Karas4-10/+130
Enabled by default. Can be disabled in configuration option "alphaCache" if set it to 0. Reviewed-by: Bertram
2010-09-25Merge branch '1.0'Thorbjørn Lindeijer2-0/+5
Conflicts: src/actorspritemanager.h src/beingmanager.cpp src/game.cpp src/gui/beingpopup.cpp src/gui/chat.cpp src/gui/chat.h src/gui/inventorywindow.h src/gui/itempopup.cpp src/gui/socialwindow.cpp src/gui/statuswindow.cpp src/gui/widgets/chattab.cpp src/gui/widgets/chattab.h src/net/tmwa/inventoryhandler.cpp src/net/tmwa/partyhandler.cpp src/party.cpp src/sound.cpp src/utils/stringutils.cpp src/utils/stringutils.h
2010-09-05Unloading mNamedItemInfosStefan Dombrowski1-0/+1
How to reproduce the bug: Switch login, then for every item there is this warning in the log file: "ItemDB: Duplicate name of item found". Reviewed-by: thorbjorn
2010-08-26Merged testing branch into master.Yohann Ferreira4-122/+197
2010-08-15Merge branch '1.0'Chuck Miller3-152/+44
Conflicts: mana.cbp mana.files src/CMakeLists.txt src/Makefile.am src/utils/xml.cpp
2010-08-13Simplify handling of compressed filesJared Adams3-152/+44
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-12Avoid string copy for SpriteDef::getActionThorbjørn Lindeijer2-2/+2
Pass std::string as const & when it makes sense.
2010-08-07Removed superfluous semicolonThorbjørn Lindeijer1-1/+1
2010-08-03Move Theme and UserPalette to the resources folderJared Adams4-0/+1266
Reviewed-by: Yohann Ferreira
2010-08-03Improve OpenGL speed.Andrei Karas1-1/+6
Use batch commands and not selecting already selected texture. Signed-off-by: Jared Adams <jaxad0127@gmail.com>
2010-07-30I forgot to tidy src/resources/spritedef.hYohann Ferreira1-33/+2
(Trivial)
2010-07-29Changed the items loading to handle a new 'attack-action' parameter.Yohann Ferreira8-173/+84
The old behaviour was to load the weapon-type value and do many unnecessary checks and transformation on it: The weapon-type was transformed using hard-coded values into an integer enum value. The exact same thing was done on the opposite side in the animation files before comparing the two. As both data were string values, I simplified all of it by using the value taken in items.xml to call the corresponding action. This now also permit to set up new attack animation in items.xml and in the playerset.xml without having the need to modify the client code. Last but not least, the weapon-type value was used by both the skills and the actions and avoided the possibility to set up a definite action for a weapon-type. Note: The weapon-type parameter will become deprecated for the server in favor of a 'skill' parameter to reflect more it's actual use. This patch is the first step to fix Manasource issue: #157.
2010-07-28Centralized configuration default values using the VariableData system.Yohann Ferreira6-29/+17
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-28Changed mAttackType to mWeaponAttackType were appropriate.Yohann Ferreira3-12/+12
To avoid misunderstanding between the actual attackType and this one. (Trivial fix.)
2010-07-27Improve OpenGL speed.Andrei Karas1-1/+6
Use batch commands and not selecting already selected texture. Signed-off-by: Jared Adams <jaxad0127@gmail.com>
2010-07-19Merge branch '1.0'Yohann Ferreira9-20/+72
Conflicts: src/gui/itempopup.cpp src/item.cpp src/monster.cpp src/net/manaserv/playerhandler.cpp src/net/tmwa/partyhandler.cpp src/npc.cpp src/player.cpp src/resources/itemdb.cpp src/resources/monsterdb.cpp src/resources/monsterinfo.cpp src/resources/npcdb.cpp src/resources/spritedef.cpp
2010-07-11Made the different hard-coded paths and files be now taken from theYohann Ferreira10-21/+74
data/paths.xml configuration file. Also added default gui theme path in branding and default wallpaper path and file searched respectively in the branding and paths.xml files. Hard-coded values are still used as fallbacks. Resolves: Manasource Mantis #148. Reviewed-by: jaxad0127.
2010-07-10Moved parsing of specials.xml from gui/specialswindow.cpp to separate source ↵Philipp Sehmisch2-0/+204
files. Restored functional recharge bars in specials window. Individual specials are only shown after the server informed the client about their status. Made level label, use button and progress bars optional. Their use is controlled through specials.xml. The special window button is again shown even when the player has no specials. This problem needs to be solved differently now for architecture reasons. Reviewed-by: Jaxad0127
2010-06-13Merge remote branch '1.0/1.0'Jared Adams5-5/+5
Conflicts: data/graphics/CMakeLists.txt data/graphics/Makefile.am src/client.cpp
2010-06-03Unload loaded DBs before loading them againJared Adams5-5/+5
This greatly simplifies handling DBs when changing states. No more need to manage unloading in Client (except when exiting). Reviewed-by: Thorbjørn Lindeijer
2010-05-23Fix attack display for beings without an attack definedJared Adams1-1/+1
Reviewed-by: 4144