summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2009-02-09Merged with Aethyra master as of 2009-02-09Bjørn Lindeijer229-1793/+2063
Conflicts: A lot of files...
2009-02-09Mostly whitespace fixesBjørn Lindeijer65-623/+627
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-09Fixed header of speech bubble codeBjørn Lindeijer2-14/+12
2009-02-09Fixed copyright notice for keyboard configurationBjørn Lindeijer5-8/+10
Also credited Joshua Langley in the AUTHORS file.
2009-02-09Merge branch 'master' of git@gitorious.org:tmw/eathenaBjørn Lindeijer11-186/+280
Conflicts: src/game.cpp src/net/charserverhandler.cpp src/net/loginhandler.cpp src/net/protocol.h
2009-02-09Fixed up the copyright headersBjørn Lindeijer21-206/+202
Decision is to go with exact authors when some file is basically done by one person, and in most other cases assign TMW or Aethyra team copyright when multiple people from those teams have been involved. Also, the first summary line should now contain the subset of functionality that the file is part of, not the name of the whole project.
2009-02-09Merged with Aethyra master as of 2009-01-27Bjørn Lindeijer297-2856/+8718
Conflicts: Almost everywhere.
2009-02-08Mostly fixed a few field values to behave better in Windows, as well asIra Rice10-43/+42
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 Rice85-222/+189
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-07Synced up the po files for the benefit of translators. There will likelyIra Rice25-14966/+14124
be no more string changes before the next version release, which is why I'm updating it now. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-07While this commit isn't really needed, this cleans up the reportedIra Rice1-3/+3
instances number so that it accurately reflects the number of instances, instead of always being +1. I wasn't intending on using that variable that way, but in case anyone does in the future, it'll at least be accurate. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-07Adjusted the shortcut window initialization so that all new shortcutIra Rice2-4/+11
window instances don't overlap by default. After that, it'll defer to the user's saved window positions. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-07Added a bit more spacing for stat labels as well, which I didn't thinkIra Rice1-20/+20
about in the last commit. They may work for each of the languages already tested, but this will make sure that it's wide enough for the ones which haven't been tested. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-07More modifications based on critiques by Omphalia.Ira Rice1-10/+9
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-07Adjusted the status window to try to make it a little more translationIra Rice1-21/+25
friendly (Omphalia was reporting that the Total label was getting cut off in the German translation) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-07Removed some debug statements, as requested by KageJittai.Ira Rice1-2/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-07Added a text color preview to the setup color tab.Ira Rice9-31/+79
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-07Small tweak to item popup locations based on some feedback that theyIra Rice1-2/+2
were a tad too close to the mouse. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-06Fixed the help function so that the help commands on help commands wouldIra Rice1-1/+0
work. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-06Sanitized item links so that at no point is the internal representationIra Rice3-14/+13
of the item link shown. This should help make it easier for people to represent the square brackets with item links, and prevent people from forging item links when they never see the internal representation of an item link. Should also reduce confusion from people who haven't upgraded their clients as well, as they wonder what all the junk is around the item name. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-06Updated strings list so that translators can update the translations.Ira Rice25-350/+350
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-06While this is not the ideal solution to the link problem, this commit atIra Rice1-0/+7
least ensures that the link will be in the correct location. Should work to fix things until a proper rewrite is figured out. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-05Forgot to check which key called the keyboard event for the ok or chatIra Rice1-15/+22
toggling. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-05Exposed some more strings I found to be translatable.Ira Rice7-29/+50
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-05Put back the 0x06b packet, which apparently our server uses. WillIra Rice1-0/+21
investigate why we use it and what this packet is meant to do. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-05Added a few translation strings to the char server handler, as well asIra Rice2-43/+15
remove the need for extensions.h in it. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-05Reduced the required checks slightly by handling the chat key and ok keyIra Rice1-10/+3
together. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-05Fixed the keyboard dialog list selection from cutting off before theIra Rice2-3/+1
scrollbar. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-05Modified the Colors setup pane to take as much space as it can. I leftIra Rice1-15/+15
it minimal in the first place so that it could be redone as a theme window in the future, but there's no reason it should be as spread out as it was until it has been made into one. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-05Rather than to settle for a broken default (if it's left at space,Ira Rice2-44/+56
then you won't be able to type spaces in the NPC integer or string dialogs. And no, assigning focus to the ok button doesn't resolve anything, but makes things worse, as then the user has to click on the input field to input text, then must click the ok button, as the chat window already overrode it's confirmation action), this commit allows for both the chat input and the NPC dialog confirming to share the same key, but allows for people to change one or the other if they want to. This will still allow for the player to use the keyboard fully for NPC dialogs, but allow for people who don't like not being able to use chat with an NPC dialog open to assign confirmation to another key and get their way as well. This is a rather ugly way of resolving both sides of the issue, but it's the only way to appease both sides. The Aethyra players want things the way they were, while Bjorn wanted things a different way. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-05Refreshed translation files to contain the keyboard configurationIra Rice25-8719/+15193
strings. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-05Three things: Split chat and NPC dialog functionality based on the TMWIra Rice4-112/+120
complaint commit d2876ad85935c5d0b181d050bd4c19a4682123b1 (btw, if you're concerned about that, return is also a bad choice for the chat window in general, which overrides the GuiChan default for use widget. Tab would also be a bad choice, as it cycles through the widgets), next, I made the text displayed by the keyboard configuration setup dialog translatable, and lastly, I exposed the rest of the previously unconfigurable keys to be configurable through the keyboard setup tab. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-05Fixed inability to chat while talking to NPCsBjørn Lindeijer1-20/+0
These checks were meant to allow the keyboard to be used to close the NPC dialogs, however in this form they prevent the user from being able to chat while talking to NPCs. Better make sure the Ok button is focused, so you can use Space to close the NPC dialog.
2009-02-04Fixed a few table events. One prevented wrapping for tables when you areIra Rice1-10/+10
scrolling through the table upward, while the other didn't check upper bounds for rows and columns to see if the event is in the table, but rather just the lower bounds. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Cleaned up some login includes that I missed earlier.Ira Rice2-9/+6
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Modified the NPC string and integer classes to automatically take focusIra Rice5-8/+36
to the input fields. Now the only NPC dialog which isn't completely navigatable by the keyboard alone is the NPC list dialog (seems to have regressed slightly recently). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Added key and mouse events to the table class.Ira Rice3-12/+143
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Changed NPC list dialog to selection wrap.Ira Rice1-0/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Simplified equipment window initialization, since only the local playerIra Rice3-6/+6
has an inventory or an equipment. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Moved mEquipment to the LocalPlayer class, since it's the only placeIra Rice4-5/+4
that uses it anyways. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Added destructors to some classes originally obtained from Legends ofIra Rice4-0/+20
Mazzeroth. At the moment, I think this is the last of the missing pointer deletes, but if more are found, then I'll add them to the proper classes and delete them. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04A few more pointers which weren't getting deleted.Ira Rice4-0/+19
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Got rid of a few dangling pointers.Ira Rice1-0/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Forgot to check left clicking, as I assumed that it wouldn't break usingIra Rice1-4/+10
the same lookup code. This fixes left clicking on the last commit. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Added a right click popup menu, and item popups to the equipment window.Ira Rice2-9/+79
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04On the offchance that a player's name is longer than 130 pixels, set theIra Rice1-2/+2
mininum width for the text wrapping code to be the length of the player's name instead. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Since they're now doing the same thing, having a branch is a little bitIra Rice1-16/+6
silly. Condensed the sizing code for speech bubbles to do the same for speech bubbles of all sizes. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Fix for the last commit, where I forgot to modify the set dimension andIra Rice1-4/+2
set content size functions to use the width variable. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Not sure how this happened in the first place, but this should ensureIra Rice1-1/+3
that speech bubbles are always at least as long as the name is. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Fixed a bug in windows setup script which caused translations to be ↵Philipp Sehmisch1-2/+1
extracted to the wrong directory.
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 22:00:18 +0000