Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Run image_test | Didier Raboud | 2013-11-18 | 1 | -0/+2 | |
| | | | ||||||
| * | | Re-enable profile_test test | Didier Raboud | 2013-11-18 | 1 | -3/+6 | |
| | | | ||||||
| * | | Initialise CSystemUtils' singleton in the three light, transform and model tests | Didier Raboud | 2013-11-18 | 4 | -2/+11 | |
| | | | | | | | | | | | | Also fix README | |||||
* | | | Merge pull request #252 from OdyX/dev-fix-tooltip-color | Piotr Dziwiński | 2013-11-19 | 2 | -4/+4 | |
|\ \ \ | |/ / |/| | | Fix tooltip to display as white and not transparent | |||||
| * | | Tweak tooltip margin and correct french jargon comment | Didier Raboud | 2013-11-19 | 1 | -2/+2 | |
| | | | ||||||
| * | | Fix tooltip to display as white and not transparent | Didier Raboud | 2013-11-19 | 1 | -2/+2 | |
|/ / | ||||||
* | | Fix for crash when loading PNG in indexed mode | Piotr Dziwinski | 2013-11-15 | 2 | -5/+31 | |
| | | | | | | | | For example, some icons in SatCom | |||||
* | | Updated data submodule | Piotr Dziwinski | 2013-11-14 | 1 | -0/+0 | |
| | | ||||||
* | | Buffer overflow fix | Piotr Dziwinski | 2013-11-13 | 1 | -1/+1 | |
| | | ||||||
* | | Fixed missing "\n" in ru.po | Piotr Dziwinski | 2013-11-12 | 1 | -1/+1 | |
| | | ||||||
* | | Russian translation of interface (#249) | Piotr Dziwinski | 2013-11-12 | 1 | -0/+1827 | |
| | | ||||||
* | | Updated data submodule | Piotr Dziwinski | 2013-11-11 | 1 | -0/+0 | |
| | | ||||||
* | | Updated data submodule | Piotr Dziwinski | 2013-11-10 | 1 | -0/+0 | |
|/ | ||||||
* | Merge pull request #248 from OdyX/dev-add-russian | Erihel | 2013-11-07 | 2 | -1/+19 | |
|\ | | | | | Add russian basic support | |||||
| * | Add russian language support | Didier 'OdyX' Raboud | 2013-11-07 | 2 | -1/+19 | |
|/ | ||||||
* | Merge pull request #246 from OdyX/dev-fix-mxe-build | krzys-h | 2013-11-05 | 1 | -27/+26 | |
|\ | | | | | Only use PO4A on desktop file and manpages on non-Windows builds | |||||
| * | Only use PO4A on desktop file and manpages on non-Windows builds | Didier 'OdyX' Raboud | 2013-11-05 | 1 | -27/+26 | |
|/ | | | | Fixes the MXE-with-PO4A build | |||||
* | Version bump (0.1.1) | Piotr Dziwinski | 2013-11-03 | 1 | -1/+1 | |
| | ||||||
* | Updated data submodule | Piotr Dziwinski | 2013-11-03 | 1 | -0/+0 | |
| | ||||||
* | Merge pull request #241 from OdyX/dev-fix-licensing-problems | Piotr Dziwiński | 2013-11-03 | 1 | -11/+0 | |
|\ | | | | | colobot-data: Files under unclear license | |||||
| * | Drop now-useless display of licenses.txt in PHASE_GENERIC | Didier Raboud | 2013-10-30 | 1 | -11/+0 | |
|/ | | | | | The content of licenses.txt in data has gotten useless as the restrictions got waived, displaying it is useless. | |||||
* | Merge pull request #245 from OdyX/dev-platform-fixes | Piotr Dziwiński | 2013-10-29 | 6 | -75/+110 | |
|\ | | | | | Platform fixes (Windows Icon and Mac OSX SDL_Main fix) | |||||
| * | On MacOSX, use SDL_Main | Didier 'OdyX' Raboud | 2013-10-29 | 1 | -0/+2 | |
| | | ||||||
| * | Revert "Include SDL.h in main.cpp to make sure the main loop is SDL's main loop" | Didier 'OdyX' Raboud | 2013-10-29 | 1 | -1/+0 | |
| | | | | | | | | | | | | This was the wrong fix for the problem. This reverts commit f31a570d96e1a0ee28baecefa18b7e8c586c201c. | |||||
| * | Add an icon and executable information to the colobot.exe when build in MXE | Didier 'OdyX' Raboud | 2013-10-29 | 5 | -74/+108 | |
| | | ||||||
* | | Revert back "Merge pull request #243 from OdyX/dev-fix-textures-loading" | Piotr Dziwinski | 2013-10-29 | 2 | -3/+7 | |
|/ | | | | | False alarm, was caused probably by faulty build bot. This definately should work on all platforms. | |||||
* | Revert "Merge pull request #243 from OdyX/dev-fix-textures-loading" | Piotr Dziwinski | 2013-10-28 | 2 | -7/+3 | |
| | | | | Looks like it doesn't work on all platforms | |||||
* | Merge pull request #243 from OdyX/dev-fix-textures-loading | Piotr Dziwiński | 2013-10-28 | 2 | -3/+7 | |
|\ | | | | | Fix the detection of alpha-channel in textures as created by IMG_Load | |||||
| * | Let mouse.png's format be detected | Didier Raboud | 2013-10-28 | 1 | -1/+1 | |
| | | | | | | | | Fixes the mouse cursor on Mac OS X | |||||
| * | Fix the detection of alpha-channel in textures as created by IMG_Load | Didier 'OdyX' Raboud | 2013-10-28 | 1 | -2/+6 | |
|/ | | | | This fixes the textures loading under Mac OS X | |||||
* | Merge pull request #242 from OdyX/dev-macosx | Piotr Dziwiński | 2013-10-26 | 2 | -1/+3 | |
|\ | | | | | Mac OSX (Darwin) build support | |||||
| * | Add libintl library to the unit tests on Mac OSX | Didier 'OdyX' Raboud | 2013-10-26 | 1 | -1/+2 | |
| | | ||||||
| * | Include SDL.h in main.cpp to make sure the main loop is SDL's main loop | Didier 'OdyX' Raboud | 2013-10-26 | 1 | -0/+1 | |
|/ | | | | This allows the MacOSX program to start. | |||||
* | Fix for CMakeLists error | Piotr Dziwinski | 2013-10-24 | 1 | -1/+1 | |
| | ||||||
* | Added option to force to use bundled gmock/gtest | Piotr Dziwinski | 2013-10-24 | 2 | -5/+5 | |
| | | | | | | * resolves problem when version of gmock/gtest found installed in system disagrees with the bundled one * removed -DGTEST_HAVE_PTHREAD=0, seems that pthread is needed after all | |||||
* | Fix system_other implementation by adding an Init() and fixing the wrong const | Didier 'OdyX' Raboud | 2013-10-24 | 2 | -2/+3 | |
| | ||||||
* | Include the OpenAL headers using the "al.h" form, as recommended by its ↵ | Didier 'OdyX' Raboud | 2013-10-24 | 5 | -7/+8 | |
| | | | | CMake finder script | |||||
* | MacOSX: Add initial support in CMake build infra | Didier 'OdyX' Raboud | 2013-10-24 | 5 | -25/+45 | |
| | ||||||
* | Updated data submodule | Piotr Dziwinski | 2013-10-24 | 1 | -0/+0 | |
| | ||||||
* | Fixed CTerrain-related memory leaks | Piotr Dziwinski | 2013-10-13 | 4 | -3/+47 | |
| | ||||||
* | Fixed memory leaks in CText | Piotr Dziwinski | 2013-10-12 | 1 | -5/+18 | |
| | ||||||
* | Fixed some CBot-related memory leaks | Piotr Dziwinski | 2013-10-12 | 5 | -37/+37 | |
| | | | | | | * fixed leaks in CScript::CheckToken() * fixed leaks in CInterface * commented out unused function in robotmain.cpp | |||||
* | Updated data submodule | Piotr Dziwinski | 2013-10-12 | 1 | -0/+0 | |
| | ||||||
* | Fix for #232 - Images in SatCom | krzys-h | 2013-09-28 | 2 | -6/+6 | |
| | | | | Only images, icons still don't work | |||||
* | Fixed @Emxx52 's fail :P | krzys-h | 2013-09-08 | 1 | -1/+3 | |
|\ | | | | | | | | | | | Merge branch 'master' into dev Conflicts: src/app/app.cpp | |||||
| * | Added '-game' launch option | Emxx52 | 2013-09-08 | 1 | -1/+3 | |
| | | ||||||
| * | Colobot Gold 0.1.0-alpha | Piotr Dziwinski | 2013-06-24 | 296 | -3517/+12532 | |
| |\ | ||||||
| * \ | Merge branch 'dev' | Piotr Dziwinski | 2013-03-30 | 405 | -11415/+10483 | |
| |\ \ | | | | | | | | | | | | | Merging content from dev | |||||
| * | | | Small fix in detecting language. Fixes needed to compile code using clang | Marcin Zawadzki | 2013-01-12 | 8 | -9/+12 | |
| | | | | ||||||
| * | | | Disabled travis e-mail notifications | Piotr Dziwinski | 2013-01-09 | 1 | -0/+2 | |
| | | | |