summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Small fix to CObject::ExploObjectkrzys-h2013-03-311-1/+1
| * Tests AGAIN!krzys-h2013-03-311-0/+1
| * And it compiled and worked? o.Okrzys-h2013-03-311-1/+1
| * Merge branch 'dev' of github.com:colobot/colobot into devkrzys-h2013-03-315-38/+32
| |\
| | * Merge branch 'dev' of github:colobot/colobot into deverihel2013-03-303-3/+50
| | |\
| | * | * Removed warning while compiling brain.cpperihel2013-03-305-38/+32
| * | | Added field "item" to class "object" in CBotkrzys-h2013-03-318-6/+460
| | |/ | |/|
| * | Merge branch 'dev' of github.com:colobot/colobot into devkrzys-h2013-03-303-27/+34
| |\ \
| | * | Fixed power cell bug (#120)Piotr Dziwinski2013-03-301-3/+10
| | |/
| | * * Fixed and turned on edit_testerihel2013-03-292-24/+24
| * | Added function destroy(rank)krzys-h2013-03-302-0/+40
| |/
| * 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
| |/
| * Added option to lock SatComkrzys-h2013-03-272-1/+5
| * Revert "Fix for #30"krzys-h2013-03-271-1/+0
| * 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
* | New snapshot of dev branch (221-gcef858b)Didier Raboud2013-03-2717-59/+266
|\|
| * Merge pull request #151 from OdyX/dev-use-xdg-homedirskrzys-h2013-03-279-26/+103
| |\
| | * BROWN-PAPER COMMIT: Drop the tests to have the thing buildDidier Raboud2013-03-273-23/+24
| | * Add Linux-specific savegame and profile settings according to the XDG Base Di...Didier Raboud2013-03-272-0/+57
| | * Add profile and savegame fetchers in SystemUtilsDidier Raboud2013-03-274-3/+22
| |/
| * Added interface button for AlienSpider explosionkrzys-h2013-03-264-30/+66
| * 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
| * 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
* | Drop the changelog entryDidier Raboud2013-03-272-2/+2
* | Merge snapshot of dev branch (211-gcd60d92)Didier Raboud2013-03-252-3/+4
|\|
| * Merge pull request #147 from OdyX/bugfix-desktop-option-creationPiotr DziwiƄski2013-03-241-1/+1
| |\
| | * Bugfix DESKTOP option initialisationDidier Raboud2013-03-241-1/+1
| |/
* | Add convenience mergerDidier Raboud2013-03-251-0/+8
* | Merge branch 'dev' into debianDidier Raboud2013-03-2452-683/+1444
|\|
| * 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