summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* * Fixed problem with freeing buffers while conneted to a source resulting wit...erihel2013-01-044-12/+45
* 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
|/ / / /
* | | | Merge pull request #106 from OdyX/dev-fix-translationsPiotr Dziwiński2012-12-275-144/+462
|\ \ \ \
| * | | | Update translationsDidier Raboud2012-12-273-135/+369
| * | | | 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
|\ \ \ \ \
| * | | | | Always build manpagesDidier Raboud2012-12-271-1/+1
| * | | | | Merge branch 'dev' into dev-desktop-file-manDidier Raboud2012-12-271-5/+5
| |\| | | | | | |_|_|/ | |/| | |
| * | | | Add manpage for colobotDidier Raboud2012-12-276-5/+324
| | |_|/ | |/| |
* | | | Fixed unicode rendering bugPiotr Dziwinski2012-12-271-1/+1
* | | | Merge pull request #107 from OdyX/dev-fix-localesPiotr Dziwiński2012-12-271-5/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix locale's loadingDidier Raboud2012-12-271-5/+8
|/ / /
* | | Merge pull request #104 from OdyX/dev-minor-cmake-grammaer-fixMichał Zieliński2012-12-271-5/+5
|\ \ \
| * | | Minor cmake grammar fixDidier Raboud2012-12-271-5/+5
* | | | Merge pull request #103 from OdyX/dev-desktop-fileMichał Zieliński2012-12-2710-1/+383
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Add SVG colobot iconDidier Raboud2012-12-274-1/+264
| * | Add translated freedesktop 'Desktop Entry' fileDidier Raboud2012-12-279-1/+120
|/ /
* | * Changed Ret to Get methods in sound moduleerihel2012-12-254-93/+82
* | * Changed log level in sound moduleerihel2012-12-255-8/+12
* | latest changeserihel2012-12-214-8/+14
* | sound fixerihel2012-12-2011-154/+40
* | 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
* | 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
|\ \
| * | Put common CXX flags in common variablesDidier Raboud2012-12-1910-12/+22
| * | Don't enforce CMake build type on users.Didier Raboud2012-12-199-9/+27
* | | Merge pull request #101 from OdyX/dev-reduce-dependencies-overloadPiotr Dziwiński2012-12-191-1/+1
|\ \ \ | |/ / |/| |
| * | Reduce dependencies installation in travisDidier Raboud2012-12-191-1/+1
|/ /