summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | removing plugins for gold version (for mxe cross compiling)erihel2012-12-2021-551/+1
| | |
| * | Installation path fixes and CMakeLists refactoringPiotr Dziwinski2012-12-207-43/+55
| | | | | | | | | | | | make && make install should now give a working installation.
| * | Switched data submodule to dev branchPiotr Dziwinski2012-12-191-0/+0
| | |
| * | Added colobot-data as git submodulePiotr Dziwinski2012-12-193-3/+3
| | |
| * | Merge pull request #102 from OdyX/dev-fix_cmake_flagsPiotr Dziwiński2012-12-1910-21/+49
| |\ \ | | | | | | | | Fix CMake flags handling
| | * | Put common CXX flags in common variablesDidier Raboud2012-12-1910-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 Raboud2012-12-199-9/+27
| | | | | | | | | | | | | | | | Only set CMAKE_BUILD_TYPE to Debug when no value is provided.
| * | | Merge pull request #101 from OdyX/dev-reduce-dependencies-overloadPiotr Dziwiński2012-12-191-1/+1
| |\ \ \ | | |/ / | |/| | Reduce dependencies installation in travis
| | * | Reduce dependencies installation in travisDidier Raboud2012-12-191-1/+1
| |/ / | | | | | | | | | Use apt-get's --no-install-recommends.
| * | Merge pull request #100 from OdyX/dev-fix-rpathkrzys-h2012-12-191-1/+1
| |\ \ | | | | | | | | Fix RPath in installed colobot
| | * | Fix RPath in installed colobotDidier Raboud2012-12-191-1/+1
| |/ /
| * | Merge pull request #98 from OdyX/dev-travis-ciPiotr Dziwiński2012-12-181-0/+8
| |\ \ | | | | | | | | Configure https://travis-ci.org and add travis YAML configuration file.
| | * | Add travis YAML configuration file.Didier Raboud2012-12-181-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-fixkrzys-h2012-12-182-3/+3
| |\ \ | | | | | | | | Minor cmake grammar fix
| | * | Minor cmake grammar fixDidier Raboud2012-12-182-3/+3
| | | | | | | | | | | | | | | | It is redundant to have CMAKE_INSTALL_PREFIX in path definitions; drop them.
| * | | Merge pull request #96 from OdyX/dev-build-dockrzys-h2012-12-182-2/+15
| |\ \ \ | | |/ / | |/| | Allow building and installation of documentation
| | * | Allow building and installation of documentationDidier Raboud2012-12-172-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-libErihel2012-12-173-4/+7
| |\ \ | | | | | | | | Install libCBot to a private directory
| | * | Install libCBot to a private directoryDidier Raboud2012-12-173-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-i18nErihel2012-12-162-3/+2
| |\ \ | | | | | | | | Use default installation paths for i18n.
| | * \ Merge branch 'dev' into dev-use-installed-i18nDidier Raboud2012-12-163-3/+6
| | |\ \ | | |/ / | |/| | | | | | | | | | Conflicts: src/common/config.h.cmake
| * | | Merge pull request #92 from OdyX/dev-default-datadirErihel2012-12-163-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 Raboud2012-12-163-4/+8
| |/ / /
| | * / 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.
| * | Merge pull request #89 from OdyX/dev-fix-gmockErihel2012-12-160-0/+0
| |\ \ | | |/ | |/| Fix Google Mock system library building
| | * Fix Google Mock system library buildingDidier Raboud2012-12-161-1/+5
| | |
| * | GMock: fixed using system packagePiotr Dziwinski2012-12-161-1/+5
| |/
| * Split gtest and gmock, fixed using system packagesPiotr Dziwinski2012-12-1637-440/+465
| | | | | | | | | | | | - split the bundled gtest and gmock libraries - allowed the use of system gmock - refactoring in CMakeLists
| * Merge branch 'master' into devPiotr Dziwinski2012-12-1512-3938/+5758
| |\
| | * Reverted lib/, fixed gtest path in CMakeLists.txtPiotr Dziwinski2012-12-1440-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_ltdlMichał Zieliński2012-12-145-3/+34
| | |\ | | | | | | | | Add FindLTDL cmake module
| | | * Add FindLTDL cmake moduleDidier Raboud2012-12-145-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_envMichał Zieliński2012-12-142-3/+10
| | |\ \ | | | | | | | | | | Inherit translation setting from environment.
| | | * | 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.
| | * | Merge pull request #86 from OdyX/cmake_find_gtestMichał Zieliński2012-12-1440-30657/+6
| | |\ \ | | | |/ | | |/| Use system-provided Google test library.
| | | * Use system-provided Google test library.Didier Raboud2012-12-1440-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_translationsMichał Zieliński2012-12-136-3930/+5708
| | |\ | | | | | | | | Sorted translations alphabetically and created CMake rules for generating pot files.
| | | * Update translations with newer colobot.pot.Didier Raboud2012-12-133-738/+753
| | | |
| | | * Handle translations with CMakes.Didier Raboud2012-12-133-0/+1762
| | | | | | | | | | | | | | | | closes #81
| | | * Sort translation files.Didier Raboud2012-12-133-3936/+3937
| | |/ | | | | | | | | | This will ease future updates.
| | * Updated info in README filesPiotr Dziwinski2012-11-263-18/+17
| | |
| | * Fixed stupid coding mistake in CBotString.cppadiblol2012-10-071-1/+1
| | |
| * | Updated info in README filesPiotr Dziwinski2012-11-263-18/+17
| | |
* | | Fix for #113Piotr Dziwinski2013-01-041-2/+2
| | |
* | | Fixed stupid debug codePiotr Dziwinski2013-01-031-1/+1
| | | | | | | | | | | | Terrain VBOs should work now
* | | Fixed spider and worm model loadingPiotr Dziwinski2012-12-284-6/+48
| | |
* | | Fixes and refactoringPiotr Dziwinski2012-12-273-239/+122
| | |
* | | Engine optimization - rewritten model managementPiotr Dziwinski2012-12-2630-2393/+2116
| | | | | | | | | | | | | | | | | | | | | | | | - new class CModelManager - rewritten engine object structure in CEngine - created shared model data instead of separate objects per each model instance - minor refactoring
* | | Revert "Merge pull request #88 from OdyX/dev-graphics-system-gtools"Piotr Dziwinski2012-12-162-18/+3
| | | | | | | | | | | | | | | This reverts commit f5b4705cad6c7071a24912b81987a488a8cef0f7, reversing changes made to 4811defca2eeea69e40346be6b1647f276db8c76.
* | | Merge pull request #88 from OdyX/dev-graphics-system-gtoolsPiotr Dziwiński2012-12-162-3/+18
|\ \ \ | | | | | | | | Use system-provided Google tools in dev-graphics