Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' | Piotr Dziwinski | 2013-03-30 | 405 | -11415/+10483 |
|\ | | | | | | | Merging content from dev | ||||
| * | Fixed power cell bug (#120) | Piotr Dziwinski | 2013-03-30 | 1 | -3/+10 |
| | | |||||
| * | * Fixed and turned on edit_test | erihel | 2013-03-29 | 2 | -24/+24 |
| | | |||||
| * | OK, I give up. | krzys-h | 2013-03-29 | 1 | -23/+23 |
| | | |||||
| * | Nope, now fixed edit_test! | krzys-h | 2013-03-29 | 1 | -1/+1 |
| | | |||||
| * | Fixed edit_test | krzys-h | 2013-03-29 | 2 | -23/+28 |
| | | |||||
| * | Tests are broken again | krzys-h | 2013-03-29 | 1 | -23/+23 |
| | | |||||
| * | Updated data submodule | krzys-h | 2013-03-29 | 1 | -0/+0 |
| | | |||||
| * | Added SatCom translations | krzys-h | 2013-03-29 | 9 | -209/+214 |
| | | |||||
| * | Merge branch 'dev' of github.com:colobot/colobot into dev | krzys-h | 2013-03-28 | 4 | -24/+54 |
| |\ | |||||
| | * | Fixed edit_test | Piotr Dziwinski | 2013-03-27 | 4 | -24/+54 |
| | | | |||||
| * | | Changes to fix multilanguage on Windows | krzys-h | 2013-03-28 | 2 | -1/+14 |
| |/ | | | | | | | Issue #118 | ||||
| * | Added option to lock SatCom | krzys-h | 2013-03-27 | 2 | -1/+5 |
| | | |||||
| * | Revert "Fix for #30" | krzys-h | 2013-03-27 | 1 | -1/+0 |
| | | | | | | | | | | This reverts commit bfdd52ade09b4f8ee74e5c9c888a5c76fa60f4b8. That wasn't working. :( | ||||
| * | Fix for #30 | krzys-h | 2013-03-27 | 1 | -0/+1 |
| | | |||||
| * | Moved boost flags to CMakeLists | Piotr Dziwinski | 2013-03-27 | 2 | -5/+6 |
| | | |||||
| * | Removed "X" button | krzys-h | 2013-03-27 | 1 | -2/+2 |
| | | |||||
| * | Changed savegame & profile dir on Windows | krzys-h | 2013-03-27 | 2 | -0/+39 |
| | | |||||
| * | Changes to Scribbler interface | krzys-h | 2013-03-27 | 3 | -18/+12 |
| | | |||||
| * | Added button for grab()/drop() for AlienWasp | krzys-h | 2013-03-27 | 1 | -2/+3 |
| | | |||||
| * | * Another define to fix linker problems | erihel | 2013-03-27 | 1 | -0/+1 |
| | | |||||
| * | Merge pull request #151 from OdyX/dev-use-xdg-homedirs | krzys-h | 2013-03-27 | 9 | -26/+103 |
| |\ | | | | | | | Use XDG paths and directories for both savegame and colobot.ini. | ||||
| | * | BROWN-PAPER COMMIT: Drop the tests to have the thing build | Didier Raboud | 2013-03-27 | 3 | -23/+24 |
| | | | | | | | | | | | | Someone understanding GMock / GTest needs to replace that commit (and the two parents) with a working setup | ||||
| | * | Add Linux-specific savegame and profile settings according to the XDG Base ↵ | Didier Raboud | 2013-03-27 | 2 | -0/+57 |
| | | | | | | | | | | | | | | | | | | Directory Specification http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html | ||||
| | * | Add profile and savegame fetchers in SystemUtils | Didier Raboud | 2013-03-27 | 4 | -3/+22 |
| |/ | | | | | | | This breaks the tests compilation. :/ | ||||
| * | Added interface button for AlienSpider explosion | krzys-h | 2013-03-26 | 4 | -30/+66 |
| | | | | | | | | Issue #142 | ||||
| * | Added option "zoom=x;y;z" to CreateObject in mission files | krzys-h | 2013-03-25 | 1 | -0/+4 |
| | | |||||
| * | Revert "Travis change from #148" | Piotr Dziwinski | 2013-03-25 | 1 | -2/+0 |
| | | | | | | | | | | | | This reverts commit 5f1c202a6b35a0b5c102d9ab6b8bf1e730ce5a03. Reverting change because we still need to check GCC 4.6 compatibility. | ||||
| * | Travis change from #148 | Piotr Dziwinski | 2013-03-25 | 1 | -0/+2 |
| | | |||||
| * | Fixed GCC 4.6 compilation | Piotr Dziwinski | 2013-03-25 | 1 | -1/+1 |
| | | |||||
| * | Useful script for showing status of data submodule | Piotr Dziwinski | 2013-03-25 | 1 | -0/+90 |
| | | |||||
| * | Merge pull request #147 from OdyX/bugfix-desktop-option-creation | Piotr Dziwiński | 2013-03-24 | 1 | -1/+1 |
| |\ | | | | | | | Bugfix DESKTOP option initialisation | ||||
| | * | Bugfix DESKTOP option initialisation | Didier Raboud | 2013-03-24 | 1 | -1/+1 |
| |/ | |||||
| * | Updated data submodule | Piotr Dziwinski | 2013-03-24 | 1 | -0/+0 |
| | | |||||
| * | In Retro mode, robot's lights always blink. | krzys-h | 2013-03-24 | 2 | -4/+5 |
| | | |||||
| * | Retro mode now disables possibility of writing and running programs | krzys-h | 2013-03-24 | 3 | -13/+21 |
| | | |||||
| * | Small fix in mission files code | krzys-h | 2013-03-24 | 1 | -0/+1 |
| | | |||||
| * | Reverted "Fix for issue #149" | krzys-h | 2013-03-24 | 1 | -7/+7 |
| | | | | | | | | because it was broken again after commit 7ebba6abaa66abda690dcdb87248dfcb0c1dedc6 | ||||
| * | Fixed timer functions on win32 | Piotr Dziwinski | 2013-03-24 | 27 | -387/+916 |
| | | | | | | | | | | | | | | * changed win32 implementation to QueryPerformaceTimer system function * refactored system utils code * proper tests for time utils and update event creation in application * should fix issue #134 | ||||
| * | * Updated submodule data | erihel | 2013-03-23 | 1 | -0/+0 |
| | | |||||
| * | * Changed ending screen (issue #129) | erihel | 2013-03-23 | 1 | -20/+20 |
| | | |||||
| * | * Blocked cheat input in SatCom, intro movie and while editing cbot (issue #130) | erihel | 2013-03-23 | 1 | -0/+3 |
| | | |||||
| * | Basic detection of syntax errors in mission levels | krzys-h | 2013-03-23 | 2 | -6/+157 |
| | | | | | | | | + option to enable Retro mode (for now doesn't do enything) | ||||
| * | Updated README files, optional libsndfile | Piotr Dziwinski | 2013-03-22 | 7 | -200/+207 |
| | | | | | | | | | | | | * updated readme files * moved sndfile to optional * changed install paths on Windows | ||||
| * | Fixes for compiling on MSYS | Piotr Dziwinski | 2013-03-22 | 22 | -56/+117 |
| | | | | | | | | | | | | * fixed SDL_main() and putenv() issues * disabled desktop subdir for MSYS * disabled building CBot_console for now | ||||
| * | * Changed Set/Get HilateCap to Set/Get HighlightCap | erihel | 2013-03-20 | 6 | -17/+25 |
| | | | | | | | | | | * Changes ReadText in CEdit to fix problem with SatCom links * Filenames when loading/saving scripts should be fixed on mxe | ||||
| * | * Fix for mxe with boost path | erihel | 2013-03-20 | 1 | -1/+1 |
| | | |||||
| * | Changed Linux time function | Piotr Dziwinski | 2013-03-19 | 1 | -1/+1 |
| | | | | | | | | With CLOCK_MONOTONIC_RAW, the timer should never go back in time. | ||||
| * | Refactored platform-specific code | Piotr Dziwinski | 2013-03-19 | 10 | -263/+410 |
| | | | | | | | | Moved functions from .h to .cpp files | ||||
| * | * Changes std::stoi to atoi as gcc does not support it on windows platform | erihel | 2013-03-17 | 2 | -7/+2 |
| | |