summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2008-12-08Code reformattingBjørn Lindeijer13-298/+175
I wish I had never fallen for this weird style, and I hope removing it will prevent others from introducing new code like this. :-)
2008-12-08Introduced another template to make deleting all values in a container easier.Bjørn Lindeijer12-31/+20
Inspired by qDeleteAll() from Qt. Conflicts: ChangeLog src/beingmanager.cpp src/channelmanager.cpp src/gui/skill.cpp src/map.cpp src/resources/monsterinfo.cpp (cherry picked from mainline)
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-08Compacted the inventory window layout.Ira Rice2-22/+8
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-08Clip the minimap image to within its windowBjørn Lindeijer1-10/+14
The image wasn't clipped so it would draw beneath the map name and on top of the window border.
2008-12-08Don't scroll past the edges of the minimapBjørn Lindeijer1-0/+12
When centering the minimap on the player, it would often happen that the minimap scrolled past its edge. Based on a patch by QOAL.
2008-12-08Clip the minimap image to within its windowBjørn Lindeijer1-10/+14
The image wasn't clipped so it would draw beneath the map name and on top of the window border.
2008-12-08Don't scroll past the edges of the minimapBjørn Lindeijer1-0/+12
When centering the minimap on the player, it would often happen that the minimap scrolled past its edge. Based on a patch by QOAL.
2008-12-07Added some initialization and removed ChargeDialogIra Rice8-124/+13
Many member variables of LocalPlayer were not being initialized properly. In general this shouldn't have caused any problems, but it's bad style. The ChargeDialog was removed. This class was long dead anyway. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl> Conflicts: src/Makefile.am src/game.cpp src/gui/chargedialog.cpp src/gui/chargedialog.h src/localplayer.cpp src/localplayer.h Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-07Fixed inconsistency in default window sizesBjørn Lindeijer9-20/+21
The default window sizes were all too small, since they were specified in content size. On pressing "Reset Windows", the sizes would be interpreted as such and apply alright. The inconsistency is now removed, and the default window sizes are always the size of the whole widget now, not just the contents. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-12-07Fixed the minimap name field so that it works for us again. Since IIra Rice1-6/+4
originally ported this from TMW's trunk, and they later changed their mind on the minimap name property, this was broken on our maps. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-07Made minimap visible by defaultBjørn Lindeijer1-0/+2
Also remember its visibility state.
2008-12-07Tweaked some configuration defaultsBjørn Lindeijer3-10/+10
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 Rice68-352/+1368
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 Lindeijer5-29/+23
2008-12-07Added some initialization and removed ChargeDialogBjørn Lindeijer8-128/+13
Many member variables of LocalPlayer were not being initialized properly. In general this shouldn't have caused any problems, but it's bad style. The ChargeDialog was removed. This class was long dead anyway. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-12-07Updated version to 0.0.27Bjørn Lindeijer1-2/+2
2008-12-07Fixed inconsistency in default window sizesBjørn Lindeijer9-21/+22
The default window sizes were all too small, since they were specified in content size. On pressing "Reset Windows", the sizes would be interpreted as such and apply alright. The inconsistency is now removed, and the default window sizes are always the size of the whole widget now, not just the contents. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-12-07Use widgetResized to adjust chat window contentsBjørn Lindeijer2-6/+4
Previously was using the logic() method, adjusting window contents 100 times per second.
2008-12-07Made minimap visible by defaultBjørn Lindeijer1-0/+2
Also remember its visibility state.
2008-12-07Tweaked some configuration defaultsBjørn Lindeijer3-10/+10
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-07Some small updates and reformattingBjørn Lindeijer4-61/+49
2008-12-07Added client-side status change handlers (text, icon, particle effect, audio).Fate14-38/+559
2008-12-06Merge branch 'master' into statuseffectsFate2-30/+36
2008-12-06For interaction popup window: serialise beings as IDs and look up, to allow ↵Fate2-30/+36
them to vanish whist the interaction popup window is open
2008-12-06Defrobnicated ParticleContainer inheritance hierarchyFate3-31/+69
2008-12-06Merge branch 'master' into statuseffectsFate10-136/+187
2008-12-06Minor punctuation fix, merged earlier /whisper fix/help update with separate ↵Fate1-2/+2
fix for same issue
2008-12-06Merge branch 'master' of git@gitorious.org:tmw/eathenaFate9-95/+133
2008-12-06Fixes to the /w commandFate1-2/+4
2008-12-07Fix background on resolutions other than 800x600Bjørn Lindeijer1-1/+10
The image is now centered and a gray background is drawn behind it so that parts that are not covered by the image don't show redrawing issues. (cherry picked from eAthena commit 07c2da75b7d994ab097e7c50d865bee929623685) Conflicts: src/main.cpp
2008-12-07Fixed wrapping in some cases, removed draw methodBjørn Lindeijer4-53/+21
The 'draw' method was confusingly named, and was actually for updating the GUI after a resize. Its functionality has been merged into 'widgetResized'. The wrapping was broken in the case where text was added to the NPC dialog, cause it was added to an already wrapped string, causing the wrapping to become permanent. Sorry for all the reformatting. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl> (cherry picked from eAthena commit 43eb6ba950dd8bf978e539c7c7460ef5096438de) Conflicts: src/gui/npclistdialog.cpp src/gui/npclistdialog.h
2008-12-07Made NPC dialogues resizeable.Ira Rice4-7/+94
Conflicts: src/gui/inventorywindow.cpp src/gui/npc_text.cpp (cherry picked from eAthena commit 523eed88816298b1660ecb9e67db80776e4007bb)
2008-12-06Fix background on resolutions other than 800x600Bjørn Lindeijer1-1/+10
The image is now centered and a gray background is drawn behind it so that parts that are not covered by the image don't show redrawing issues.
2008-12-07Removed unnecessary weight check in itemdb loaderLloyd Bryant1-3/+3
(cherry picked from Aethyra commit e3fef730b69e4edc328e6105ea48b9774631563d)
2008-12-07Fix race condition with a std::string accessBjørn Lindeijer4-15/+127
The downloading thread was writing to a std::string while the main thread was trying to draw it, for example. Now access to the label caption is guarded with a mutex. Should fix crashes while downloading updates. (cherry picked from eAthena branch, commits 6ac9c3bce62a8fc79e23477417188108f0ad9fa6 and 06d0205bab253ec5d01e8483ab639a092fe117c5)
2008-12-06Prevent the player from continuing to walk after opening a NPC dialog.Ira Rice1-0/+3
This used to be caused by right clicking on an NPC, then clicking on it and telling the sprite to move at the same time. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-07Fade out mouse cursor when not used for some timeBjørn Lindeijer2-12/+46
The mouse cursor will now disappear when not used for 15 seconds. When using OpenGL it will even fade. Requested by doorsman. (cherry picked from eAthena branch)
2008-12-07Set headers for CURL so that proxies won't cacheKraant1-0/+16
Applied only to resources2.txt and news.txt. (cherry picked from commits 047f598be826dd57dd1124db914e8367256112be, cabf8905526b6601813573d049f6afaf364e1cac and 416e28057f5a6073a2ef44f296ed1c8bc1280bf6)
2008-12-06Fixed NPC dialogs so that they properly wrap. Broken by the last cherryIra Rice1-0/+5
commit. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-06Fixed wrapping in some cases, removed draw methodBjørn Lindeijer4-57/+24
The 'draw' method was confusingly named, and was actually for updating the GUI after a resize. Its functionality has been merged into 'widgetResized'. The wrapping was broken in the case where text was added to the NPC dialog, cause it was added to an already wrapped string, causing the wrapping to become permanent. Sorry for all the reformatting. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-12-07Some code reformatting and updated NEWSBjørn Lindeijer1-10/+12
2008-12-07Changed proxy fix to only tell the proxy to no-cacheKraant1-6/+11
for news.txt and resources2.txt. (cherry picked from Aethyra commit 3206b3254a1a9b90bbdbd1a7178e4df043a5ee26)
2008-12-07Set headers for CURL so that proxies won't cache filesKraant1-0/+9
to fix bug that causes resources2.txt to be old and out of sync with the files in the directory. (cherry picked from Aethyra commit ccacde4192268fbf5250e9bd6894d158f957922c)
2008-12-07Changed the status window so that all the information appears by defaultDouglas Boffey1-1/+1
(cherry picked from Aethyra commit 0f033c073c7ae630c9359da358128f5f425f01a6)
2008-12-07Fixed wrapping in some cases, removed draw methodBjørn Lindeijer4-59/+24
The 'draw' method was confusingly named, and was actually for updating the GUI after a resize. Its functionality has been merged into 'widgetResized'. The wrapping was broken in the case where text was added to the NPC dialog, cause it was added to an already wrapped string, causing the wrapping to become permanent. Sorry for all the reformatting. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-12-07Made NPC dialogues resizeable.Ira Rice4-7/+94
(cherry picked from Aethyra commit 81299ca9acc39dec62e1e504781721ad0db0d471) Conflicts: src/gui/inventorywindow.cpp src/gui/npc_text.cpp
2008-12-06Some code formattingBjørn Lindeijer1-45/+12
2008-12-06Made /where response include position informationBjørn Lindeijer1-1/+4
Change ported from Aethyra.
2008-12-06Removed unnecessary weight check in itemdb loaderLloyd Bryant1-3/+3
(cherry picked from Aethyra commit e3fef730b69e4edc328e6105ea48b9774631563d)
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-04-22 03:37:43 +0000