summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into dev-physfskrzys-h2014-10-14328-10909/+10993
|\ | | | | | | | | Conflicts: data
| * Changed all occurences of PPC in the code to TerranovaTeamkrzys-h2014-10-14321-4559/+5745
| |
| * Updated license from PPC to TerranovaTeamkrzys-h2014-10-143-15/+45
| | | | | | | | | | Polish Portal of Colobot (PPC) changed name to International Colobot Community (ICC). The part of the community actively working on the game is known as TerranovaTeam.
| * Clean up translationsPiotr Dziwinski2014-10-097-6363/+5236
| | | | | | | | | | | | * translate only marked strings from restext.cpp * update and clean pot and po files * remove redundant POT-Creation-Data
| * Fixed CBot debugger (#325)krzys-h2014-10-071-2/+3
| |
* | Updated data submodulePiotr Dziwinski2014-10-071-0/+0
| |
* | GCC 4.6 compilation fixesPiotr Dziwinski2014-10-073-12/+11
| |
* | Fixes in unit testsPiotr Dziwinski2014-10-077-16/+49
| |
* | Add physfs to travis configPiotr Dziwinski2014-10-071-1/+1
| |
* | Merge with devPiotr Dziwinski2014-10-0738-2483/+669
|\|
| * Fixed issue #324krzys-h2014-10-073-2/+15
| |
| * Add missing dependency "gettext" for Ubuntukoocotte2014-09-021-1/+1
| | | | | | | | | | Conflicts: INSTALL.md
| * Add po4a to the command installing dependenciesMrSimbax2014-08-241-1/+1
| | | | | | | | | | There is an one-line command in the INSTALL.md for Ubuntu/Debian users which installs all dependencies. po4a was listed above it, but it wasn't in the command itself.
| * CProfile refactoringPiotr Dziwinski2014-08-126-203/+203
| |
| * Better CMake organization and unit test cleanupsPiotr Dziwinski2014-08-1216-1070/+280
| | | | | | | | | | | | | | * created a static library containing most source modules to avoid compiling source modules twice in code and unit tests * moved profile_test to main unit tests executable * removed image_test and edit_test as not really useful
| * Remove unused accessors from CDevicePiotr Dziwinski2014-08-124-331/+49
| |
| * Fix task stopping checks in CBrainPiotr Dziwinski2014-08-102-124/+39
| | | | | | | | | | | | This possibly fixes some issues resulting from improperly stopping tasks (CTask::Abort() not called before deleting the task). Found while looking for instances of #318.
| * Remove some more delete checks (#318)Piotr Dziwinski2014-08-104-69/+28
| |
| * Remove unnecessary delete checks (#318)Piotr Dziwinski2014-08-095-23/+9
| |
| * Fixed #315krzys-h2014-08-081-4/+4
| |
| * Updated submodulekrzys-h2014-08-081-0/+0
| |
| * Auto-update from Pootle 2014-08-08krzys-h2014-08-081-0/+0
| | | | | | | | This commit was automatically generated from http://translations.colobot.info/
| * Auto-update from Pootle 2014-08-07krzys-h2014-08-071-0/+0
| | | | | | | | This commit was automatically generated from http://translations.colobot.info/
| * Fixed #314krzys-h2014-08-061-2/+2
| |
| * Removed some unused codekrzys-h2014-08-063-620/+0
| |
| * Auto-update from Pootle 2014-08-05krzys-h2014-08-051-0/+0
| | | | | | | | This commit was automatically generated from http://translations.colobot.info/
| * Auto-update from Pootle 2014-07-29krzys-h2014-07-291-3/+3
| | | | | | | | This commit was automatically generated from http://translations.colobot.info/
| * Auto-update from Pootle 2014-07-28krzys-h2014-07-281-0/+0
| | | | | | | | This commit was automatically generated from http://translations.colobot.info/
| * Auto-update from Pootle 2014-07-26krzys-h2014-07-262-4/+5
| | | | | | | | This commit was automatically generated from http://translations.colobot.info/
| * Auto-update from Pootle 2014-07-25krzys-h2014-07-251-0/+0
| | | | | | | | This commit was automatically generated from http://translations.colobot.info/
| * Pootle broke stuff, I've fixed stuffkrzys-h2014-07-241-0/+0
| |
| * Auto-update from Pootle 2014-07-24krzys-h2014-07-241-0/+0
| | | | | | | | This commit was automatically generated from http://translations.colobot.info/
| * Auto-update from Pootle 2014-07-23krzys-h2014-07-232-12/+10
| | | | | | | | This commit was automatically generated from http://translations.colobot.info/
| * Merge pull request #311 from MohamedWaheed/devkrzys-h2014-07-221-40/+40
| |\ | | | | | | fixed issue #223 about disabling shadows/ground textures
| | * fixed issue #223 about disabling shadows/ground texturesMohamed Waheed2014-07-121-40/+40
| | |
| * | Auto-update from Pootle 2014-07-20krzys-h2014-07-201-0/+0
| | | | | | | | | | | | This commit was automatically generated from http://translations.colobot.info/
| * | Auto-update from Pootle 2014-07-17krzys-h2014-07-171-6/+10
| | | | | | | | | | | | This commit was automatically generated from http://translations.colobot.info/
| * | Auto-update from Pootle 2014-07-16krzys-h2014-07-161-0/+0
| | | | | | | | | | | | This commit was automatically generated from http://translations.colobot.info/
| * | Auto-update from Pootle 2014-07-15krzys-h2014-07-151-0/+0
| | | | | | | | | | | | This commit was automatically generated from http://translations.colobot.info/
| * | Auto-update from Pootle 2014-07-13krzys-h2014-07-131-0/+0
| |/ | | | | | | This commit was automatically generated from http://translations.colobot.info/
* | Added %chap% for current chapter directorykrzys-h2014-09-292-1/+3
| |
* | On development builds store savegame data in current directorykrzys-h2014-09-291-0/+4
| |
* | Updated data submodulekrzys-h2014-09-291-0/+0
| |
* | Replaced std::to_string with boost::lexical_cast<std::string>krzys-h2014-09-284-13/+16
| | | | | | | | MXE has problems with std::to_string
* | Updated data submodulekrzys-h2014-09-271-0/+0
| |
* | Made proxyDistance optionalkrzys-h2014-09-271-2/+1
| |
* | Updated level check scriptkrzys-h2014-09-271-4/+14
| |
* | Moved effect??.png textures and made pos= in GroundSpot optionalkrzys-h2014-09-275-10/+10
| |
* | Fixed TerrainLevel bugkrzys-h2014-09-271-0/+1
| |
* | Removed more unused variableskrzys-h2014-09-272-20/+0
| |