aboutsummaryrefslogtreecommitdiff
path: root/gui
AgeCommit message (Collapse)Author
2011-06-02GUI: Replace some s(n)printf uses by Common::String::formatMax Horn
2011-06-01Merge branch 'branch-1-3-0' into masterMax Horn
I manually resolved all conflicts, and inspected every single change. Many were due to the version string mismatch and thus easily resolved. The MSVC project files add in the 1-3-0 branch were not merged, neither where the changes to gui/themes/translations.dat. Conflicts: NEWS backends/base-backend.cpp backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp backends/module.mk backends/platform/ds/arm9/makefile backends/platform/psp/README.PSP backends/platform/samsungtv/main.cpp backends/platform/samsungtv/samsungtv.cpp backends/saves/posix/posix-saves.cpp base/commandLine.cpp base/internal_version.h base/main.cpp common/array.h configure devtools/create_project/create_project.cpp dists/android/AndroidManifest.xml dists/android/plugin-manifest.xml dists/iphone/Info.plist dists/irix/scummvm.spec dists/macosx/Info.plist dists/redhat/scummvm-tools.spec dists/redhat/scummvm.spec dists/scummvm.rc dists/slackware/scummvm.SlackBuild dists/wii/meta.xml engines/sci/parser/vocabulary.cpp engines/tinsel/handle.cpp gui/themes/translations.dat
2011-05-25ALL: initialise -> initializeMatthew Hoops
2011-05-25ALL: behaviour -> behaviorMatthew Hoops
2011-05-25BUILD: Rename USE_TEXT_CONSOLE -> USE_TEXT_CONSOLE_FOR_DEBUGGERMax Horn
This reduces the similarity in name to the otherwise mostly unrelated DISABLE_TEXT_CONSOLE #define.
2011-05-25CREDITS: Temporarily retire Jubanka, add CeRiAlCeRiAl
2011-05-25CREDITS: Temporarily retire Jubanka, add CeRiAlCeRiAl
2011-05-24I18N: Update translations.datEugene Sandulenko
2011-05-24I18N: rebuild translations.datEugene Sandulenko
2011-05-22ENGINES: Further unify engine namesThierry Crozat
2011-05-21GUI/DS: Make 99 the maximum number of save slots displayed on the GMM ↵agent-q
load/save screens on the DS port.
2011-05-21GUI: Prevent the GUI code from incorrectly reloading the theme when the ↵agent-q
builtin theme is used.
2011-05-21DS: Port of changes from branch-1-2-0 that I should really have moved into ↵agent-q
the trunk. "DS: Prevent the command line help string from being included in the binary." 5f3a90a5f6911188b8d1ded08dbdf6d233e9eb7b "GUI: Allow disabling of Mass Add dialog. Saves a few Kb of binary size on the DS, and is not particularly useful on that platform." 240ff87cf4472538d25a1c5628c8d15f1791ab1c "GUI: Don't search for theme zip files on startup when running on the DS. Themes aren't supported anyway, and the search severely delays startup." fe3b18ce0df03117081e83d99f4a2cbd864d3286
2011-05-17GUI: Fix for bug #3303501 "Switching from HQ2x->HQ3x crashes ScummVM".Johannes Schickel
2011-05-17CREDITS: retire Kirben (missing file)strangerke
2011-05-17GUI: Trying to clarify my comment on ctrl-a/ctrl-e *sigh*Max Horn
2011-05-17GUI: Text editing tweaksMax Horn
- Streamline keypad handling - Allow up/down to act like home/end - On Mac OS X, allow ctrl-a and ctrl-e to act like home/end
2011-05-17GUI: For a list entry in edit mode, move caret to endMax Horn
2011-05-16KYRA: Change engine name to KyraThierry Crozat
2011-05-16GUI: Apply graphics mode change when closing global options dialogThierry Crozat
2011-05-16ENGINES: Unify engine namesThierry Crozat
This unifies the engine names in MetaEngine::getName() and the credits. In particular drop "Engine" or "engine" from the names when it was present and use expanded names in credits when the MetaEngine uses it (e.g. "Beneath a Steel Sky" instead of "BASS").
2011-05-12GIT: Clean up: Suppress SVN tags, now uselessstrangerke
2011-05-08I18N: Update translations data fileThierry Crozat
2011-05-08I18N: Update translations data fileThierry Crozat
2011-05-07GUI: Allow .zip files with case differing from ".zip" as theme files too.Johannes Schickel
Formerly our code used "hasSuffix" to check for a ".zip" suffix. Since hasSuffix does a case-sensitive match that would not work, in case the file was called "scummmodern.ZIP" instead of "scummmodern.zip" for example. To fix that I am using a case-insensitive matchString instead now.
2011-05-05GUI: Clean up localized font filename generation.Johannes Schickel
2011-05-02I18N: Update translations data fileThierry Crozat
2011-05-02I18N: Update translations data fileThierry Crozat
2011-05-02GUI: Inform use about ignored games when mass addingMax Horn
2011-05-01I18N: Update translations data file.Thierry Crozat
2011-05-01I18N: Update translations data file.Thierry Crozat
2011-05-01Merge pull request #16 "Add a PixelFormat to Graphics::Surface.".Johannes Schickel
For further discussion check here: https://github.com/scummvm/scummvm/pull/16 Conflicts: graphics/png.cpp
2011-04-28JANITORIAL: Reduce header dependencies in shared codeOri Avtalion
Some backends may break as I only compiled SDL
2011-04-28JANITORIAL: Format forward declarations to follow conventionOri Avtalion
2011-04-27I18N: Update translations data file.Thierry Crozat
2011-04-26GUI: Fix warning on systems where char is unsignedMax Horn
2011-04-25I18N: Update translations data file.Thierry Crozat
2011-04-25Merged pull request #25 from Littleboy/corrupted_theme.Max Horn
ZipArchive and corrupted themes
2011-04-25GUI: Make git revision string fit in the modern theme's launcher again.Johannes Schickel
2011-04-24GUI: Add basic validity check to ThemeEngine::themeConfigParseHeader ↵Littleboy
(workaround for #3103051) When loading a corrupted zip, the data returned for THEMERC will be garbage, which will cause an assert in isspace() when trying to trim the data. This checks that the first character of the header is in the range [0;127] and bails out if not.
2011-04-24I18N: Update translations data file.Thierry Crozat
2011-04-24I18N: Update translations data file.Thierry Crozat
2011-04-22I18N: Update translation data file.Thierry Crozat
2011-04-18COMMON: Rename Error to ErrorCode, introduce new Error classMax Horn
2011-04-17Merge branch 'master' of https://github.com/enginmanap/scummvmJohannes Schickel
2011-04-17GUI: Do not access Surface::bytesPerPixel anymore.Johannes Schickel
2011-04-17GUI: Prefer Surface::create taking a PixelFormat over the one taking a byte ↵Johannes Schickel
depth.
2011-04-17GUI: Fix indentation problems. Remove unwanted space.Engin Manap
All cosmetic changes, nothing changed.
2011-04-17CREDITS: Add buildbot skin to billwashere crontibutionsThierry Crozat
2011-04-17GUI: Fix apply old theme even if theme is not changed.Engin Manap
There was no control if theme was changed. If you click cancel, it always changes theme to which options panel opened with. This is unneccessery if theme is not changed so a if statement added before applying old theme.