summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev'Piotr Dziwinski2013-03-30405-11415/+10483
|\ | | | | | | Merging content from dev
| * Fixed power cell bug (#120)Piotr Dziwinski2013-03-301-3/+10
| |
| * * Fixed and turned on edit_testerihel2013-03-292-24/+24
| |
| * OK, I give up.krzys-h2013-03-291-23/+23
| |
| * Nope, now fixed edit_test!krzys-h2013-03-291-1/+1
| |
| * Fixed edit_testkrzys-h2013-03-292-23/+28
| |
| * Tests are broken againkrzys-h2013-03-291-23/+23
| |
| * Updated data submodulekrzys-h2013-03-291-0/+0
| |
| * Added SatCom translationskrzys-h2013-03-299-209/+214
| |
| * Merge branch 'dev' of github.com:colobot/colobot into devkrzys-h2013-03-284-24/+54
| |\
| | * Fixed edit_testPiotr Dziwinski2013-03-274-24/+54
| | |
| * | Changes to fix multilanguage on Windowskrzys-h2013-03-282-1/+14
| |/ | | | | | | Issue #118
| * Added option to lock SatComkrzys-h2013-03-272-1/+5
| |
| * Revert "Fix for #30"krzys-h2013-03-271-1/+0
| | | | | | | | | | This reverts commit bfdd52ade09b4f8ee74e5c9c888a5c76fa60f4b8. That wasn't working. :(
| * Fix for #30krzys-h2013-03-271-0/+1
| |
| * Moved boost flags to CMakeListsPiotr Dziwinski2013-03-272-5/+6
| |
| * Removed "X" buttonkrzys-h2013-03-271-2/+2
| |
| * Changed savegame & profile dir on Windowskrzys-h2013-03-272-0/+39
| |
| * Changes to Scribbler interfacekrzys-h2013-03-273-18/+12
| |
| * Added button for grab()/drop() for AlienWaspkrzys-h2013-03-271-2/+3
| |
| * * Another define to fix linker problemserihel2013-03-271-0/+1
| |
| * Merge pull request #151 from OdyX/dev-use-xdg-homedirskrzys-h2013-03-279-26/+103
| |\ | | | | | | Use XDG paths and directories for both savegame and colobot.ini.
| | * BROWN-PAPER COMMIT: Drop the tests to have the thing buildDidier Raboud2013-03-273-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 Raboud2013-03-272-0/+57
| | | | | | | | | | | | | | | | | | Directory Specification http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
| | * Add profile and savegame fetchers in SystemUtilsDidier Raboud2013-03-274-3/+22
| |/ | | | | | | This breaks the tests compilation. :/
| * Added interface button for AlienSpider explosionkrzys-h2013-03-264-30/+66
| | | | | | | | Issue #142
| * Added option "zoom=x;y;z" to CreateObject in mission fileskrzys-h2013-03-251-0/+4
| |
| * Revert "Travis change from #148"Piotr Dziwinski2013-03-251-2/+0
| | | | | | | | | | | | This reverts commit 5f1c202a6b35a0b5c102d9ab6b8bf1e730ce5a03. Reverting change because we still need to check GCC 4.6 compatibility.
| * Travis change from #148Piotr Dziwinski2013-03-251-0/+2
| |
| * Fixed GCC 4.6 compilationPiotr Dziwinski2013-03-251-1/+1
| |
| * Useful script for showing status of data submodulePiotr Dziwinski2013-03-251-0/+90
| |
| * Merge pull request #147 from OdyX/bugfix-desktop-option-creationPiotr Dziwiński2013-03-241-1/+1
| |\ | | | | | | Bugfix DESKTOP option initialisation
| | * Bugfix DESKTOP option initialisationDidier Raboud2013-03-241-1/+1
| |/
| * Updated data submodulePiotr Dziwinski2013-03-241-0/+0
| |
| * In Retro mode, robot's lights always blink.krzys-h2013-03-242-4/+5
| |
| * Retro mode now disables possibility of writing and running programskrzys-h2013-03-243-13/+21
| |
| * Small fix in mission files codekrzys-h2013-03-241-0/+1
| |
| * Reverted "Fix for issue #149"krzys-h2013-03-241-7/+7
| | | | | | | | because it was broken again after commit 7ebba6abaa66abda690dcdb87248dfcb0c1dedc6
| * Fixed timer functions on win32Piotr Dziwinski2013-03-2427-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 dataerihel2013-03-231-0/+0
| |
| * * Changed ending screen (issue #129)erihel2013-03-231-20/+20
| |
| * * Blocked cheat input in SatCom, intro movie and while editing cbot (issue #130)erihel2013-03-231-0/+3
| |
| * Basic detection of syntax errors in mission levelskrzys-h2013-03-232-6/+157
| | | | | | | | + option to enable Retro mode (for now doesn't do enything)
| * Updated README files, optional libsndfilePiotr Dziwinski2013-03-227-200/+207
| | | | | | | | | | | | * updated readme files * moved sndfile to optional * changed install paths on Windows
| * Fixes for compiling on MSYSPiotr Dziwinski2013-03-2222-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 HighlightCaperihel2013-03-206-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 patherihel2013-03-201-1/+1
| |
| * Changed Linux time functionPiotr Dziwinski2013-03-191-1/+1
| | | | | | | | With CLOCK_MONOTONIC_RAW, the timer should never go back in time.
| * Refactored platform-specific codePiotr Dziwinski2013-03-1910-263/+410
| | | | | | | | Moved functions from .h to .cpp files
| * * Changes std::stoi to atoi as gcc does not support it on windows platformerihel2013-03-172-7/+2
| |