summaryrefslogtreecommitdiff
path: root/src/gui/viewport.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-03-06Merge branch 'aethyra/master'Bjørn Lindeijer1-21/+14
Conflicts: src/being.cpp src/being.h src/floor_item.cpp src/floor_item.h src/flooritemmanager.cpp src/gui/inventorywindow.cpp src/gui/inventorywindow.h src/gui/itemcontainer.cpp src/gui/popupmenu.cpp src/net/beinghandler.cpp src/npc.cpp
2009-03-05Made some optimizations based on some profiling done by Octalot, as wellIra Rice1-21/+14
as some other optimizations that I could see that cut down on some unneeded redraws, which in turn improved frame rates slightly. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-26Merge branch 'aethyra/master'Bjørn Lindeijer1-10/+19
Conflicts: data/graphics/images/login_wallpaper.png src/being.cpp src/beingmanager.cpp src/engine.cpp src/game.cpp src/gui/buysell.cpp src/gui/buysell.h src/gui/gui.h src/gui/npc_text.cpp src/gui/npc_text.h src/gui/npcintegerdialog.cpp src/gui/npclistdialog.cpp src/gui/npclistdialog.h src/gui/npcstringdialog.cpp src/gui/sell.cpp src/gui/shop.cpp src/gui/table.cpp src/net/beinghandler.cpp src/net/npchandler.cpp src/net/playerhandler.cpp src/npc.cpp src/npc.h src/shopitem.cpp src/shopitem.h src/utils/stringutils.cpp src/utils/stringutils.h src/utils/trim.h
2009-02-24Cleaned up some code, as well as removed redundant talk client requestingIra Rice1-10/+19
(which would happen from using the keyboard instead of the mouse). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-20Restore old middle click behaviorJared Adams1-1/+2
2009-02-18Introduced a toLower method and grouped string utilsBjørn Lindeijer1-1/+1
The string utility methods are now grouped together in the stringutils.h header. Also, a toLower method was added for convenience.
2009-02-18Introduced a toLower method and grouped string utilsBjørn Lindeijer1-1/+1
The string utility methods are now grouped together in the stringutils.h header. Also, a toLower method was added for convenience.
2009-02-15Removed unnecessary parenthesis at constructorsBjørn Lindeijer1-1/+1
When not passing any parameters to constructors, there is no reason for using parenthesis.
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-09Mostly whitespace fixesBjørn Lindeijer1-4/+5
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-09Merged with Aethyra master as of 2009-02-09Bjørn Lindeijer1-7/+1
Conflicts: A lot of files...
2009-02-09Mostly whitespace fixesBjørn Lindeijer1-4/+5
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-09Merged with Aethyra master as of 2009-01-27Bjørn Lindeijer1-170/+65
Conflicts: Almost everywhere.
2009-02-08Mostly fixed a few field values to behave better in Windows, as well asIra Rice1-1/+1
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-02-04Went through the gui folder and revised the include statements to notIra Rice1-5/+0
include anything not needed by that specific widget or window. This appears to have cleaned up system performance a bit on my current setup, where it went from idling on 45% in game with opengl down to 30% now. Also moved iptostring to the tostring header, as importing all of network.h is a little overkill to use that function, and it goes along with the basic functions that are in that header file anyways. TODO: find out a way to get rid of warnings when a class doesn't use this function. Signed-off-by: Ira Rice <irarice@gmail.com>
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-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-2/+0
the function names should no longer be around. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-09More code style cleanupsIra Rice1-4/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-09Added the ability to see your own name in game.Ira Rice1-0/+11
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-06Added support for unicode charset in textfields and chat.Guillaume Melquiond1-2/+0
Conflicts: src/Makefile.am src/game.cpp src/gui/browserbox.cpp src/gui/gui.cpp src/gui/textfield.cpp src/main.cpp (cherry picked from mainline commit 7b67e852086ad3ccd98a622f890b245ab6a0a321)
2009-01-06Added support for unicode charset in textfields and chat.Guillaume Melquiond1-2/+0
Conflicts: src/Makefile.am src/game.cpp src/gui/browserbox.cpp src/gui/gui.cpp src/gui/textfield.cpp src/main.cpp (cherry picked from mainline commit 7b67e852086ad3ccd98a622f890b245ab6a0a321)
2009-01-06Fixed the windows cbp file, deleted some files which we don't use, andIra Rice1-1/+1
fixed a few compiler warnings noticed from building in windows. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-08Fixed speech bubbles, which broke on the last merger.Ira Rice1-0/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-07Tweaked some configuration defaultsBjørn Lindeijer1-2/+2
Scrolling is now a bit less lazy and the scroll radius is 0. In my opinion this is a better default. Framerate limiter is now off by default, since it makes the game appear a bit choppy. It's basically only useful for laptops anyway, and not too hard to find.
2008-12-07Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'Ira Rice1-4/+5
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-12-07Some code reformattingBjørn Lindeijer1-1/+1
2008-12-07Tweaked some configuration defaultsBjørn Lindeijer1-2/+2
Scrolling is now a bit less lazy and the scroll radius is 0. In my opinion this is a better default. Framerate limiter is now off by default, since it makes the game appear a bit choppy. It's basically only useful for laptops anyway, and not too hard to find.
2008-12-07Added client-side status change handlers (text, icon, particle effect, audio).Fate1-0/+6
2008-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice1-7/+4
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-28Fixed attacking so that it will actually continue to attack in Ira Rice1-1/+1
succession like it's intended to if it's given a true keep flag, or just do one attack if that flag isn't set. Since most people seem to prefer to continue to attack when attacking, shift will be used for when someone only wants to hit the target once.
2008-10-27Revised code so that dead sprites are de-targeted.Ira Rice1-1/+1
2008-10-27Changed mouse attack behavior so that if you click on a being that's too Ira Rice1-1/+1
far away and are holding down the attack key, you will attack that being.
2008-10-27Fixed mouse attacks and targeting.Ira Rice1-4/+2
2008-10-27Made targets draw on the fringe layer, as well as added t for talking to Ira Rice1-3/+0
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-27Merged the Tametomo branch back into trunk. Targeting has been removed Ira Rice1-94/+1
from the viewport, and is now located on the beings themselves. Eventually, this will be changed further so that the targets draw below the being, instead of maintaining the same logic, but baby steps first.
2008-10-23A few more compiler warnings fixed.Ira Rice1-1/+1
2008-09-25Merged the Tametomo branch into trunk.Ira Rice1-80/+63
2008-09-15Commented out getBeingByPixel because it really isn't used, nor is there Ira Rice1-4/+4
much sense to. Shouldn't make any visible changes to performance yet, but I trimmed it out for now anyways.
2008-08-28Accepted Patch by Scraggy that moves text in such a way that no text overlapsBjørn Lindeijer1-21/+7
2008-07-18Import of client treeLloyd Bryant1-22/+8
2008-07-01Merged revisions 4044-4067 via svnmerge from Bjørn Lindeijer1-7/+5
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-16Fixed compilation warning.Bjørn Lindeijer1-2/+2
2008-04-15Fixed clicking near player.David Athay1-2/+0
2008-04-11 Players now need toDavid Athay1-2/+19
click on the monster sprites rather than the tile. Players will now move to the target before attacking it.
2008-03-27Applied patch by peavey and added his name to the ChangeLog some more.Bjørn Lindeijer1-1/+2
2008-02-12Made pathfinding not halt on collision destination tile, made moving around ↵Eugenio Favalli1-1/+1
with mouse smoother. Added possibility to pass through players with key controls.
2007-12-31Added config options to set the scroll center. Retained scroll offset during ↵Philipp Sehmisch1-51/+53
map change for smoother map transitions.
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-03-02 01:55:39 +0000