summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #112 from OdyX/dev-levels-fallbackkrzys-h2013-01-091-10/+41
|\ | | | | In levels' lists, fallback to english
| * In levels' lists, fallback to englishDidier Raboud2013-01-021-10/+41
| | | | | | | | | | | | - Implemented in a naive way: Take the English version if found, but continue until the translated version is found. This has the drawback of letting the loop reach its end if the level has no translation.
* | CMakeLists enhancementsPiotr Dziwinski2013-01-082-4/+16
| | | | | | | | | | | | | | - compiler detection (clang and gcc version check) - compile flags only for src/ subdir - system and local include paths - fix for clang compilation
* | Merge dev and dev-graphicsPiotr Dziwinski2013-01-0711-20/+56
|\ \
| * | Small fix in detecting language. Fixes needed to compile code using clangMarcin Zawadzki2013-01-057-8/+11
| | |
| * | * Fixed problem with freeing buffers while conneted to a source resulting ↵erihel2013-01-044-12/+45
| | | | | | | | | | | | | | | | | | with "Unable to unload buffer message" * Fixed posible segfault while trying to play sound after not loading file properly
* | | GLEW fix for some graphics driversPiotr Dziwinski2013-01-062-4/+6
| | |
* | | Corrected OpenGL extension detectionPiotr Dziwinski2013-01-056-127/+135
| | | | | | | | | | | | | | | | | | - corrected multitexture and VBO detection - GLEW is now a required library - minor CMakeLists refactoring
* | | Correct font scaling with resolutionPiotr Dziwinski2013-01-044-5/+17
| | |
* | | Merge branch 'dev' into dev-graphicsPiotr Dziwinski2013-01-0457-4895/+7149
|\| |
| * | Add categories to Desktop Entry fileDidier Raboud2013-01-021-0/+1
| |/ | | | | | | As per the "Desktop Menu Specification" 1.0, especially Appendix A.
| * * Fixed problem with scrolling down text fields with mouse scrollerihel2012-12-292-27/+35
| | | | | | | | * Fixed problem with scroll bar not updating position properly in text fields
| * Merge branch 'dev' of github:colobot/colobot into deverihel2012-12-2911-77/+122
| |\
| | * Merge pull request #108 from OdyX/dev-central-cmake-versionPiotr Dziwiński2012-12-298-21/+16
| | |\ | | | | | | | | Create a central version
| | | * Create a central versionDidier Raboud2012-12-278-21/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it 0.1.0~pre-alpha for now. - Add it to runtime program - Add it to -help option - Add it to manpage - Update translations
| | * | Implement language Char for level filesDidier Raboud2012-12-284-15/+59
| | | | | | | | | | | | | | | | This currently lacks fallback to an existing entry for non-translated entries
| | * | Move language initialisation in SetLanguageDidier Raboud2012-12-281-42/+48
| | | |
| * | | * Fixed segault when could not set sound pitch (bad logger call)erihel2012-12-283-19/+21
| |/ / | | | | | | | | | | | | * All 81 audio files should be loaded instead of 69 high quality * Changed volume ajustment formula to proper one
| * | Replaced malloc/free with new/deletePiotr Dziwinski2012-12-285-53/+69
| | | | | | | | | | | | | | | | | | - now new/delete used everywhere except for CBotStack, which has to be fixed in other way - some segfaults should be fixed with this
| * | Fixed path for loading soundsPiotr Dziwinski2012-12-282-18/+23
| |/
| * Merge pull request #106 from OdyX/dev-fix-translationsPiotr Dziwiński2012-12-275-144/+462
| |\ | | | | | | Fix translations
| | * Update translationsDidier Raboud2012-12-273-135/+369
| | | | | | | | | | | | In particular, update french
| | * Update colobot.pot using update-potDidier Raboud2012-12-271-6/+91
| | |
| | * Update translation pot-file and build-targetDidier Raboud2012-12-271-3/+2
| | |
| * | Merge pull request #105 from OdyX/dev-desktop-file-manPiotr Dziwiński2012-12-276-5/+324
| |\ \ | | | | | | | | Add manpage for colobot
| | * | Always build manpagesDidier Raboud2012-12-271-1/+1
| | | | | | | | | | | | | | | | solves #105
| | * | Add manpage for colobotDidier Raboud2012-12-276-5/+324
| | |/ | | | | | | | | | | | | - Translate it with po4a - Use POD-format as source, and pod2man for building
| * | Fixed unicode rendering bugPiotr Dziwinski2012-12-271-1/+1
| | |
| * | Fix locale's loadingDidier Raboud2012-12-271-5/+8
| |/ | | | | | | | | - Always inherit LC_ALL from environment; - Enforce environment only if the runtime options require it;
| * Add SVG colobot iconDidier Raboud2012-12-273-0/+263
| | | | | | | | | | | | - Refer to the icon in the desktop file - Use rsvg-convert to get scaled PNG versions - Add librsvg2-bin to travis
| * Add translated freedesktop 'Desktop Entry' fileDidier Raboud2012-12-278-0/+119
| | | | | | | | | | | | - Add po4a as build-dependency for travis (but it fallsback to english-only if not found) - Add (easy) french translation
| * * Changed Ret to Get methods in sound moduleerihel2012-12-254-93/+82
| | | | | | | | | | * Added video settings to profile * Resolution change is now posibble but restart is required
| * * Changed log level in sound moduleerihel2012-12-255-8/+12
| | | | | | | | | | * Fixed warnings in sound module * Fixed problem with map loading when locale with different number separator
| * latest changeserihel2012-12-212-6/+13
| |
| * sound fixerihel2012-12-208-124/+37
| |
| * removing plugins for gold version (for mxe cross compiling)erihel2012-12-2020-550/+1
| |
| * Installation path fixes and CMakeLists refactoringPiotr Dziwinski2012-12-206-27/+17
| | | | | | | | make && make install should now give a working installation.
| * Put common CXX flags in common variablesDidier Raboud2012-12-199-10/+19
| | | | | | | | | | CMAKE_CXX_FLAGS is taken into account in all builds; build-type-specific flags are appended to it.
| * Don't enforce CMake build type on users.Didier Raboud2012-12-198-8/+24
| | | | | | | | Only set CMAKE_BUILD_TYPE to Debug when no value is provided.
| * Fix RPath in installed colobotDidier Raboud2012-12-191-1/+1
| |
| * Minor cmake grammar fixDidier Raboud2012-12-181-1/+1
| | | | | | | | It is redundant to have CMAKE_INSTALL_PREFIX in path definitions; drop them.
| * Install libCBot to a private directoryDidier Raboud2012-12-172-2/+3
| | | | | | | | | | | | | | | | closes #90 - Make it configurable; - Move stanzas above the src directory inclusion, otherwise the value doesn't propagate.
| * Merge branch 'dev' into dev-use-installed-i18nDidier Raboud2012-12-162-1/+3
| |\ | | | | | | | | | | | | Conflicts: src/common/config.h.cmake
| | * Set a default datadir, in sync with the data installation path.Didier Raboud2012-12-162-2/+5
| | |
| * | Use default installation paths for i18n.Didier Raboud2012-12-162-4/+4
| |/ | | | | | | | | | | This finishes the work started in 19b75e174338f8e7be7486a7445d1e90e9795077 by actually using the translation where they are installed.
| * Split gtest and gmock, fixed using system packagesPiotr Dziwinski2012-12-165-5/+6
| | | | | | | | | | | | - split the bundled gtest and gmock libraries - allowed the use of system gmock - refactoring in CMakeLists
| * Merge branch 'master' into devPiotr Dziwinski2012-12-1510-3936/+5721
| |\
| | * Merge pull request #85 from OdyX/cmake_find_ltdlMichał Zieliński2012-12-143-3/+3
| | |\ | | | | | | | | Add FindLTDL cmake module
| | | * Add FindLTDL cmake moduleDidier Raboud2012-12-143-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | As mentionned in FindLTDL.cmake, this is code that is hereby relicensed under GPLv3. closes #68
| | * | Inherit translation setting from environment.Didier Raboud2012-12-142-3/+10
| | |/ | | | | | | | | | | | | | | | | | | | | | This ensures that users with a correctly-defined locale don't need to explicitely set the locale. - By dropping the setlocale content, it fixes the loading of translations. - Add a Debug log message to check what is put in the environment.