summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* In travis, add libsndfile-dev as build-dependencyDidier Raboud2013-01-201-1/+1
* In manpage, correct first header to be 'NAME' not 'COLOBOT'Didier Raboud2013-01-203-6/+6
* Fixed some clang warningsPiotr Dziwinski2013-01-172-4/+4
* Fixed edit_test linking issuePiotr Dziwinski2013-01-171-1/+1
* * Fixed sound pitch causing segfaulterihel2013-01-168-29/+66
* * Cleaning player list before getting new one (entering user menu several tim...erihel2013-01-151-0/+1
* * Removed aluterihel2013-01-1413-74/+216
* Merge pull request #117 from OdyX/dev-C++11-fixesPiotr Dziwiński2013-01-102-11/+18
|\
| * In travis, add boost backport from Mapnik to succeed clang buildDidier Raboud2013-01-101-0/+1
| * Also test intallationDidier Raboud2013-01-101-1/+1
| * In travis, do out-of-tree buildDidier Raboud2013-01-101-1/+1
| * Enable clang build in travisDidier Raboud2013-01-101-0/+1
| * Use correct C++11/C++0x flags depending on the used compilerDidier Raboud2013-01-101-10/+15
|/
* Added GLEW to travis configPiotr Dziwinski2013-01-091-1/+1
* Merge branch 'dev' of github:colobot/colobot into deverihel2013-01-097-27/+94
|\
| * Disabled travis e-mail notificationsPiotr Dziwinski2013-01-091-0/+2
| * Merge pull request #114 from OdyX/dev-update-cmake-with-datakrzys-h2013-01-092-9/+12
| |\
| | * Let CMake rely on data's CMakeLists.txt if it existsDidier Raboud2013-01-022-4/+7
| | * Revert "Minor cmake grammar fix"Didier Raboud2012-12-301-5/+5
| * | Merge pull request #112 from OdyX/dev-levels-fallbackkrzys-h2013-01-091-10/+41
| |\ \
| | * | In levels' lists, fallback to englishDidier Raboud2013-01-021-10/+41
| | |/
| * | CMakeLists enhancementsPiotr Dziwinski2013-01-084-8/+39
* | | * Fixed pitch calculation (sound in cut scenes will work as well as robot tra...erihel2013-01-096-63/+69
|/ /
* | Merge dev and dev-graphicsPiotr Dziwinski2013-01-0712-21/+57
|\ \
| * | Small fix in detecting language. Fixes needed to compile code using clangMarcin Zawadzki2013-01-058-9/+12
| * | * Fixed problem with freeing buffers while conneted to a source resulting wit...erihel2013-01-044-12/+45
* | | GLEW fix for some graphics driversPiotr Dziwinski2013-01-062-4/+6
* | | Corrected OpenGL extension detectionPiotr Dziwinski2013-01-057-162/+146
* | | Correct font scaling with resolutionPiotr Dziwinski2013-01-044-5/+17
* | | Merge branch 'dev' into dev-graphicsPiotr Dziwinski2013-01-0498-5375/+7741
|\| |
| * | Merge pull request #115 from OdyX/dev-add-categories-to-desktop-fileMichał Zieliński2013-01-021-0/+1
| |\ \ | | |/ | |/|
| | * Add categories to Desktop Entry fileDidier Raboud2013-01-021-0/+1
| |/
| * Merge branch 'master' into devPiotr Dziwinski2012-12-291-22/+26
| |\
| | * Merge of master and devPiotr Dziwinski2012-12-2929-340/+1082
| | * Revert "Merge branch 'dev-desktop-file-man' of https://github.com/OdyX/colobot"Michał Zieliński2012-12-276-324/+5
| | * Merge branch 'dev-desktop-file-man' of https://github.com/OdyX/colobotMichał Zieliński2012-12-276-5/+324
| | |\
| | * \ Merge branch 'dev-desktop-file' of git://github.com/OdyX/colobotMichał Zieliński2012-12-2750-854/+638
| | |\ \
| | * \ \ Merge pull request #93 from OdyX/master-markdownErihel2012-12-171-22/+26
| | |\ \ \
| | | * | | Move README to Markdown formatDidier Raboud2012-12-171-22/+26
| | |/ / /
| * | | | Fix for TEST_VIRTUALPiotr Dziwinski2012-12-291-1/+1
| * | | | * Fixed problem with scrolling down text fields with mouse scrollerihel2012-12-292-27/+35
| * | | | Merge branch 'dev' of github:colobot/colobot into deverihel2012-12-2912-77/+148
| |\ \ \ \
| | * \ \ \ Merge pull request #108 from OdyX/dev-central-cmake-versionPiotr Dziwiński2012-12-299-21/+42
| | |\ \ \ \
| | | * | | | Create a central versionDidier Raboud2012-12-279-21/+42
| | * | | | | Merge pull request #109 from OdyX/dev-more-language-fixesPiotr Dziwiński2012-12-294-56/+106
| | |\ \ \ \ \
| | | * | | | | Implement language Char for level filesDidier Raboud2012-12-284-15/+59
| | | * | | | | 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
| |/ / / / /
| * | | | | Replaced malloc/free with new/deletePiotr Dziwinski2012-12-285-53/+69
| * | | | | Fixed path for loading soundsPiotr Dziwinski2012-12-282-18/+23
| |/ / / /