summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
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-07Fixed a few files that apparently weren't updated.Ira Rice5-16/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-07Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'Ira Rice109-452/+7740
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-06Defrobnicated ParticleContainer inheritance hierarchyFate3-31/+69
2008-12-06Merge branch 'master' into statuseffectsFate12-137/+191
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/eathenaFate11-96/+137
2008-12-06Fixes to the /w commandFate1-2/+4
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-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-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 Lindeijer2-10/+14
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-06Updated link to the forumsBjørn Lindeijer2-1/+2
Only a few years overdue?
2008-12-06Removed unnecessary weight check in itemdb loaderLloyd Bryant1-3/+3
(cherry picked from Aethyra commit e3fef730b69e4edc328e6105ea48b9774631563d)
2008-12-06More files that Bjorn reccommended aren't needed.Ira Rice5-2344/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-06Removed the automate cash, as reccommended by Bjorn.Ira Rice2-700/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-06Added particle containers and refactored beings to use them (to clean up ↵Fate5-31/+281
responsibilities a little)
2008-12-06Fix whisperingJared Adams1-2/+2
2008-12-05added /w shortcut for whisperingFate2-41/+52
2008-12-05Fade 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.
2008-12-05Fixed MutexLocker to not work on a copyBjørn Lindeijer2-7/+10
The Mutex class wasn't meant to be copied around. Silly last minute refactorings leading to untested code...
2008-12-05Fix race condition with a std::string accessBjørn Lindeijer4-15/+124
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.
2008-12-05Fade 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.
2008-12-05Fixed MutexLocker to not work on a copyBjørn Lindeijer2-7/+10
The Mutex class wasn't meant to be copied around. Silly last minute refactorings leading to untested code...
2008-12-05Fix race condition with a std::string accessBjørn Lindeijer4-15/+124
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.
2008-12-03Don't reuse the setupWindow variable from the gameBjørn Lindeijer1-2/+2
Fixes crash on exit caused by double deletion.
2008-12-03Disabled "Reset Windows" button when appropriateBjørn Lindeijer1-0/+9
You shouldn't be able to press "Reset Windows" before the in-game windows have been created. Previously this would crash.
2008-12-04Don't reuse the setupWindow variable from the gameBjørn Lindeijer1-2/+2
Fixes crash on exit caused by double deletion.
2008-12-04Deleted a few dangling pointers noticed by Bjorn.Ira Rice1-1/+6
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-03Revised pointer deletion based on Bjorn's suggestion.Ira Rice1-0/+4
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-03Fixed pointer deletion so that the setup window doesn't get doubleIra Rice1-2/+0
deleted. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-03Merge branch 'master' of git@gitorious.org:tmw/aethyraIra Rice0-0/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-03Deleted a few dangling pointers noticed by Bjorn.Ira Rice1-1/+4
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-03Deleted a few dangling pointers noticed by Bjorn.Ira Rice1-1/+4
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-03NEWS file updates for imported commitsBjørn Lindeijer1-0/+2
2008-12-03Disabled "Reset Windows" button when appropriateBjørn Lindeijer1-0/+9
You shouldn't be able to press "Reset Windows" before the in-game windows have been created. Previously this would crash.
2008-12-03Added the setup button to show when the client is loaded, since all ofIra Rice1-0/+37
the settings in it can be changed on client startup and aren't game specific.
2008-12-03While there is still a small visual artifact, this patch fixes the buyIra Rice1-0/+3
window so that it properly reports how much money you have.
2008-12-03Adding missing mJobLvlLabel from last commitBjørn Lindeijer1-1/+3
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-07 15:11:59 +0000