summaryrefslogtreecommitdiff
path: root/src/game.h
AgeCommit message (Collapse)AuthorFilesLines
2009-03-25Merge branch 'eathena/master'Bjørn Lindeijer1-0/+2
Conflicts: A lot of files.
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer1-2/+22
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-19Prevent target toggling when the button is heldJared Adams1-0/+2
2009-02-09Merged with Aethyra master as of 2009-02-09Bjørn Lindeijer1-4/+0
Conflicts: A lot of files...
2009-02-09Mostly whitespace fixesBjørn Lindeijer1-26/+26
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-08Mostly fixed a few field values to behave better in Windows, as well asIra Rice1-3/+0
removed the need for sending graphics to the setSpeech function (since it isn't needed) and started actually using the time variable which it's passed (could be set to show the speech longer if the dialog is longer, for example). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-07Some more include cleanups.Ira Rice1-1/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-25Removed the TMW branding from header guardsBjørn Lindeijer1-2/+2
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.
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-27add effect handler (by Chuck Miller)Roderic Morris1-0/+1
2008-10-21Fixed up some of the postal system stuff for testing it.David Athay1-0/+1
2008-07-18Import of client treeLloyd Bryant1-25/+25
2008-07-14Added admin commands to /help and added registration of party handlerDavid Athay1-0/+1
2008-03-23Merged revisions 3828-3829,3831-3838,3841,3843-3844,3847-3872,3874,3876-3900 ↵Bjørn Lindeijer1-1/+1
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-02-28Work in Progress commit of guilds.David Athay1-0/+1
2008-01-28Added weapon skill system and leveling system.Philipp Sehmisch1-1/+0
2008-01-26Fixed a GCC 4.3 compile error and constified the usage of auto_ptr, sinceBjørn Lindeijer1-1/+1
that's the way in which we are using them.
2007-07-31Removed legacy inventory code. Added display of equipment.Guillaume Melquiond1-1/+0
2007-02-25Fixed small issue concerning SDL timers, removed a useless variable.Rogier Polak1-0/+5
2006-09-29Merged trunk changes from revision 2618 to 2716 into the 0.1.0 branch.Bjørn Lindeijer1-4/+13
2006-09-12Added some items to the NEWS file.Bjørn Lindeijer1-2/+1
2006-09-11Simplified fps limiting a bit and added some comments. Now based onBjørn Lindeijer1-2/+12
ConfigListener so that the fpslimit option doesn't need to be queried the whole time.
2006-08-26Made the Network class a purely static interface, as there is only one instance.Guillaume Melquiond1-4/+1
2006-03-09Use std::auto_ptr in some places.Björn Steinbrink1-10/+12
2006-02-01Created a Game class.Björn Steinbrink1-36/+22
2006-01-26Moved some setup code out of the game loop into the setup functions. Setup ↵Björn Steinbrink1-4/+3
functions are now called from the outside.
2006-01-22Merged NETWORK branch (includes BEING_OVERHAUL).Björn Steinbrink1-11/+7
2006-01-05Remove some useless code.Björn Steinbrink1-1/+0
2005-10-09* Made Sprite into an interface implemented by both FloorItem and Being, whichBjørn Lindeijer1-1/+1
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-09-19Mostly code cleanups related to commits in past two days.Bjørn Lindeijer1-1/+0
* Replaced custom function FIND_PATH with AC_PATH_PROG, used for finding sdl-config. * Removed -lphysfs from Makefile.am which should be added automatically already. * Actually show the overweight message, and only show it once for each time weight goes above half the max weight. * Surfaces passed to SDL_BlitSurface shouldn't be locked according to the manual. * Minimal fps limit is now 10 fps. * Reverted change by Bertram that hardcoded the updatehost value.
2005-09-17Remove inclusion of being.h, there was a forward declaration anyways...Björn Steinbrink1-1/+1
2005-09-17Fixed typo.José Ávila1-1/+1
2005-09-172005-09-17 Duane Bailey nayryeliab@gmail.comDuane Bailey1-0/+2
* game.h: fixed bugs created by matt * messageout.h: fixed bug concering expand arguments * mesageout.cpp: adding include to win2mac.h and commented out SDL_net include; caused bugs on macs
2005-09-17Added PVPMatthias Hartmann1-0/+1
2005-09-14Converted map_path from char array to std::string.Björn Steinbrink1-2/+2
2005-09-13Merged with SDL_NET_TEST branch.Björn Steinbrink1-9/+6
2005-08-13Huge header cleanup to reduce dependencies and compile time.Björn Steinbrink1-10/+0
2005-08-03Moved my invented variable, since it makes more sense.Andrej Sinicyn1-1/+0
2005-08-02Fix my previous fix because it broke my own code.Andrej Sinicyn1-0/+1
2005-08-01Show the name of the trade partner in the trade dialog.Andrej Sinicyn1-0/+1
2005-07-28Added an action enumeration to th Being class and removed the old #define's.Björn Steinbrink1-11/+0
2005-07-15Enabling support for joypads:Eugenio Favalli1-0/+19
- Only <=6 buttons are supported - Only the first jopad is used (if you have more than one) - Axes need to be tuned - You can only move and attack with joypad Small fix in the updating system
2005-07-11Committed header dependencies reducing patch by DoenerBjørn Lindeijer1-14/+0
2005-06-14Added background to minimap. Only used in Tonori Desert map for now, and itsBjørn Lindeijer1-0/+2
style is up for discussion.
2005-05-27autoTarget is now a Being*, also may have fixed related crash and added labelBjørn Lindeijer1-1/+2
to show current target.
2005-05-22An attemp on auto attack, not bug free for sureEugenio Favalli1-0/+1
2005-05-14Hide mouse when the application doesn't have mouse focus.Bjørn Lindeijer1-1/+0
2005-04-30Emoticons framerate independent and NPCs image smaller to work in OpenGLBjørn Lindeijer1-1/+0
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-29 10:34:01 +0000