Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | * Changed log level in sound module | erihel | 2012-12-25 | 5 | -8/+12 | |
| | | | | | | | | | | | | | | | * Fixed warnings in sound module * Fixed problem with map loading when locale with different number separator | |||||
| * | | latest changes | erihel | 2012-12-21 | 4 | -8/+14 | |
| | | | ||||||
| * | | sound fix | erihel | 2012-12-20 | 11 | -154/+40 | |
| | | | ||||||
| * | | removing plugins for gold version (for mxe cross compiling) | erihel | 2012-12-20 | 21 | -551/+1 | |
| | | | ||||||
| * | | Installation path fixes and CMakeLists refactoring | Piotr Dziwinski | 2012-12-20 | 7 | -43/+55 | |
| | | | | | | | | | | | | make && make install should now give a working installation. | |||||
| * | | Switched data submodule to dev branch | Piotr Dziwinski | 2012-12-19 | 1 | -0/+0 | |
| | | | ||||||
| * | | Added colobot-data as git submodule | Piotr Dziwinski | 2012-12-19 | 3 | -3/+3 | |
| | | | ||||||
| * | | Merge pull request #102 from OdyX/dev-fix_cmake_flags | Piotr Dziwiński | 2012-12-19 | 10 | -21/+49 | |
| |\ \ | | | | | | | | | Fix CMake flags handling | |||||
| | * | | Put common CXX flags in common variables | Didier Raboud | 2012-12-19 | 10 | -12/+22 | |
| | | | | | | | | | | | | | | | | | | | | 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 Raboud | 2012-12-19 | 9 | -9/+27 | |
| | | | | | | | | | | | | | | | | Only set CMAKE_BUILD_TYPE to Debug when no value is provided. | |||||
| * | | | Merge pull request #101 from OdyX/dev-reduce-dependencies-overload | Piotr Dziwiński | 2012-12-19 | 1 | -1/+1 | |
| |\ \ \ | | |/ / | |/| | | Reduce dependencies installation in travis | |||||
| | * | | Reduce dependencies installation in travis | Didier Raboud | 2012-12-19 | 1 | -1/+1 | |
| |/ / | | | | | | | | | | Use apt-get's --no-install-recommends. | |||||
| * | | Merge pull request #100 from OdyX/dev-fix-rpath | krzys-h | 2012-12-19 | 1 | -1/+1 | |
| |\ \ | | | | | | | | | Fix RPath in installed colobot | |||||
| | * | | Fix RPath in installed colobot | Didier Raboud | 2012-12-19 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | Merge pull request #98 from OdyX/dev-travis-ci | Piotr Dziwiński | 2012-12-18 | 1 | -0/+8 | |
| |\ \ | | | | | | | | | Configure https://travis-ci.org and add travis YAML configuration file. | |||||
| | * | | Add travis YAML configuration file. | Didier Raboud | 2012-12-18 | 1 | -0/+8 | |
| |/ / | | | | | | | | | | | | | This is intended to be used with http://travis-ci.org, which is neatly integrated with Github (and free). | |||||
| * | | Merge pull request #97 from OdyX/dev-minor-cmake-grammar-fix | krzys-h | 2012-12-18 | 2 | -3/+3 | |
| |\ \ | | | | | | | | | Minor cmake grammar fix | |||||
| | * | | Minor cmake grammar fix | Didier Raboud | 2012-12-18 | 2 | -3/+3 | |
| | | | | | | | | | | | | | | | | It is redundant to have CMAKE_INSTALL_PREFIX in path definitions; drop them. | |||||
| * | | | Merge pull request #96 from OdyX/dev-build-doc | krzys-h | 2012-12-18 | 2 | -2/+15 | |
| |\ \ \ | | |/ / | |/| | | Allow building and installation of documentation | |||||
| | * | | Allow building and installation of documentation | Didier Raboud | 2012-12-17 | 2 | -2/+15 | |
| |/ / | | | | | | | | | | | | | | | | | | | Run `make doc` for the building. Then `make install` will install the generated documentation. - Move Doxyfile to Doxyfile.in, put CMAKE_CURRENT_SOURCE_DIR into it. | |||||
| * | | Merge pull request #95 from OdyX/dev-move-cbot-to-private-lib | Erihel | 2012-12-17 | 3 | -4/+7 | |
| |\ \ | | | | | | | | | Install libCBot to a private directory | |||||
| | * | | Install libCBot to a private directory | Didier Raboud | 2012-12-17 | 3 | -4/+7 | |
| |/ / | | | | | | | | | | | | | | | | | | | | | | closes #90 - Make it configurable; - Move stanzas above the src directory inclusion, otherwise the value doesn't propagate. | |||||
| * | | Merge pull request #91 from OdyX/dev-use-installed-i18n | Erihel | 2012-12-16 | 2 | -3/+2 | |
| |\ \ | | | | | | | | | Use default installation paths for i18n. | |||||
| | * \ | Merge branch 'dev' into dev-use-installed-i18n | Didier Raboud | 2012-12-16 | 3 | -3/+6 | |
| | |\ \ | | |/ / | |/| | | | | | | | | | | Conflicts: src/common/config.h.cmake | |||||
| * | | | Merge pull request #92 from OdyX/dev-default-datadir | Erihel | 2012-12-16 | 3 | -4/+8 | |
| |\ \ \ | | | | | | | | | | | Set a default datadir, in sync with the data installation path. | |||||
| | * | | | Set a default datadir, in sync with the data installation path. | Didier Raboud | 2012-12-16 | 3 | -4/+8 | |
| |/ / / | ||||||
| | * / | Use default installation paths for i18n. | Didier Raboud | 2012-12-16 | 2 | -4/+4 | |
| |/ / | | | | | | | | | | | | | | | | This finishes the work started in 19b75e174338f8e7be7486a7445d1e90e9795077 by actually using the translation where they are installed. | |||||
| * | | Merge pull request #89 from OdyX/dev-fix-gmock | Erihel | 2012-12-16 | 0 | -0/+0 | |
| |\ \ | | |/ | |/| | Fix Google Mock system library building | |||||
| | * | Fix Google Mock system library building | Didier Raboud | 2012-12-16 | 1 | -1/+5 | |
| | | | ||||||
| * | | GMock: fixed using system package | Piotr Dziwinski | 2012-12-16 | 1 | -1/+5 | |
| |/ | ||||||
| * | Split gtest and gmock, fixed using system packages | Piotr Dziwinski | 2012-12-16 | 37 | -440/+465 | |
| | | | | | | | | | | | | - split the bundled gtest and gmock libraries - allowed the use of system gmock - refactoring in CMakeLists | |||||
| * | Merge branch 'master' into dev | Piotr Dziwinski | 2012-12-15 | 12 | -3938/+5758 | |
| |\ | ||||||
| | * | Reverted lib/, fixed gtest path in CMakeLists.txt | Piotr Dziwinski | 2012-12-14 | 40 | -3/+30658 | |
| | | | | | | | | | | | | | | | Some gtest system packages use name gtest-all.cc. lib/ directory should be left in repository. | |||||
| | * | Merge pull request #85 from OdyX/cmake_find_ltdl | Michał Zieliński | 2012-12-14 | 5 | -3/+34 | |
| | |\ | | | | | | | | | Add FindLTDL cmake module | |||||
| | | * | Add FindLTDL cmake module | Didier Raboud | 2012-12-14 | 5 | -3/+34 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | As mentionned in FindLTDL.cmake, this is code that is hereby relicensed under GPLv3. closes #68 | |||||
| | * | | Merge pull request #83 from OdyX/fix_i18n_from_env | Michał Zieliński | 2012-12-14 | 2 | -3/+10 | |
| | |\ \ | | | | | | | | | | | Inherit translation setting from environment. | |||||
| | | * | | Inherit translation setting from environment. | Didier Raboud | 2012-12-14 | 2 | -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. | |||||
| | * | | Merge pull request #86 from OdyX/cmake_find_gtest | Michał Zieliński | 2012-12-14 | 40 | -30657/+6 | |
| | |\ \ | | | |/ | | |/| | Use system-provided Google test library. | |||||
| | | * | Use system-provided Google test library. | Didier Raboud | 2012-12-14 | 40 | -30657/+6 | |
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | This avoids library duplication, in favour of a shared (source) library: libgtest-dev is available at least on Debian, Ubuntu, Gentoo, Fedora, at the time of committing. If the library is not found in system paths, a copy of it in lib/gtest can work too. | |||||
| | * | Merge pull request #82 from OdyX/i81_fix_translations | Michał Zieliński | 2012-12-13 | 6 | -3930/+5708 | |
| | |\ | | | | | | | | | Sorted translations alphabetically and created CMake rules for generating pot files. | |||||
| | | * | Update translations with newer colobot.pot. | Didier Raboud | 2012-12-13 | 3 | -738/+753 | |
| | | | | ||||||
| | | * | Handle translations with CMakes. | Didier Raboud | 2012-12-13 | 3 | -0/+1762 | |
| | | | | | | | | | | | | | | | | closes #81 | |||||
| | | * | Sort translation files. | Didier Raboud | 2012-12-13 | 3 | -3936/+3937 | |
| | |/ | | | | | | | | | | This will ease future updates. | |||||
| | * | Updated info in README files | Piotr Dziwinski | 2012-11-26 | 3 | -18/+17 | |
| | | | ||||||
| | * | Fixed stupid coding mistake in CBotString.cpp | adiblol | 2012-10-07 | 1 | -1/+1 | |
| | | | ||||||
| * | | Updated info in README files | Piotr Dziwinski | 2012-11-26 | 3 | -18/+17 | |
| | | | ||||||
* | | | Fix for #113 | Piotr Dziwinski | 2013-01-04 | 1 | -2/+2 | |
| | | | ||||||
* | | | Fixed stupid debug code | Piotr Dziwinski | 2013-01-03 | 1 | -1/+1 | |
| | | | | | | | | | | | | Terrain VBOs should work now | |||||
* | | | Fixed spider and worm model loading | Piotr Dziwinski | 2012-12-28 | 4 | -6/+48 | |
| | | | ||||||
* | | | Fixes and refactoring | Piotr Dziwinski | 2012-12-27 | 3 | -239/+122 | |
| | | |