summaryrefslogtreecommitdiff
path: root/src/resources
AgeCommit message (Collapse)AuthorFilesLines
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
2010-05-21Remove some unneeded printfsJared Adams1-2/+0
2010-05-21Merge branch '1.0'Thorbjørn Lindeijer3-2/+7
Conflicts: src/beingmanager.cpp src/beingmanager.h src/client.cpp src/localplayer.cpp
2010-05-21Fix a crash dealing with rescaled overlays under SDLJared Adams1-0/+1
Reviewed-by: Philipp Sehmisch
2010-05-21Fix some issues found by CppcheckJared Adams1-1/+5
2010-05-17Add support for different target cursor sizes for NPCsJared Adams4-24/+28
Moves the parsing logic for the size strings into BeingInfo to share the code. Reviewed-by: Freeyorp
2010-05-17Remove Monster, Player, and NPC classesJared Adams11-273/+272
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 Adams9-53/+95
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-06Make the logic for collision tiles more strictThorbjørn Lindeijer1-1/+1
Only recognize the collision tile as colliding, since having everything except the empty non-collision tile collide is confusing. Should also be changed on the server and in the tmwAthena exporter of Tiled. Reviewed-by: Dennis Friis
2010-04-17Changed eAthena protocol name to TmwAthena and changed the config files ↵Bertram1-2/+2
accordingly. This makes room for the actual eAthena protocol future inclusion.
2010-04-16Remove an unneeded monster job offset in eAthena netcodeJared Adams1-2/+4
2010-04-16Add race support for eAthenaJared Adams3-13/+28
The job/class field is used to select the race. If the given race isn't defined, it falls back on the first race (so servers can use jobs/classes without races). Also rename job to subtype for Being and subclasses, and begin support for changing monster and NPC subtypes on the fly (particle effects still need to be reset when they change). Reviewed-by: Bertram
2010-04-08Fix handling of "../" and fix a bug in TSX handlingJared Adams2-12/+36
2010-03-21Make the Dye class more flexible and fix an issue in itJared Adams2-23/+68
After the last change, it could go over the end of the colors array. Reviewed-by: Chuck Miller Reviewed-by: Freeyorp
2010-03-20Fix default offset in monster db for old servers.Andrei Karas1-1/+4
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
2010-03-20Add some defaults for MonsterInfoJared Adams2-2/+4
2010-03-12Add an optional offset property to monsters.xmlJared Adams1-1/+3
And remove the hardcoded offset from eAthena's BeingHandler. Reviewed-by: Freeyorp
2010-03-12Split Palette into Theme and UserPaletteJared Adams2-15/+38
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-08Fix crash with incorrect wallpaper names. (From 4144)Bertram1-11/+16
Reviewed-by: Bertram
2010-03-07Added config option for disabling particle effects on map warps.Philipp Sehmisch1-2/+7
Reviewed-by: Jared Adams
2010-03-04Implemented markers for warp portals defined in map files in form of ↵Philipp Sehmisch1-3/+12
particle effects. Reviewed-by: Jared Adams <jaxad0127@gmail.com>
2010-02-28Make the gui more themeable and distribute two themesJared Adams1-1/+2
The older gray theme and the new wood theme are available as themes. The gray theme needs some new graphics for hilights. Add a theme option for branding and add path/to/branding/data to the PhysFS search path. Reviewed-by: Thorbjørn Lindeijer Reviewed-by: Chuck Miller
2010-02-21Do some more copyright header cleanupsJared Adams4-4/+2
Fix "(C) 2009-2009" to just "(C) 2009" Fix "(C) 2010 TMW" to "(C) 2010 Mana" Remove TMW compyright on (hopefully all) files added after 0.0.29.1
2010-02-22Modify copyright headersFreeyorp42-42/+84
2010-02-20License header update for The Mana ClientThorbjørn Lindeijer46-180/+134
2010-02-14Don't quit the client on invalid decRefThorbjørn Lindeijer1-3/+5
It's not a fatal error.
2010-02-14Give more meaningful error messages when decRef() fails.Tametomo1-2/+5
Signed-off-by: Tametomo <irarice@gmail.com>
2010-02-10Adds missile-particle attribute to items and monster attacksChuck Miller5-3/+29
To use simply add something like: missile-particle="graphics/particles/arrow.particle.xml" to the item's or monster's xml entry This will only work on equipped weapons, and on specified monster attacks. This patch also fixes a memory leak with target particles
2010-02-09Don't translate the logThorbjørn Lindeijer1-11/+11
It's not meant for the user, translating it only burdens both us and our translators unnecessarily.
2010-02-09Got successfully rid of tile width/height fallback values as asked by Jaxad.Bertram1-9/+18
But I added some logs when speed and other actions where refused due to game/map uninitialized. This could help.
2010-02-09Separated fallback defaults for tile width and height.Bertram1-3/+0
2010-02-07Nicer way of indicating that we're waiting on the serverThorbjørn Lindeijer2-4/+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.
2010-02-07Updated Copyright year to 2010!Bertram42-42/+42
Also added the update copyright tool from the Wormux Team. ( And not forgetting credit's due. :P )
2010-02-01Moved from SDLrescalefacility to SDL_gfx.Bertram3-571/+3
2010-01-17Fix equiping charm itemsChuck Miller2-1/+3
2010-01-12Standardize header orderJared Adams17-29/+38
Also remove some extra new lines and fix eAthena's PartyTab define guards.
2010-01-10Change code styleAndrei Karas6-139/+158
2010-01-06Fixes so mapreader ignores the case of object typesChuck Miller1-4/+3
This will decrease warnings in the log file by a good bit
2009-12-25Added support for map background images which work exactly like overlays, ↵Philipp Sehmisch3-1/+164
just that they are drawn before the tiles instead of afterwards. Renamed overlays to foregrounds (but kept backward compatibility intact)
2009-10-14Add more detail to DebugWindowJared Adams1-0/+2
2009-10-03Added support for the "too fast" login errorThorbjørn Lindeijer1-4/+2
So that next time somebody encounters it, it doesn't turn up as "unknown error".
2009-10-02Updating Code::Blocks project and adding header to fix compiler error.Stefan Dombrowski1-0/+1
2009-09-28Fix file handling in imagewriterFreeyorp1-6/+8
Make imagewriter only open a file stream after some checks have occurred elsewhere, and be sure to close it if the surface conversion fails.
2009-09-17Optimized the Image::setAlpha() function for SDL.Bertram1-14/+25
2009-08-15Fix some compile errorsJared Adams1-1/+1