summaryrefslogtreecommitdiff
path: root/src/resources
AgeCommit message (Collapse)AuthorFilesLines
2011-06-07Merged the unknown item definition loadingYohann Ferreira2-11/+19
and added the default hit effects on it. Reviewed-by: Jaxad0127.
2011-06-07Added defaults to empty attacks.Yohann Ferreira1-1/+5
Reviewed-by: Jaxad0127.
2011-06-07Added hit effects on victims from monsters attacks.Yohann Ferreira3-7/+22
Resolves: Mana-Mantis #336. Reviewed-by: Jaxad0127.
2011-06-03Replace SDL_types.h with cstdintJared Adams2-17/+1
This required moving to C++0x, so it does that too, and fixes a few errors with that. Reviewed-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
2011-06-02Arbitrary code cleanupsThorbjørn Lindeijer4-14/+22
Just some stuff that piles up while "looking" at the code, which eventually gets annoying to ignore while staging real changes. * Replaced a few NULL occurrences with 0 * Rely on default parameter for std::vector::resize. * Replaced a few "" with std::string() * Prefer .empty() to == "" * Removed a few comparisons with NULL * Don't check pointers before deleting them * Removed a bunch of redundant semicolons * Made some global variables static (local to their compilation unit) * Prefer prefix ++/-- operators to postfix versions when possible * Corrected location of a comment
2011-05-26Added effects support in monsters attacks.Yohann Ferreira3-25/+22
This is provided through the use of the 'effect-id' property of the <attack> tag. Note that the 'particle-effect' support has been removed as it was redundant, but can be kept for backward compatibility. Now, on both Manaserv and tA, only the attack id 1 is supported, i.e: <monster> ... <attack id="1" effect-id="11" action="attack" /> </monster> More to come with re-enabling of the attack type support. I had to fix a crash in the Being::takeDamage() function when there were no attacker (in Manaserv), and add rotation support to the effectManager to achieve this. Reviwed-by: Jaxad0127.
2011-05-17Fix sprite buffering size issuesJared Adams1-2/+0
Reviewed-by: Yohann Ferreira
2011-04-30Merge branch '0.5'Yohann Ferreira1-1/+1
Conflicts: CMakeLists.txt po/fi.po po/fr.po src/gui/skilldialog.cpp src/localplayer.cpp src/net/manaserv/generalhandler.cpp src/net/tmwa/buysellhandler.cpp src/net/tmwa/generalhandler.cpp src/net/tmwa/playerhandler.cpp src/net/tmwa/specialhandler.cpp src/winver.h
2011-04-30Added customizable on-hit effects for characters.Yohann Ferreira2-9/+31
This patch adds support for the following two parameters in weapon items: hit-effect-id: Effect triggered on the victim on normal hit. critical-hit-effect-id: Triggered on the victim on critical hit. (Specified in effects.xml) The patch also permits the use of custom defaults set in paths.xml by setting the following keys: (Paths are relative to the 'particles' key value, here.) hitEffectId: defaulted to effect id 26. criticalHitEffectId: defaulted to effect id 28. Resolves: Mana-mantis #337. Reviewed-by: bcs86
2011-04-29Remove default assignment of an attack action to non-weaponsStefan Dombrowski3-12/+3
This avoids log warnings for missing weapon range. Reviewed-by: thorbjorn, bcs86
2011-04-29Making the check for the node name earlier while reading items.xmlStefan Dombrowski1-3/+6
Reviewed-by: Jaxad0127
2011-04-28Fixing endless loop if the xml promises too many imagesStefan Dombrowski1-1/+1
Reviewed-by: Bertram
2011-04-26Made the client use a unique kind of movement code.Yohann Ferreira1-1/+3
This is fixng many issues and (hopefully) will make the movement rendering much smoother. Merge branch 'master' of gitorious.org:~bertram/mana/mana-movement-code-merge Conflicts: src/being.cpp src/net/manaserv/beinghandler.cpp Resolves: TMW-Mantis #946. Reviewed-by: Thorbjorn.
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-17Simplified the get/setAttackRange() functions as requested.Yohann Ferreira1-1/+3
The attack range is still hardcoded for Manaserv as long as generic equipment handling hasn't been implemented.
2011-03-16Fixed the attack range handling for both servers.Yohann Ferreira1-1/+1
The attack range is always the default for manaserv, as proper equipment handling is to be added. Anyway, now the proper attack range is handled in tmwAthena and is always set a proper minimum for both protocols.
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