diff options
| -rw-r--r-- | data/help/about.txt | 30 | ||||
| -rw-r--r-- | data/help/changes.txt | 294 | ||||
| -rw-r--r-- | data/help/commands.txt | 95 | ||||
| -rw-r--r-- | data/help/index.txt | 10 | ||||
| -rw-r--r-- | data/help/support.txt | 13 | ||||
| -rw-r--r-- | data/help/windows.txt | 11 | ||||
| -rw-r--r-- | src/gui/helpwindow.cpp | 10 |
7 files changed, 233 insertions, 230 deletions
diff --git a/data/help/about.txt b/data/help/about.txt index 5ef0d606..5d7477cf 100644 --- a/data/help/about.txt +++ b/data/help/about.txt @@ -1,19 +1,19 @@ - <- @@index|Back to Index@@ - - +<- @@index|Back to Index@@ + + ##3 === ABOUT MANA === - - ##2Mana##0 is a serious effort to create an innovative free and open - source MMORPG Client. Mana uses 2D graphics and aims to create a large - and diverse interactive world. It is licensed under the GPL, making - sure this game can't ever run away from you. - - The project includes the development of both a client and a server. - Others are making worlds using Mana software. The Mana World project - is the originator of the Mana project. Mana was split off to further - facilitate development of other worlds. - - + +##2Mana##0 is a serious effort to create an innovative free and open +source MMORPG Client. Mana uses 2D graphics and aims to create a large +and diverse interactive world. It is licensed under the GPL, making +sure this game can't ever run away from you. + +The project includes the development of both a client and a server. +Others are making worlds using Mana software. The Mana World project +is the originator of the Mana project. Mana was split off to further +facilitate development of other worlds. + + ##3 === Powered By === ##2 SDL, SDL_image, SDL_mixer (Media framework) diff --git a/data/help/changes.txt b/data/help/changes.txt index a080b2d7..bcbe7e12 100644 --- a/data/help/changes.txt +++ b/data/help/changes.txt @@ -1,147 +1,155 @@ - <- @@index|Back to Index@@ +<- @@index|Back to Index@@ ##3 === RECENT CHANGES === -##0 - 0.6.1 (2 April 2012) - - Made it easier to click beings that are next to other beings - - Removed NPC trade messages from chat (again) - - Fixed swapping of ring and necklace equipment slots - - Fixed problems with using the last emote - - Fixed drawing order of particles - - Fixed manaserv-enabled builds - - Fixed category of mana.desktop file - - Fixed display of server description - - Fixed issues with rendering very small maps - - Fixed compile for Mac OSX and reintroduced Xcode project - - Updated Finnish, Brazilian Portuguese and Polish translations - - 0.6.0 (12 February 2012) - - Added support for a larger number of character slots - - Added scrolling to tab bars when there isn't enough space - - Added a search bar to storage and inventory windows - - Added chat logging - - Added a screen shake effect when the character dies - - Added item quantity in the shop list - - Added customizable hit and attack effects - - Added support for floor item sprites - - Added support for different target cursor sizes for NPCs - - Added background support to the equipment boxes - - Added offsetX/Y to 'imageset' element that applies to all its frames - - Made it possible to separate the dye colors for particle effects - - Emotes are now customizable particle effects - - Allow resizing of the game in windowed mode - - Allow switching between windowed and fullscreen without restart - - Layered sprites are now buffered for performance and overlay support - - Announcements now go to the active chat tab in addition to global chat - - Fade out music when switching maps - - Stream music files directly from the archives - - Ignore ManaPlus shop commands sent over whisper - - Changed the window buttons to use icons - - Show selected target name with bold font - - Sounds that are further away are now more silent - - The NPC dialog can now be closed while it is waiting on the server - - Replaced '> Next' in NPC dialogs with just an empty line - - Made items equippable by double click in inventory - - Made the update window bigger and resizable - - Removed auto-untargeting after fighting for a minute - - Fixed the chat bubble position - - Fixed losing the active target when pressing target+attack while moving - - Fixed 'switch character' action after choosing character on command line - - Fixed hair colors and styles handling - - Fixed interpretation of collision layer with flipped tiles - - Fixed searching for wallpapers on 64-bit machines - - Many changes and fixes to manaserv support, which is still experimental - - Updated the German, French and Spanish translations - - 0.5.3 (11 September 2011) - - Fixed endless loop when a sprite definition promises too many images - - Fixed crash when selecting a character that has a Dark Talisman equipped - - Fixed building without OpenGL - - 0.5.2 (17 April 2011) - - Removed NPC "Thanks for buying/selling" messages from the chat - - Added a few missing authentication failure reasons - - Avoid kick from server due to picking up items too fast - - Fixed updating of buy dialog after buying - - Fixed compile on GNU HURD - - Updated French and Finnish translations - - 0.5.1 (14 March 2011) - - Added particle notification for "Unable to pick up item." - - Added the amount of items picked up to the particle notification - - Added more specific messages when failing to pick up an item - - Added support for zlib map layer compression and CSV encoding - - Fixed paste under X11 - - Fixed a segfault when attempting to buy free items - - Fixed wallpaper loading logic - - Fixed window icon branding on Windows - - Fixed pick-up with joystick - - Fixed enet and manaserv parts still being compiled in - - Fixed query command handling - - Updated German, French, Russian and Brazilian Portuguese translations - - 0.5.0 (3 January 2011) - - The Mana World client is now called the Mana client - - Added support for branding the client differently via command line parameter - - Added support for switching character or server without restart - - Added downloading of server list - - Added the ability to define multiple outfits to quickly switch between - - Added /ignore, /unignore and /createparty commands - - Added away mode usable through new /away command - - Added support for showing particle effects when monsters attack - - Added highlights on hovering over buttons, tabs, sliders and scrollbars - - Added --screenshot-dir command line parameter to set the screenshot directory - - Added handling of player revival after dying - - Added handling of damage dealt using skills - - Added support for showing map background images - - Added nick autocompletion in chat when pressing Tab - - Added ability to only change player direction by holding "emote" key - - Added option to show the amount of damage dealt to target monster - - Added automatic loading of minimap based on file name - - Added support for pasting text from the clipboard in text fields - - Added rudimentary support for GUI themes - - Added additional mouse cursors to indicate attack and talk actions - - Added option to show gender next to player names - - Added ability to unassign keyboard shortcuts - - Added option to disable transparency (for slow CPUs) - - Display an informative message for servers that don't allow registration - - Combined Party and Guild (ManaServ) support in one Social window - - Display the first key binding conflict in keyboard setup - - The login wallpaper is now scaled when it doesn't exactly fit the screen - - Ambient image layers can now be scaled to fit the screen - - Automatically show inventory window when starting a trade - - Display the party name of other players on mouseover - - The party tab will now only show when you're in a party - - Allow displaying warp portals using particle effects - - Hide color codes from speech text - - Improved keyboard control of the quit dialog - - Quickly move items into your store by "emote"-clicking them - - Allow redirects when downloading updates - - Fixed windows to stay on screen when resolution is lowered - - Fixed some slowness due to chat window - - Changed the default locations for configuration, updates and screenshots - - Removed autoconf and made CMake the new default build system - - Many additional fixes and cleanups - - Updated Portuguese, Spanish and French translations - - 0.0.29.1 (9 June 2009) - - Added the ability to change your password after logging in - - The leader of a party is now displayed in bold - - Status window was reorganized to allow larger numbers to be displayed - - The client no longer quits when it can't find the current map - - Fixed position of floating text for damage, pickup and experience - - Fixed a possible crash on logging in to the map server - - Fixed the crash when shift-clicking an item in the inventory - - Fixed a crash related to item links in the chat window - - Fixed a crash on whispering somebody again after closing their tab - - Fixed lightspeed bug when stopping to attack - - Fixed the -S/--home-dir command line option - - Fixed Reset Windows to also reset the party window - - Fixed problems with the context menu in the Brazilian translation - - Fixed resetting the height of the chat on /clear - - Fixed playing of login song and the music after login - - Fixed a problem with the player skipping corners, desyncing from the server - - Small optimizations to OpenGL mode when drawing certain GUI widgets - - Updated Spanish, Polish, Portugese, Swedish, French and German translations + + +##3Mana 0.6.1 (2 April 2012) + +- Made it easier to click beings that are next to other beings +- Removed NPC trade messages from chat (again) +- Fixed swapping of ring and necklace equipment slots +- Fixed problems with using the last emote +- Fixed drawing order of particles +- Fixed manaserv-enabled builds +- Fixed category of mana.desktop file +- Fixed display of server description +- Fixed issues with rendering very small maps +- Fixed compile for Mac OSX and reintroduced Xcode project +- Updated Finnish, Brazilian Portuguese and Polish translations + +##3Mana 0.6.0 (12 February 2012) + +- Added support for a larger number of character slots +- Added scrolling to tab bars when there isn't enough space +- Added a search bar to storage and inventory windows +- Added chat logging +- Added a screen shake effect when the character dies +- Added item quantity in the shop list +- Added customizable hit and attack effects +- Added support for floor item sprites +- Added support for different target cursor sizes for NPCs +- Added background support to the equipment boxes +- Added offsetX/Y to 'imageset' element that applies to all its frames +- Made it possible to separate the dye colors for particle effects +- Emotes are now customizable particle effects +- Allow resizing of the game in windowed mode +- Allow switching between windowed and fullscreen without restart +- Layered sprites are now buffered for performance and overlay support +- Announcements now go to the active chat tab in addition to global chat +- Fade out music when switching maps +- Stream music files directly from the archives +- Ignore ManaPlus shop commands sent over whisper +- Changed the window buttons to use icons +- Show selected target name with bold font +- Sounds that are further away are now more silent +- The NPC dialog can now be closed while it is waiting on the server +- Replaced '> Next' in NPC dialogs with just an empty line +- Made items equippable by double click in inventory +- Made the update window bigger and resizable +- Removed auto-untargeting after fighting for a minute +- Fixed the chat bubble position +- Fixed losing the active target when pressing target+attack while moving +- Fixed 'switch character' action after choosing character on command line +- Fixed hair colors and styles handling +- Fixed interpretation of collision layer with flipped tiles +- Fixed searching for wallpapers on 64-bit machines +- Many changes and fixes to manaserv support, which is still experimental +- Updated the German, French and Spanish translations + +##3Mana 0.5.3 (11 September 2011) + +- Fixed endless loop when a sprite definition promises too many images +- Fixed crash when selecting a character that has a Dark Talisman equipped +- Fixed building without OpenGL + +##3Mana 0.5.2 (17 April 2011) + +- Removed NPC "Thanks for buying/selling" messages from the chat +- Added a few missing authentication failure reasons +- Avoid kick from server due to picking up items too fast +- Fixed updating of buy dialog after buying +- Fixed compile on GNU HURD +- Updated French and Finnish translations + +##3Mana 0.5.1 (14 March 2011) + +- Added particle notification for "Unable to pick up item." +- Added the amount of items picked up to the particle notification +- Added more specific messages when failing to pick up an item +- Added support for zlib map layer compression and CSV encoding +- Fixed paste under X11 +- Fixed a segfault when attempting to buy free items +- Fixed wallpaper loading logic +- Fixed window icon branding on Windows +- Fixed pick-up with joystick +- Fixed enet and manaserv parts still being compiled in +- Fixed query command handling +- Updated German, French, Russian and Brazilian Portuguese translations + +##3Mana 0.5.0 (3 January 2011) + +- The Mana World client is now called the Mana client +- Added support for branding the client differently via command line parameter +- Added support for switching character or server without restart +- Added downloading of server list +- Added the ability to define multiple outfits to quickly switch between +- Added /ignore, /unignore and /createparty commands +- Added away mode usable through new /away command +- Added support for showing particle effects when monsters attack +- Added highlights on hovering over buttons, tabs, sliders and scrollbars +- Added --screenshot-dir command line parameter to set the screenshot directory +- Added handling of player revival after dying +- Added handling of damage dealt using skills +- Added support for showing map background images +- Added nick autocompletion in chat when pressing Tab +- Added ability to only change player direction by holding "emote" key +- Added option to show the amount of damage dealt to target monster +- Added automatic loading of minimap based on file name +- Added support for pasting text from the clipboard in text fields +- Added rudimentary support for GUI themes +- Added additional mouse cursors to indicate attack and talk actions +- Added option to show gender next to player names +- Added ability to unassign keyboard shortcuts +- Added option to disable transparency (for slow CPUs) +- Display an informative message for servers that don't allow registration +- Combined Party and Guild (ManaServ) support in one Social window +- Display the first key binding conflict in keyboard setup +- The login wallpaper is now scaled when it doesn't exactly fit the screen +- Ambient image layers can now be scaled to fit the screen +- Automatically show inventory window when starting a trade +- Display the party name of other players on mouseover +- The party tab will now only show when you're in a party +- Allow displaying warp portals using particle effects +- Hide color codes from speech text +- Improved keyboard control of the quit dialog +- Quickly move items into your store by "emote"-clicking them +- Allow redirects when downloading updates +- Fixed windows to stay on screen when resolution is lowered +- Fixed some slowness due to chat window +- Changed the default locations for configuration, updates and screenshots +- Removed autoconf and made CMake the new default build system +- Many additional fixes and cleanups +- Updated Portuguese, Spanish and French translations + +##3The Mana World 0.0.29.1 (9 June 2009) + +- Added the ability to change your password after logging in +- The leader of a party is now displayed in bold +- Status window was reorganized to allow larger numbers to be displayed +- The client no longer quits when it can't find the current map +- Fixed position of floating text for damage, pickup and experience +- Fixed a possible crash on logging in to the map server +- Fixed the crash when shift-clicking an item in the inventory +- Fixed a crash related to item links in the chat window +- Fixed a crash on whispering somebody again after closing their tab +- Fixed lightspeed bug when stopping to attack +- Fixed the -S/--home-dir command line option +- Fixed Reset Windows to also reset the party window +- Fixed problems with the context menu in the Brazilian translation +- Fixed resetting the height of the chat on /clear +- Fixed playing of login song and the music after login +- Fixed a problem with the player skipping corners, desyncing from the server +- Small optimizations to OpenGL mode when drawing certain GUI widgets +- Updated Spanish, Polish, Portugese, Swedish, French and German translations diff --git a/data/help/commands.txt b/data/help/commands.txt index 71017c10..ae3d5005 100644 --- a/data/help/commands.txt +++ b/data/help/commands.txt @@ -1,11 +1,11 @@ - <- @@index|Back to Index@@ +<- @@index|Back to Index@@ ##3 === COMMANDS === -##0 -KEYBOARD: -##2 Use arrow keys to move around. +##3KEYBOARD: + +Use arrow keys to move around. ##3Most useful keys: @@ -55,60 +55,61 @@ KEYBOARD: ##3MOUSE: -##0 - Left click to execute default action: walk, pick up an item, attack a monster - and talk to NPCs. Right click to show up a context menu. + +Left click to execute default action: walk, pick up an item, attack a monster +and talk to NPCs. Right click to show up a context menu. ##3COMMUNICATION: -##0 - Communication is often essential to success in this game. You can communicate - in several ways: By chatting and showing emotions (see above), by trading - (with the right-click context menu), and by whispering. - - To whisper, type -##2 - /whisper <name> <message> -##0 + +Communication is often essential to success in this game. You can communicate +in several ways: By chatting and showing emotions (see above), by trading +(with the right-click context menu), and by whispering. + +To whisper, type + +##2 /whisper <name> <message> + This will send <message> to player <name>, if that player is logged in. If the name has a space in it, put double quotes around it like this: -##2 - /whisper "<name>" <message> -##0 - For further help type /help in the chat console. + +##2 /whisper "<name>" <message> + +For further help type /help in the chat console. ##3IGNORING COMMUNICATION -##0 - You may find that not all communication is to your liking. While most people - are nice, some may offend you or try to make your life harder. Since this is - an open game, there is nothing the developers can do to prevent this. - However, you can protect yourself from such players by ignoring them. Right- - click on them to bring up the context menu, then select `Ignore´ or - `Disregard´ (see below). You can fine-tune your player relations in the - `Setup´ menu, which lists all the players you have added to it. To open this - menu, select `Setup´ in the upper right corner of the screen, then `Players´. +You may find that not all communication is to your liking. While most people +are nice, some may offend you or try to make your life harder. Since this is +an open game, there is nothing the developers can do to prevent this. + +However, you can protect yourself from such players by ignoring them. Right- +click on them to bring up the context menu, then select `Ignore´ or +`Disregard´ (see below). You can fine-tune your player relations in the +`Setup´ menu, which lists all the players you have added to it. To open this +menu, select `Setup´ in the upper right corner of the screen, then `Players´. - There you will find a list of all players you are acquainted with, as well as - several configuration options: +There you will find a list of all players you are acquainted with, as well as +several configuration options: + +- allow trading: Do you wish to allow trade requests from arbitrary players? +- allow whispers: Do you wish to allow arbitrary players to send + private messages to you in-game? - - allow trading: Do you wish to allow trade requests from arbitrary players? - - allow whispers: Do you wish to allow arbitrary players to send - private messages to you in-game? ##3THE PLAYER LIST -##0 - The player list lists all of your acquaintances. They are categorised as one - of the following: - - - ##2neutral##0: As far as the game is concerned, this is the same as not - having the player listed: the player may chat with you, but may only trade - or whisper if you have this option allowed for everyone. - - ##2friend##0: You consider this player a friend. The player may chat, - message your in private, or trade with you at any point. - - ##2disregarded##0: You wish to disregard this player, meaning that his or - her trade requests and whispers are ignored. - - ##2ignored##0: You wish to completely ignore this player. You will not - even see emotions for him or her anymore. + +The player list lists all of your acquaintances. They are categorised as one +of the following: + +- ##2neutral##0: As far as the game is concerned, this is the same as not + having the player listed: the player may chat with you, but may only trade + or whisper if you have this option allowed for everyone. +- ##2friend##0: You consider this player a friend. The player may chat, + message your in private, or trade with you at any point. +- ##2disregarded##0: You wish to disregard this player, meaning that his or + her trade requests and whispers are ignored. +- ##2ignored##0: You wish to completely ignore this player. You will not + even see emotions for him or her anymore. diff --git a/data/help/index.txt b/data/help/index.txt index fbe82da5..2cf1d5ad 100644 --- a/data/help/index.txt +++ b/data/help/index.txt @@ -1,9 +1,9 @@ ##3 === INDEX === - -> @@about|About Mana@@ - -> @@changes|Recent Changes@@ +-> @@about|About Mana@@ +-> @@changes|Recent Changes@@ - -> @@commands|Commands@@ - -> @@windows|Windows@@ +-> @@commands|Commands@@ +-> @@windows|Windows@@ - -> @@support|Support@@ +-> @@support|Support@@ diff --git a/data/help/support.txt b/data/help/support.txt index 8a554ece..0e4513c9 100644 --- a/data/help/support.txt +++ b/data/help/support.txt @@ -2,14 +2,13 @@ ##3 === SUPPORT === -##0 - If you're having troubles, plase first of all read the FAQ. If you - can't find a solution to your problem, feel free to check our - Bugs/Support section of the forum: + +If you're having trouble, please first of all read the FAQ. If you +can't find a solution to your problem, feel free to check our +Bugs/Support section of the forum: ##2 http://forums.themanaworld.org/viewforum.php?f=3 -##0 - or come visit us on our IRC channel: -##2 #mana ##0@##2 irc.freenode.net +or come visit us on our IRC channel: +##2 #mana ##0@##2 irc.libera.chat diff --git a/data/help/windows.txt b/data/help/windows.txt index 6757dd5b..47c435f9 100644 --- a/data/help/windows.txt +++ b/data/help/windows.txt @@ -4,10 +4,9 @@ ##3 === WINDOWS === ##2SHORTCUT: -##0 - To add an item to the shortcut bar click on the item in the inventory window, - then click on the box in the shortcut-window which should be associated with - the item. To reorder items within the shortcut-window simply click and drag - them between the boxes. To remove items you simply drag them outside of the - window and drop them. +To add an item to the shortcut bar click on the item in the inventory window, +then click on the box in the shortcut-window which should be associated with +the item. To reorder items within the shortcut-window simply click and drag +them between the boxes. To remove items you simply drag them outside of the +window and drop them. diff --git a/src/gui/helpwindow.cpp b/src/gui/helpwindow.cpp index 1dfc109e..7bb31188 100644 --- a/src/gui/helpwindow.cpp +++ b/src/gui/helpwindow.cpp @@ -47,6 +47,7 @@ HelpWindow::HelpWindow(): setDefaultSize(500, 400, ImageRect::CENTER); mBrowserBox = new BrowserBox; + mBrowserBox->setFrameSize(4); mScrollArea = new ScrollArea(mBrowserBox); auto *okButton = new Button(_("Close"), "close", this); @@ -65,9 +66,7 @@ HelpWindow::HelpWindow(): void HelpWindow::action(const gcn::ActionEvent &event) { if (event.getId() == "close") - { setVisible(false); - } } void HelpWindow::handleLink(const std::string &link) @@ -93,11 +92,8 @@ void HelpWindow::loadFile(const std::string &file) std::string helpPath = branding.getStringValue("helpPath"); if (helpPath.empty()) helpPath = paths.getStringValue("help"); - std::vector<std::string> lines = - resman->loadTextFile(helpPath + file + ".txt"); - for (const auto &line : lines) - { + const auto lines = resman->loadTextFile(helpPath + file + ".txt"); + for (auto &line : lines) mBrowserBox->addRow(line); - } } |