summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2008-12-17Code reformattingBjørn Lindeijer23-182/+138
Mainly making sure 'const std::string &' is used everywhere instead of 'std::string const &'. The former has always been the preferred order in this project.
2008-12-14Tweaked some configuration defaultsBjørn Lindeijer2-9/+9
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. (cherry picked from eAthena branch, commit c56bc78b5f5676784265dff8ed5334884e8dcc39) Conflicts: src/main.cpp
2008-12-14Fixed inconsistency in default window sizesBjørn Lindeijer8-10/+11
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> (cherry picked from eAthena branch, commit 72f5288682f46af1f7c04c002172178c880e060b) Conflicts: src/gui/chat.cpp src/gui/equipmentwindow.cpp src/gui/inventorywindow.cpp src/gui/ministatus.cpp src/gui/setup.cpp src/gui/skill.cpp src/gui/trade.cpp src/gui/window.cpp
2008-12-14Removed unnecessary c_str()Bjørn Lindeijer1-1/+1
2008-12-14Code reformatting to conform to line lengthBjørn Lindeijer1-39/+57
2008-12-14Obscure precise home directory name when making screenshotsFate1-4/+9
(cherry picked from commit 7d5c6124e9c9cf447286eaa58afe17adf6c1a81d)
2008-12-14Removed the unused NewSkillDialogBjørn Lindeijer5-271/+0
Won't be introduced based on eAthena anyway, I think even with tmwserv we have different plans now. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl> (cherry picked from eAthena branch, commit bab09df7a8347f39221b2a87487dcd128a686def) Conflicts: src/game.cpp
2008-12-14Make the window shortcuts configurableJared Adams3-10/+28
(cherry picked from commit 4f2749ab2782fdece3c098b1a52b69cb37eea9eb)
2008-12-14Code reformattingBjørn Lindeijer12-238/+144
I wish I had never fallen for this weird style, and I hope removing it will prevent others from introducing new code like this. :-) (cherry picked from eAthena branch, commit 68760426532b9ca4c6939d7a7b8faa1586ee82e0) Conflicts: src/being.cpp src/being.h src/gui/tabbedcontainer.cpp src/particle.cpp src/particle.h
2008-12-14Removed ChargeDialogBjørn Lindeijer6-120/+0
The ChargeDialog was removed. This class was long dead anyway. (cherry picked from eAthena client commit 719e2b02bc6833198d6af2d3c95de96ef95f876d) Conflicts: src/CMakeLists.txt src/Makefile.am src/game.cpp src/localplayer.cpp src/localplayer.h src/net/charserverhandler.cpp tmw.cbp Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-12-13Fixed confusion between username and characterBjørn Lindeijer1-20/+26
Passing --playername would set both the username as well as the name of the character to play with. Now --username sets the username while --character is used for choosing the character. Also made it so that the login dialog won't show up when username and password are passed from the command line, unless login fails.
2008-12-13Got rid of confusing --default parameterBjørn Lindeijer1-19/+6
It was only used to automatically choose the character. For choosing the character, --playername can be used.
2008-12-13Only require a restart to switch to full screen with OpenGL on Windows, sinceBjørn Lindeijer1-0/+11
it works fine in Linux without having to reinitialize the OpenGL state. Adapted change by kraant from Aethyra. (cherry picked from eAthena client)
2008-12-13Mantis #406 by jaxad0127David Athay4-14/+34
(cherry picked from eAthena client) Conflicts: src/monster.cpp src/resources/monsterinfo.h
2008-12-13Fixed crash when map layer has too many tiles.Bjørn Lindeijer1-1/+7
(cherry picked from eAthena client)
2008-12-13Fixed alignment (patch by Scraggy - Mantis #384) and spelling error.David Athay1-2/+2
(cherry picked from eAthena client)
2008-12-13Added support for being effects through the eAthena levelup message, and checkBjørn Lindeijer8-4/+163
whether the being exists before referencing it. Re-enabled proper MP bar display. Improved handling of a warp to the same map. (patch by Fate) (cherry picked from eAthena client, the part about the levelup message doesn't apply, and we now seem to have a second "effect manager"...) Conflicts: ChangeLog src/being.cpp src/being.h src/engine.cpp src/engine.h src/gui/ministatus.cpp src/net/beinghandler.cpp src/net/playerhandler.cpp src/net/protocol.h
2008-12-13The "name" property of the map is now used as caption of the minimap window ↵Philipp Sehmisch1-11/+6
when it exists. (cherry picked from eAthena client, replacing 'mapname' property handling)
2008-12-13Make sure to initialize joystick enabled stateBjørn Lindeijer3-48/+31
Joystick enabled state could end up uninitialized on unsuccesfully trying to open a joystick. In addition, the enabled state wasn't actually used in the accessor methods for the joystick buttons.
2008-12-13Delete resources after removing from the orphan list, to avoid double frees ↵Fate1-1/+1
during recursion
2008-12-13Added ability to add equipment to the shurtcut barBjørn Lindeijer3-20/+23
Patch by Nikos, with some improvements. Conflicts: NEWS src/gui/itemcontainer.cpp src/itemshortcut.cpp (cherry picked from eAthena client, not functional here yet)
2008-12-13Center large minimaps on playerBjørn Lindeijer1-20/+21
Based on a patch by QOAL. (cherry picked from eAthena client) Conflicts: src/gui/minimap.cpp
2008-12-13Fixed compile error with GCC 4.4 reported by Martin Michlmayr.Bjørn Lindeijer1-5/+1
(cherry picked from eAthena client) Conflicts: ChangeLog
2008-12-13Do not activate shortcuts if tradewindow is visible.Dennis Friis1-8/+12
Conflicts: ChangeLog src/game.cpp (cherry picked from eAthena client)
2008-12-13* Use hair.xml to determine hair colours (#514)Fate4-25/+108
* Auto-detect number of hair styles available (#514) Conflicts: ChangeLog src/being.cpp src/being.h src/gui/char_select.cpp (cherry picked from eAthena client)
2008-12-13Moved gender and hair style back to BeingBjørn Lindeijer4-33/+48
These properties should also apply to NPCs and possibly even monsters in the future.
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-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-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-06Some code formattingBjørn Lindeijer1-23/+8
2008-11-24Converted some DOS newlines to UNIXBjørn Lindeijer3-190/+190
2008-11-21Undo message id change to maintain compatibilityBjørn Lindeijer1-1/+1
2008-11-20Renabled the dynamic updatesBjørn Lindeijer6-123/+184
The update host can be optionally received from the server in a succesful login response or register response message. This change also merged Subversion commits 4425 and 4426: ........ r4425 | b_lindeijer | 2008-07-18 00:52:53 +0200 (Fri, 18 Jul 2008) | 3 lines -- Added support for handling the custom eAthena packet that sends the update host (patch by Sanga). ........ r4426 | b_lindeijer | 2008-07-18 01:08:17 +0200 (Fri, 18 Jul 2008) | 3 lines -- Remove possible trailing slash at the end of the update host, since otherwise there'll be two of them.
2008-11-18fix build with cmakeRoderic Morris1-0/+2
2008-11-18Added the font file to branding.xmlPhilipp Sehmisch2-2/+5
2008-11-16Whitespace and indentation fixesBjørn Lindeijer8-65/+49
2008-11-16Got rid of CVS/Subversion $Id$ markersBjørn Lindeijer365-719/+0
I don't know why we dealt with these things for so long. Did we ever get anything out of it?
2008-11-16Fixed some indentsBjørn Lindeijer1-4/+4
2008-11-16Fixed warning about unused variableBjørn Lindeijer1-1/+1
Since I compile with -Werror, even small warnings like this are annoying. Please keep that in mind. ;)
2008-11-13Updated makefileDavid Athay1-1/+3
2008-11-13Added avatars to party windowDavid Athay7-24/+185
2008-11-12Fixed multiline editing for lettersDavid Athay2-2/+5
2008-11-12Fixed chat transparency and icon loading.David Athay2-16/+18
2008-11-11Moved some hardcoded strings and filenames to an external configuration file.Philipp Sehmisch3-23/+36
2008-11-06Added interface for sending post.David Athay11-130/+167
2008-11-04Merged revisions 4332 via svnmerge from Bjørn Lindeijer5-69/+142
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0 ........ r4332 | b_lindeijer | 2008-06-05 09:33:12 +0200 (Thu, 05 Jun 2008) | 5 lines Added command line argument to specify the update host (-H). Also, to avoid problems when files with the same name are served by different update hosts, the updates are now stored in an update host specific directory. Based on a patch by Sanga. ........
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-20 21:17:30 +0000