summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
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-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 bug in windows setup script which caused translations to be ↵Philipp Sehmisch1-2/+1
extracted to the wrong directory.
2009-01-29Update Swedish translation. Two (or rather three) msgstrs require the use of ↵Kess Vargavind1-139/+127
"no-c-format".
2009-01-29Converted CRLF newlines to LFBjørn Lindeijer1-41/+41
2009-01-29Merge branch 'master' of git@gitorious.org:tmw/eathenaPhilipp Sehmisch4-31/+78
2009-01-29Made more strings translatable (patch by Kess)Philipp Sehmisch1-4/+8
2009-01-28Merge branch 'master' of git@gitorious.org:tmw/eathenaPhilipp Sehmisch2-0/+6
2009-01-28Made translations and music optional components when installing on windows.Philipp Sehmisch1-5/+22
2009-01-28Fix handling of packet 0x81Jared Adams4-31/+78
2009-01-27Another file added to the ignore listBjørn Lindeijer1-0/+1
2009-01-27Restore punching animation after weapon removalJared Adams1-0/+5
2009-01-27Added font size config for the bold font as well.Ira Rice1-1/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-27Made font size configurable in config fileBjørn Lindeijer1-1/+2
Just change the value of 'fontSize'. This should be made configurable in the GUI though, and the GUI should then automatically adapt to the new font size.
2009-01-27Merge branch 'master' of git@gitorious.org:tmw/eathenaPhilipp Sehmisch2-2/+3
2009-01-27Enabled gettext translations on windows.Philipp Sehmisch4-2/+52
2009-01-27Made font size configurable in config fileBjørn Lindeijer1-1/+2
Just change the value of 'fontSize'. This should be made configurable in the GUI though, and the GUI should then automatically adapt to the new font size.
2009-01-27Restore punching animation after weapon removalJared Adams1-0/+5
2009-01-26Bolded item names in the item popup. TODO: Modify this later to alsoIra Rice1-0/+1
color the item name based on general function, like speech bubbles do for being names. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Fixed the number of arrows from drawing in red when the shirt isIra Rice1-0/+1
selected in the equipment window. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Merge branch 'master' of git@gitorious.org:tmw/aethyraIra Rice0-0/+0
2009-01-26Removed the description option from right click menus on items. WithIra Rice1-7/+0
item popups, this is no longer useful, as well as it never doing anything to begin with. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Fixed a few default window sizes so that they look better for first timeIra Rice3-2/+4
client loaders. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Fixed a few default window sizes so that they look better for first timeIra Rice3-2/+4
client loaders. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Adjusted selection colors so that it blends better with the AethyraIra Rice2-2/+2
theme. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Cleaned up inventory includes, as well as adding right click popup menusIra Rice3-8/+30
to the item shortcut container. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Little bit of include cleanups.Ira Rice10-19/+17
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Slight bit of code cleanup, as well as minor fixes to logic. For someIra Rice3-34/+33
reason, the windows will gladly shrink when resizeable, but not grow. This will need to get resolved some time later. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Merged new and delete buttons, since either one or the other is alwaysIra Rice2-22/+22
enabled, and having both doesn't look as good. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Created a new equipment screen, which is loosely related to theIra Rice4-39/+173
equipment screen on TMW's mainline client. Also fixed up the player box so that it can be used in game as well, which could potentially be useful in the future for making future equipment dialog changes. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Made minimaps resizeable.Ira Rice2-4/+33
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Modified item popups to show the weight of the item as well. TODO:Ira Rice3-17/+62
modify itemdb to pull the item weight information from the server instead of the client, so as to always have the server and client in sync. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Modified the inventory window so that weight and slots used are shown asIra Rice2-20/+41
progress bars. Suggestion made by Forge. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Bit of code cleanup for the last commit (moved default width and heightIra Rice3-12/+12
out of being.h, so that they aren't included in any classes that don't need them and cut the number of divisions in half in the being manager) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Fixed offset of right-click hitboxes and made NPCs without spritesIra Rice3-7/+20
clickable. Also set a minimum clickable area so that small mobs like maggots aren't too difficult to click. Been wanting this patched for a while, but didn't know where to look until Crush's patch for mainline click zones on TMW. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-25Changed it so that " :" messages are properly recognized as being fromIra Rice1-1/+7
the server in the chat log. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-25Fixed use button so that it starts out at the maximum width it willIra Rice1-1/+11
need. TODO: Modify layout rendering to be able to detect resizes. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-25Repaired item weight and slot reporting.Ira Rice2-14/+17
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-25Goofed up the default inventory size that shows with inventory windows.Ira Rice1-1/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-25Fixed a few translatable strings.Ira Rice2-8/+8
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-25Tweaked the green color to be more readableBjørn Lindeijer1-1/+1
2009-01-25Because of how I imported translations to reduce the complexity ofGonzoDark1-21/+18
merging, this commit adds back in a few of Ichigo's translations which were lost. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-25Updated all translation filesBjørn Lindeijer24-1218/+762
2009-01-25Refreshed translation files.Ira Rice24-4706/+4863
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-25Modified the inventory window to be more TMW translation friendly.Ira Rice2-11/+19
Signed-off-by: Ira Rice <irarice@gmail.com>