summaryrefslogtreecommitdiff
path: root/src/map.cpp
AgeCommit message (Collapse)AuthorFilesLines
2008-12-07Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'Ira Rice1-26/+26
Conflicts: AUTHORS CMakeLists.txt ChangeLog INSTALL README aethyra.cbp configure.ac data/help/changes.txt data/help/commands.txt data/help/header.txt data/help/support.txt src/Makefile.am src/aethyra.rc src/being.cpp src/being.h src/equipment.cpp src/equipment.h src/floor_item.h src/game.cpp src/gui/buddywindow.cpp src/gui/char_select.cpp src/gui/char_server.cpp src/gui/chat.cpp src/gui/chat.h src/gui/equipmentwindow.cpp src/gui/equipmentwindow.h src/gui/gui.cpp src/gui/inventorywindow.cpp src/gui/inventorywindow.h src/gui/itemcontainer.cpp src/gui/itemcontainer.h src/gui/minimap.cpp src/gui/ministatus.cpp src/gui/newskill.cpp src/gui/npc_text.cpp src/gui/npclistdialog.h src/gui/ok_dialog.cpp src/gui/setup_video.cpp src/gui/skill.cpp src/gui/skill.h src/gui/status.h src/gui/table_model.h src/gui/updatewindow.cpp src/gui/viewport.cpp src/inventory.cpp src/inventory.h src/keyboardconfig.cpp src/keyboardconfig.h src/localplayer.cpp src/localplayer.h src/logindata.h src/main.cpp src/map.cpp src/monster.cpp src/monster.h src/net/beinghandler.cpp src/net/beinghandler.h src/net/buysellhandler.cpp src/net/equipmenthandler.cpp src/net/loginhandler.cpp src/net/loginhandler.h src/net/network.h src/net/npchandler.cpp src/net/playerhandler.cpp src/net/protocol.h src/net/tradehandler.cpp src/npc.cpp src/npc.h src/particleemitter.cpp src/particleemitterprop.h src/player.cpp src/player.h src/player_relations.cpp src/resources/imageset.cpp src/resources/imageset.h src/resources/itemdb.cpp src/resources/mapreader.cpp src/resources/monsterinfo.h src/text.cpp src/text.h src/textmanager.cpp src/textmanager.h src/tileset.h src/utils/fastsqrt.h src/utils/strprintf.cpp src/winver.h tools/tmxcopy/Makefile tools/tmxcopy/base64.cpp tools/tmxcopy/base64.h tools/tmxcopy/tostring.h Signed-off-by: Ira Rice <irarice@gmail.com>
2008-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice1-5/+2
statements, as well as removing the new skill dialog, which we do not, nor will we use (if we do, it'd be a new one that we'd make). WARNING!!! This, and all other previous builds have a linker error for the Gnome libraries version 4.3.2 on my setup. It's assumed that this is also the case for other users of this library as well. I'm currently assuming that there's a bug in the compiler itself, and will look into reporting this, but in the mean time, it doesn't build for these users, unfortunately. Sorry about this.
2008-11-16Got rid of CVS/Subversion $Id$ markersBjørn Lindeijer1-2/+0
I don't know why we dealt with these things for so long. Did we ever get anything out of it?
2008-10-27Made targets draw on the fringe layer, as well as added t for talking to Ira Rice1-0/+2
an NPC, n for targeting an NPC, and changed basic targeting code so that it'll time out after being on a target for longer than a minute.
2008-10-14Early addition of a particle effect disabling option. Would like to Ira Rice1-5/+8
change this in the future to update instantaneously.
2008-10-01Possible fix for the arrow crashing bug. Confirmation needed.Ira Rice1-6/+3
2008-09-25Merged the Tametomo branch into trunk.Ira Rice1-109/+117
2008-07-18Import of client treeLloyd Bryant1-1/+1
2008-07-01Merged revisions 4044-4067 via svnmerge from Bjørn Lindeijer1-97/+109
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk ........ r4044 | b_lindeijer | 2008-04-07 11:02:38 +0200 (Mon, 07 Apr 2008) | 2 lines Added support for basing one sprite definition on another by including it. ........ r4057 | b_lindeijer | 2008-04-08 20:43:44 +0200 (Tue, 08 Apr 2008) | 4 lines Implemented support for an arbitrary number of map layers. The only layer requirement for map layers are now that the fringe layer is called "Fringe" and that the collision layer is called "Collision". ........ r4067 | b_lindeijer | 2008-04-11 00:03:57 +0200 (Fri, 11 Apr 2008) | 3 lines Fixed some compiler warnings and don't try to load particle effects when no file is set. ........
2008-04-22Fixed a bug, thanks GCC 4.3!Bjørn Lindeijer1-1/+2
2008-02-12Made pathfinding not halt on collision destination tile, made moving around ↵Eugenio Favalli1-11/+2
with mouse smoother. Added possibility to pass through players with key controls.
2007-12-05Fix drawing of very high fringe tiles by keeping track of the maximum tileBjørn Lindeijer1-52/+36
height.
2007-09-20Merged a bunch of small changes from trunk to 0.0 and set svn:eol-style Bjørn Lindeijer1-6/+6
to native for some files that were still missing this property. This is a feeble attempt to reduce the amount of conflicts for future merges.
2007-05-04Merged particle engine into main eAthena branch.Philipp Sehmisch1-0/+23
2007-03-11Fixed it bjørns way and corrected the date in the changelog.Philipp Sehmisch1-4/+4
2007-03-11Fixed a bug that made the engine not draw the last row and column of the map.Philipp Sehmisch1-2/+2
2006-11-12Made pathfinding algorithm cope better with beings blocking the road. This isBjørn Lindeijer1-22/+31
done by allowing walking over other beings, but at an additional cost so that it is preferable to walk around them.
2006-10-07Resolved some weirdness involving the terms scroll and speed.Bjørn Lindeijer1-5/+3
2006-10-07Added support for gzip compressed map layer data. Increased version to 0.0.22.Bjørn Lindeijer1-24/+29
Cleaned up overlay initialization a bit.
2006-10-03Turned AmbientOverlay into a class. Cleaned up the associated code.Björn Steinbrink1-73/+21
2006-09-28Fix random crashes when map tiles are missing.Björn Steinbrink1-6/+14
2006-08-29Updated NEWS file and made getAll return a reference instead of a pointer.Bjørn Lindeijer1-2/+2
2006-08-24added a config option to set the grade of detail of the overlay system.Philipp Sehmisch1-3/+11
2006-08-24scrolling and overlays are no longer linked to the frameratePhilipp Sehmisch1-34/+53
2006-08-21added overlays and smooth scrolling. (someone who knows what he is doing has ↵Philipp Sehmisch1-3/+83
to create the makefiles for the unix users)
2006-03-09Made all class members named like mClassMember.Björn Steinbrink1-27/+28
2006-03-09Added Spriteset::get() and Spriteset::size() to hide the member vector and ↵Björn Steinbrink1-2/+2
remove the weird mySpriteset->spriteset stuff.
2006-03-08Added a 'dtor' helper functor to delete objects in arrays and containers ↵Björn Steinbrink1-4/+3
using STL algorithms.
2006-02-24Another bunch of cosmetic cleanups, ie mostly typedefs...Björn Steinbrink1-12/+9
2006-01-31Various small cleanups.Björn Steinbrink1-13/+19
2006-01-22Merged NETWORK branch (includes BEING_OVERHAUL).Björn Steinbrink1-5/+7
2005-12-24Fringe layer draw fix and change in policy on when using OpenGL is the default.Bjørn Lindeijer1-5/+10
2005-10-16Some code improvements.Björn Steinbrink1-33/+31
2005-10-10Forgot to add new tilesets to Makefile.am and made another small fix to spritev0.0.17Bjørn Lindeijer1-1/+1
rendering.
2005-10-09Fixed player names overlapping other players and more cleanups.Bjørn Lindeijer1-1/+1
2005-10-09* Made Sprite into an interface implemented by both FloorItem and Being, whichBjørn Lindeijer1-4/+14
hook themselves into the map on construction. The improved fringe layer is working as expected now. * Made sure TMW compiles without warnings even when using "-Wconversion -Wshadow -Wcast-qual -Wwrite-strings -ansi -pedantic", lots of cleanups. * Added two new small tilesets that contain the desert tiles that are twice and three times the height of a normal tile. One well in new_3-1 has been converted to use the new double tiles for testing purposes.
2005-10-07Modified finding NPC as by timonator's suggestion in order to allow NPCs to beBjørn Lindeijer1-18/+31
clicked on their heads too. Also made start to tile engine improvement by adding the Sprite class that is now used by the floor items for being displayed on the map. Finally added documentation to Item class and splitted out Properties class from Map.
2005-10-02Added check for pthread library (needed for FreeBSD, still needs to be checkedBjørn Lindeijer1-4/+6
on MacOS X) and some cleanups.
2005-09-29Moved tileset management into the map class and made sure the tilesets areBjørn Lindeijer1-53/+84
cleaned up properly on switching maps.
2005-09-23Merged most of the changes in biggeruniverse's second memory cleanup patch.Bjørn Lindeijer1-1/+1
2005-08-13Huge header cleanup to reduce dependencies and compile time.Björn Steinbrink1-0/+3
2005-07-16Made Image/SubImage being drawn by Graphics. Removed some redundant code.Björn Steinbrink1-1/+1
2005-07-11Committed header dependencies reducing patch by DoenerBjørn Lindeijer1-6/+0
2005-07-02Added minimap to Tulimshar (map 3-1)Bjørn Lindeijer1-17/+32
2005-06-14Added support for map properties, which minimap and background musicBjørn Lindeijer1-0/+22
functionality can be based upon.
2005-05-19Made item amount window a modal dialog and removed support for old map format.Bjørn Lindeijer1-109/+0
2005-05-02Made config.xml, tmw.log and chatlog.txt always appear in ~/.tmw on *nix.Bjørn Lindeijer1-3/+3
2005-05-01Fix for colliding with portals.Bjørn Lindeijer1-1/+2
2005-04-30Some fixes to player control, also attempting to solve long walk path problem.Bjørn Lindeijer1-0/+7
2005-04-26Changed keyboard control to integrate better with mouse walk, changed locationBjørn Lindeijer1-12/+17
of packet.list and chatlog.txt and removed name from player chat "balloon".