summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2009-02-10Merge branch 'aethyra/master'Bjørn Lindeijer13-60/+46
Conflicts: docs/FAQ.txt packaging/windows/make-translations.vbs src/Makefile.am src/gui/colour.cpp src/gui/colour.h src/gui/popupmenu.cpp src/gui/setup_colours.h src/main.cpp src/main.h src/resources/resourcemanager.cpp src/text.cpp src/text.h src/textmanager.cpp src/textmanager.h
2009-02-10Disable increase button for fixed skillsJared Adams1-8/+16
2009-02-10Fixed some accidental capitalization errorsPhilipp Sehmisch11-60/+60
2009-02-10fixed capitalization of color member functions.Philipp Sehmisch8-44/+44
2009-02-10Changed spelling from colour to color.Philipp Sehmisch19-152/+152
2009-02-10Updated code::blocks projectPhilipp Sehmisch1-6/+42
2009-02-10Removed decimals from color slidersPhilipp Sehmisch1-3/+4
2009-02-10Fixed default server port.Philipp Sehmisch1-4/+1
2009-02-10Fixed a compile error by using less awkward codePhilipp Sehmisch1-11/+5
2009-02-10Changed AETHYRA_DATADIR to TMW_DATADIRPhilipp Sehmisch1-2/+2
2009-02-10Removed crash introduced by Aethyra.Philipp Sehmisch2-6/+0
2009-02-10Fix crash due to missing login wallpaperJared Adams1-1/+4
2009-02-10Fix segfault when leaving maps with animated tilesJared Adams1-1/+2
2009-02-10Fix default port in GUIJared Adams1-1/+1
2009-02-09Fixed width of the weight label, as noticed by Grimmjow.Ira Rice1-4/+4
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-09Made progress bars in the status window a bit bigger based on aIra Rice1-5/+5
suggestion by Grimmjow. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-09Removed a getImage() function I added. Considered renaming it toIra Rice1-12/+0
getBaseImage() instead, but after looking at it a bit more, I can't particularly see anything that this can be used for yet. Was originally added when I was toying around with an idea for how to get image transparency to work under SDL, but which ended coming up busted. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-09Fixed up the copyright headersBjørn Lindeijer20-265/+269
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-09Removed tab characters.Ira Rice1-20/+20
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-09Mostly whitespace fixesBjørn Lindeijer58-536/+543
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-10Center the dialogs during the login sequence againBjørn Lindeijer1-8/+3
2009-02-09Changed AETHYRA_DATADIR to PKG_DATADIR.Ira Rice4-6/+6
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-10Added .mailmap fileBjørn Lindeijer1-0/+1
Currently only used to fix the encoding in my name for one commit.
2009-02-10Changed window background color back to TMW styleBjørn Lindeijer1-0/+0
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>
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-26 15:07:40 +0000