summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2009-01-23Merge branch 'master' of git@gitorious.org:tmw/eathenaPhilipp Sehmisch312-1492/+1675
2009-01-23Fixed very minor and rarel occuring mem leak in map reader.Philipp Sehmisch1-0/+2
2009-01-23Removed unnecessary references to The Mana World in code headersBjørn Lindeijer310-1234/+1234
This dates back to the old days of TMW, but the usage instructions of GPLv2 don't mention this being necessary. Since it doesn't add anything, avoid the branding in these sections.
2009-01-20Fix range for NPCs to not include the warp classJared Adams1-1/+1
2009-01-20Got rid of the useless [ and ] in debug windowBjørn Lindeijer1-18/+12
2009-01-20Fixed overlaps in the last commit by converting the debug window code toIra Rice1-16/+13
use the layout engine. Signed-off-by: Ira Rice <irarice@gmail.com> (cherry picked from Aethyra commit fa007dafa2c499425e7112095cbda9c2ff5ea20c) Conflicts: src/gui/debugwindow.cpp
2009-01-20Added current map filename to debug window.Philipp Sehmisch3-14/+25
(cherry picked from mainline commit 2a7c63f6070606e6623a9730aa1ca9d52c942055)
2009-01-20Allow more monster typesJared Adams1-1/+1
2009-01-20Allow more NPCsJared Adams1-3/+3
2009-01-20Switch the NPC text dialog over to a BrowserBoxJared Adams2-16/+21
2009-01-19Fixes to the NPC Integer input fieldIra Rice11-83/+105
Also don't set "The Mana World" to start with. Signed-off-by: Ira Rice <irarice@gmail.com> (cherry picked from Aethyra commit d2b804c1a817ccdd85b4b1220bf929e9d370d774) Conflicts: src/game.cpp src/gui/inttextfield.cpp src/gui/item_amount.cpp src/gui/textfield.h
2009-01-19Reverse the order of slider and label againBjørn Lindeijer1-4/+4
In order to stay consistent with the video setup page.
2009-01-19Reflowed Audio setup tab using layout code.Ira Rice1-10/+16
Signed-off-by: Ira Rice <irarice@gmail.com> (cherry picked from Aethyra commit adfa6fa21b1ef5c8169538ca5c4896bf86e59d6a) Conflicts: src/gui/setup_audio.cpp
2009-01-19Reflowed Joystick tab using layout engine.Ira Rice1-8/+14
Signed-off-by: Ira Rice <irarice@gmail.com> (cherry picked from commit e3f05299f81cd2e567531df6729de0f34970a9e9) Conflicts: src/gui/setup_joystick.cpp
2009-01-19Reflowed Player tab in setup to use layout codeIra Rice2-25/+31
Signed-off-by: Ira Rice <irarice@gmail.com> (cherry picked from commit 18c00fedebda79d4ebfbe15401c3e5bc8869fda2) Conflicts: src/gui/setup_players.cpp
2009-01-19Reflowed the setup keyboard tab with the layout code.Ira Rice1-7/+12
Signed-off-by: Ira Rice <irarice@gmail.com> (cherry picked from commit 8f28b18a31fc8415fbf6aedc5106b8b8525f4caf) Conflicts: src/gui/setup_keyboard.cpp src/gui/setup_video.cpp
2009-01-18Fixed layout of video setup page when translatedBjørn Lindeijer10-78/+209
Introduced a LayoutHelper class which can be used for any non-Window container where you want to use a layout to place child widgets.
2009-01-18Merge branch 'master' of git@gitorious.org:tmw/eathenaPhilipp Sehmisch16-93/+482
2009-01-18Fixed mapreader crash caused by unknown tile properties (That's why I said ↵Philipp Sehmisch1-2/+6
that I would like some praxis-oriented testing of the animation system before the release).
2009-01-18Used dynamic layout for registration windowBjørn Lindeijer3-78/+44
The dialog looks nicer now and the layout problems when the dialog is translated have been fixed. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2009-01-18Updated some apple specific codeDavid Athay1-0/+4
2009-01-18Merge branch 'master' of git://gitorious.org/tmw/eathenaDavid Athay23-174/+859
2009-01-18Add dialogs to input text and numbers for scriptsJared Adams11-13/+432
2009-01-13Merged Tab and TabbedArea from mainlineBjørn Lindeijer15-201/+467
Changes mostly done by David Athay. Currently these widgets are only used in the setup window, where they replace the previously used TabbedContainer.
2009-01-13Merge branch 'master' of git://gitorious.org/tmw/eathenaDavid Athay96-1322/+2712
2009-01-10Merged comment by silene from mainlineBjørn Lindeijer1-0/+4
We should probably look into fixing the thing he's talking about.
2009-01-10Improved item amount dialog box.Guillaume Melquiond2-12/+13
(cherry picked from commit 69c147510bce9aa24be5ddcb3d050a5d52e3abe7) Conflicts: src/gui/item_amount.cpp
2009-01-10Removed the rhombs around the radio buttons.Yohann Ferreira2-0/+25
(cherry picked from commit 2fd5b9e2fea5f95f54e543011e2e8fb70f0b037f)
2009-01-09Style fix for last commitPhilipp Sehmisch1-1/+1
2009-01-09Fixed nonsensical percent values in update dialog.Philipp Sehmisch1-2/+3
2009-01-08Made remaining dialogs translatableBjørn Lindeijer10-185/+226
Most strings are now translatable. Please do report any missing ones. Strings excluded from translation are anything that gets written to the log file or is otherwise not shown in the GUI. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2009-01-08Removed the unused Box, VBox and HBox classesBjørn Lindeijer8-260/+0
They were once meant for doing layout, but never used and the way they're implemented they would be relayouting with every draw, which isn't really nice.
2009-01-08Fixed segvault when exiting with logToChat enabledPhilipp Sehmisch1-0/+1
2009-01-07Used layout manager for character selection dialogBjørn Lindeijer1-33/+20
Based on the layout from the mainline client done by Guillaume Melquiond in commits aab0b1724897e186d2d4056da7f0cd34ccc12fcb and 97bbe57e21a28544646da087e2a522390bf2ce5c. Fixes hidden Ok button on many translations.
2009-01-06Fixed up and down arrows in chat box.Guillaume Melquiond1-3/+3
(cherry picked from commit cb04d148c9aed572fe6e66313100e2cd9b66f5d5) Conflicts: src/gui/chat.cpp
2009-01-06Correct the codeset for translations to be UTF-8Bjørn Lindeijer1-0/+1
As on the mainline client
2009-01-06Fixed the true type font to render unicode nowBjørn Lindeijer2-5/+5
2009-01-06Fix wrapping of UTF-8 multi-byte characters.Björn Steinbrink1-1/+4
(cherry picked from commit 82182aeb9eacb3a6e10e34b34b46ef63222ecd7d)
2009-01-06Added support for unicode charset in textfields and chat.Guillaume Melquiond14-18/+737
Conflicts: src/Makefile.am src/game.cpp src/gui/browserbox.cpp src/gui/gui.cpp src/gui/textfield.cpp src/main.cpp (cherry picked from mainline commit 7b67e852086ad3ccd98a622f890b245ab6a0a321)
2009-01-06Fixed font colors in inventory and shortcut windowBjørn Lindeijer2-0/+2
They were not explicitly set to black. Because the bitmap font used to be black, these bugs didn't show up earlier. With the introduction of true type fonts, the text can be any color anywhere.
2009-01-06Used layout for buy, sell and item amount dialogsBjørn Lindeijer5-163/+61
(changes by Guillaume Melquiond, merged from the mainline client)
2009-01-06Merged layout handler from mainlineBjørn Lindeijer8-104/+759
Also fixed login dialog layout. This is the layout handler by Guillaume Melquiond, which he started in commit 59472ef68fdef3f7e8858a81a46e28c127119c58.
2009-01-06Merge branch 'master' of git@gitorious.org:tmw/eathenaPhilipp Sehmisch27-257/+305
2009-01-06Added support for animated tiles.Philipp Sehmisch4-26/+199
2009-01-06Added support for internationalizationBjørn Lindeijer28-251/+347
Merged from the mainline client. Originally implemented by Guillaume Melquiond, starting with commit 1828eee6a6d91fd385ad1e69d93044516493aa91.
2009-01-05Cleaned autotools filesGuillaume Melquiond1-6/+2
Put object files in subdirectories. Moved compilation flags to configure script. Added library header checks. (cherry picked from mainline commit 0bebbc320d50178a7ece573319cd6687a950dafa)
2009-01-05Refactor the way in which browser box text is drawn and wrapped.Björn Steinbrink1-65/+74
(cherry picked from mainline commit ecabe82d8720689905a6d035b0597d97037287c7) Conflicts: src/gui/browserbox.cpp
2009-01-05Handling gender with an enum everywhere.Philipp Sehmisch12-43/+47
(cherry picked from mainline commit d3adc61aa4b4924f82d8cbc23bea26da7257da97) Conflicts: src/net/beinghandler.cpp src/net/charserverhandler.cpp src/player.cpp src/player.h
2009-01-05Renamed PATH_NODE to Position as on mainlineBjørn Lindeijer8-42/+127
2009-01-04Merged Vector class improvements from mainlineBjørn Lindeijer4-5/+93