summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge branch 'dev' of github.com:colobot/colobot into devkrzys-h2014-07-105-88/+96
|\ \ \
| * | | Auto-update from Pootle 2014-07-10krzys-h2014-07-101-10/+10
| * | | Initial Pootle<->Git integration commitkrzys-h2014-07-105-4810/+4825
* | | | Removed some old stuff related to Ceebot-Teenkrzys-h2014-07-1011-47/+18
|/ / /
* | | Removed some unused code related to Quit buttonkrzys-h2014-07-1011-106/+160
* | | Updated data submodulePiotr Dziwinski2014-07-091-0/+0
* | | Post-release 0.1.3-alphakrzys-h2014-07-011-2/+2
| |/ |/|
* | Release 0.1.3-alphakrzys-h2014-07-01106-2862/+2978
|\ \
| * | Removed old code based on #ifs (issue #55)krzys-h2014-06-2714-516/+11
| * | Updated submoduleKrzysztof Dermont2014-06-261-0/+0
| * | Fix test compilationPiotr Dziwinski2014-06-263-5/+7
| * | Fixed testskrzys-h2014-06-262-9/+31
| * | Fixed not destroying CGameDatakrzys-h2014-06-261-0/+3
| * | Fixed negative parameter in fire() (issue #305)krzys-h2014-06-261-10/+12
| * | Fixed CMake git branch detection with build dir outside of repository working...krzys-h2014-06-251-0/+2
| * | Fix test compilationPiotr Dziwinski2014-06-241-0/+2
| * | Merge pull request #304 from MohamedWaheed/devPiotr DziwiƄski2014-06-248-25/+99
| |\ \
| | * | fixed savefile screenshot loading bugMohamed Waheed2014-06-241-19/+16
| | * | formatting and enhancements for savefile screenshot featureMohamed Waheed2014-06-245-27/+24
| | * | implemented savefile screenshot featureMohamed Waheed2014-06-247-6/+86
| * | | Fix test compilationPiotr Dziwinski2014-06-245-14/+6
| |/ /
| * / Updated data submodulekrzys-h2014-06-191-0/+0
| |/
| * Remove dead codePiotr Dziwinski2014-06-011-6/+0
| * Better datadir mod supportkrzys-h2014-05-1819-193/+286
| * Random relief generatorkrzys-h2014-04-103-1/+69
| * Updated data submodulekrzys-h2014-04-101-0/+0
| * Updated INSTALL filekrzys-h2014-04-022-1/+12
| * Merge pull request #297 from kosmakoff/devkrzys-h2014-03-251-1/+7
| |\
| | * Fixes #271Oleg Kosmakov2014-03-251-1/+7
| * | Merge pull request #296 from kosmakoff/devkrzys-h2014-03-215-134/+179
| |\|
| | * WhitespaceOleg Kosmakov2014-03-211-3/+3
| | * Issue #295 - continueOleg Kosmakov2014-03-212-4/+4
| | * WhitespaceOleg Kosmakov2014-03-211-1/+1
| | * Fixes #295Oleg Kosmakov2014-03-215-4/+49
| | * Added spaces to align valuesOleg Kosmakov2014-03-211-130/+130
| |/
| * Fix for #294MrSimbax2014-03-161-1/+3
| * Fixed bug with fall damageMrSimbax2014-03-121-2/+2
| * Replaced an old icon with a new oneMrSimbax2014-03-092-188/+350
| * Made some improvements to fall damage from a61da740MrSimbax2014-03-092-13/+52
| * Fixed bug from a61da7404bf8430132864d493c7e75a6b4c3d978MrSimbax2014-03-081-7/+7
| * Added fall damageMrSimbax2014-03-083-1/+20
| * Added special mode in scene for bots to build more buildings than they usualy...krzys-h2014-03-035-9/+36
| * Check if pause music is defined in scene before trying to play itkrzys-h2014-03-021-2/+4
| * Merge pull request #287 from andreymal/dev-fix-soundkrzys-h2014-03-021-7/+9
| |\
| | * fixed m_oldMusic.push_back(nullptr) and segfaultandreymal2014-03-021-7/+9
| |/
| * Merge pull request #284 from andreymal/devkrzys-h2014-03-021-2/+2
| |\
| | * GetStringWidth fixandreymal2014-03-021-2/+2
| |/
| * Fixed compile warningkrzys-h2014-02-211-1/+1
| * Updated data submodulekrzys-h2014-02-211-0/+0
| * Added option to set pause audio in Scenekrzys-h2014-02-218-37/+58