summaryrefslogtreecommitdiff
path: root/src/map.h
AgeCommit message (Collapse)AuthorFilesLines
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer1-12/+31
This merge involved major changes on both sides, and as such took several weeks. Lots of things are expected to be broken now, however, we now have a single code base to improve and extend, which can be compiled to support either eAthena or tmwserv. In the coming months, the plan is to work towards a client that supports both eAthena and tmwserv, without needing to be recompiled. Conflicts: Everywhere!
2009-02-15Merge commit 'aethyra/master'Bjørn Lindeijer1-3/+4
Conflicts: CMakeLists.txt configure.ac data/help/header.txt packaging/windows/setup.nsi po/POTFILES.in src/being.cpp src/being.h src/game.cpp src/gui/color.cpp src/gui/color.h src/gui/equipmentwindow.h src/gui/popupmenu.cpp src/gui/recorder.cpp src/gui/setup_colors.h src/gui/setup_keyboard.cpp src/gui/setup_keyboard.h src/gui/skill.cpp src/gui/speechbubble.cpp src/gui/speechbubble.h src/gui/table.cpp src/keyboardconfig.cpp src/keyboardconfig.h src/localplayer.cpp src/main.cpp src/main.h src/map.cpp src/resources/colordb.cpp src/resources/colordb.h src/resources/emotedb.cpp src/resources/emotedb.h src/text.cpp src/text.h src/tmw.rc src/winver.h
2009-02-10Fixed header files, as well as removed the unused buddy list class (notIra Rice1-2/+3
useful since buddy lists are tracked through the player relation interface instead) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-10Simplified target drawing so that it actually uses the SimpleAnimationIra Rice1-3/+3
that it creates when initializing the target cursors in the first place. This behavior was carried over in the first place from the Viewport class. Also moved target drawing responsibility from the map to the being being targeted in the first place. This allows for assuring that targets are always drawn below the sprite being targeted (which the previous solution was designed to do, but didn't do correctly). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-10Removed crash introduced by Aethyra.Philipp Sehmisch1-1/+0
2009-02-07Some more include cleanups.Ira Rice1-1/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-25Removed the TMW branding from header guardsBjørn Lindeijer1-2/+2
2009-01-25Fixed performance hickups caused by animations due to buggy tick timer. A ↵Philipp Sehmisch1-1/+5
tad less performant than the intended solution but at least it is constantly so.
2009-01-23Removed unnecessary references to The Mana World in code headersBjørn Lindeijer1-4/+4
This dates back to the old days of TMW, but the usage instructions of GPLv2 don't mention this being necessary. Since it doesn't add anything, avoid the branding in these sections.
2009-01-15Style cleanups throughout most of the code. Splitting function type fromIra Rice1-17/+9
the function names should no longer be around. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-06Added support for animated tiles.Philipp Sehmisch1-2/+38
2009-01-05Renamed PATH_NODE to Position as on mainlineBjørn Lindeijer1-11/+9
2008-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice1-2/+0
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-09Merged the movement branch into trunkBjørn Lindeijer1-9/+3
I consider this the only way forward. In my tests this code isn't actually doing worse than what was there before. Of course some cases are a bit broken, and I'm open to any kind of feedback so that we can fix those issues.
2008-09-25Merged the Tametomo branch into trunk.Ira Rice1-38/+74
2008-07-18Import of client treeLloyd Bryant1-1/+1
2008-04-08Implemented support for an arbitrary number of map layers. The only layerBjørn Lindeijer1-37/+73
requirement for map layers are now that the fringe layer is called "Fringe" and that the collision layer is called "Collision".
2008-03-23Merged revisions 3828-3829,3831-3838,3841,3843-3844,3847-3872,3874,3876-3900 ↵Bjørn Lindeijer1-9/+10
via svnmerge from https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0 ........ r3828 | crush_tmw | 2007-12-31 17:14:27 +0100 (Mon, 31 Dec 2007) | 1 line Added config options to set the scroll center. Retained scroll offset during map change for smoother map transitions. ........ r3859 | b_lindeijer | 2008-01-26 20:38:43 +0100 (Sat, 26 Jan 2008) | 3 lines Fixed a GCC 4.3 compile error and constified the usage of auto_ptr, since that's the way in which we are using them. ........ r3876 | crush_tmw | 2008-02-11 20:00:43 +0100 (Mon, 11 Feb 2008) | 1 line Added music and overlay to snake dungeon. ........ r3883 | crush_tmw | 2008-02-12 15:00:22 +0100 (Tue, 12 Feb 2008) | 1 line Particle emitters are now activated after the parent particle has moved instead of before (small change which allows a little trick to create polar emitters) ........ r3887 | umperio | 2008-02-12 20:49:37 +0100 (Tue, 12 Feb 2008) | 1 line Made pathfinding not halt on collision destination tile, made moving around with mouse smoother. Added possibility to pass through players with key controls. ........ r3888 | crush_tmw | 2008-02-13 21:49:55 +0100 (Wed, 13 Feb 2008) | 1 line Added new headgears by Black Don (thanks to QOAL for testing and implementation) ........ r3891 | umperio | 2008-02-18 09:52:06 +0100 (Mon, 18 Feb 2008) | 1 line Fixed image name. ........ r3892 | umperio | 2008-02-18 11:00:45 +0100 (Mon, 18 Feb 2008) | 1 line Forgot a %s ........ r3899 | crush_tmw | 2008-02-19 14:23:34 +0100 (Tue, 19 Feb 2008) | 1 line Map fixes at snake dungeon by QOAL ........ r3900 | crush_tmw | 2008-02-19 14:32:24 +0100 (Tue, 19 Feb 2008) | 1 line More map fixes at snake dungeon by QOAL ........
2008-03-13defined block bitmasks in hex instead of decimal like it is done for the ↵Philipp Sehmisch1-3/+3
walk bitmasks.
2008-03-13Synchronized pathfinding algorithmns with those used by the server to avoid ↵Philipp Sehmisch1-13/+33
asynchronisation.
2008-02-18Merged revisions 3762-3772,3776-3782 via svnmerge from Bjørn Lindeijer1-7/+5
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0 ........ r3762 | crush_tmw | 2007-12-04 00:25:25 +0100 (Tue, 04 Dec 2007) | 1 line Added/renamed some headgears for the christmas event. ........ r3763 | crush_tmw | 2007-12-04 14:51:20 +0100 (Tue, 04 Dec 2007) | 1 line tophead -> tophat ........ r3764 | b_lindeijer | 2007-12-05 21:20:25 +0100 (Wed, 05 Dec 2007) | 3 lines Fix drawing of very high fringe tiles by keeping track of the maximum tile height. ........ r3765 | crush_tmw | 2007-12-07 01:50:15 +0100 (Fri, 07 Dec 2007) | 1 line Added a new drop item for the christmas event. ........ r3768 | crush_tmw | 2007-12-09 20:45:53 +0100 (Sun, 09 Dec 2007) | 1 line New versions of funky hat and elf hat by QOAL. ........ r3769 | crush_tmw | 2007-12-10 03:22:59 +0100 (Mon, 10 Dec 2007) | 1 line Simplified player subsprite handling by treating equipment, hairstyle and base sprites alike. Implementing female hairstyles is now a purely content-sided task. ........ r3770 | crush_tmw | 2007-12-10 03:50:15 +0100 (Mon, 10 Dec 2007) | 1 line Added an option to show log messages in the chat console. ........ r3771 | crush_tmw | 2007-12-10 17:12:56 +0100 (Mon, 10 Dec 2007) | 1 line Implemented female hairstyles. ........ r3772 | b_lindeijer | 2007-12-10 21:42:11 +0100 (Mon, 10 Dec 2007) | 2 lines Include cassert header. ........ r3777 | crush_tmw | 2007-12-14 18:33:45 +0100 (Fri, 14 Dec 2007) | 1 line Fixed some errors with the filenames of the new items (unrelated to my eAthena problems). ........ r3778 | crush_tmw | 2007-12-14 19:21:39 +0100 (Fri, 14 Dec 2007) | 1 line fixed some more screwups with the new items. ........ r3780 | crush_tmw | 2007-12-14 19:40:12 +0100 (Fri, 14 Dec 2007) | 1 line Put new items in equipment.xml for backward compatibility with the last client release. ........ r3782 | b_lindeijer | 2007-12-17 16:59:04 +0100 (Mon, 17 Dec 2007) | 2 lines Fixed the item tags. ........
2008-02-12Made pathfinding not halt on collision destination tile, made moving around ↵Eugenio Favalli1-5/+0
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-5/+3
height.
2007-09-20Merged a bunch of small changes from trunk to 0.0 and set svn:eol-style Bjørn Lindeijer1-8/+8
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-06-04Merged 0.0 changes from revision 3234 to 3317 to trunk.Bjørn Lindeijer1-2/+23
2007-05-04Merged particle engine into main eAthena branch.Philipp Sehmisch1-2/+23
2007-01-05Implemented item dropping.Guillaume Melquiond1-2/+2
2007-01-05Declared some methods const.Bjørn Lindeijer1-6/+6
2006-12-11Merged 0.0 changes from revision 2825 to 2898 to trunk.Bjørn Lindeijer1-1/+11
2006-11-12Made pathfinding algorithm cope better with beings blocking the road. This isBjørn Lindeijer1-1/+11
done by allowing walking over other beings, but at an additional cost so that it is preferable to walk around them.
2006-10-07Added support for gzip compressed map layer data. Increased version to 0.0.22.Bjørn Lindeijer1-10/+8
Cleaned up overlay initialization a bit.
2006-10-03Turned AmbientOverlay into a class. Cleaned up the associated code.Björn Steinbrink1-12/+2
2006-08-24added a config option to set the grade of detail of the overlay system.Philipp Sehmisch1-1/+1
2006-08-24scrolling and overlays are no longer linked to the frameratePhilipp Sehmisch1-0/+2
2006-08-21added overlays and smooth scrolling. (someone who knows what he is doing has ↵Philipp Sehmisch1-1/+27
to create the makefiles for the unix users)
2006-03-09Made all class members named like mClassMember.Björn Steinbrink1-4/+4
2006-02-24Another bunch of cosmetic cleanups, ie mostly typedefs...Björn Steinbrink1-2/+4
2006-01-31Various small cleanups.Björn Steinbrink1-37/+15
2005-10-09* Made Sprite into an interface implemented by both FloorItem and Being, whichBjørn Lindeijer1-1/+0
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-16/+15
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-09-29Moved tileset management into the map class and made sure the tilesets areBjørn Lindeijer1-15/+45
cleaned up properly on switching maps.
2005-08-13Huge header cleanup to reduce dependencies and compile time.Björn Steinbrink1-3/+5
2005-07-23Restored Being::setDestination, a pointer to the current map is now kept as ↵Björn Steinbrink1-0/+2
a member in Being.
2005-06-24Updating DevCpp project fileEugenio Favalli1-4/+0
2005-06-20This way BGM should be enabledEugenio Favalli1-0/+4
2005-06-14Added support for map properties, which minimap and background musicBjørn Lindeijer1-0/+19
functionality can be based upon.
2005-05-19Made item amount window a modal dialog and removed support for old map format.Bjørn Lindeijer1-5/+0
2005-04-26Changed keyboard control to integrate better with mouse walk, changed locationBjørn Lindeijer1-1/+6
of packet.list and chatlog.txt and removed name from player chat "balloon".
2005-03-13* Moved Being public char *speech to private std::string speechBjørn Lindeijer1-1/+3
* Moved Being public PATH_NODE *path to private std::list<PATH_NODE> path * Fixed warping issue which corrupted player (which also applies to respawning) * Got rid of sound error in Setup window
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-20 13:16:19 +0000