Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | 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 | |||||
| * | | Datadir in command line didn't work with config. | erihel | 2013-07-16 | 2 | -3/+8 | |
| | | | | | | | | | | | | Values from config file overwrote datadir | |||||
| * | | Fixed test binaries location | Piotr Dziwinski | 2013-06-29 | 2 | -2/+2 | |
| | | | ||||||
| * | | Typo fix | Piotr Dziwinski | 2013-06-27 | 1 | -1/+1 | |
| | | | ||||||
| * | | Fix for #228 | Piotr Dziwinski | 2013-06-26 | 1 | -9/+15 | |
| | | | | | | | | | | | | * "empty" objects were wrongly handled in CPyro | |||||
| * | | Forgotten compile flag | Piotr Dziwinski | 2013-06-26 | 1 | -0/+3 | |
| | | | ||||||
| * | | Some Ui refactoring | erihel | 2013-06-24 | 30 | -83/+51 | |
| | | | ||||||
| * | | Post-alpha phase | Piotr Dziwinski | 2013-06-24 | 1 | -2/+2 | |
| | | | ||||||
* | | | Do not change master branch unless you REALLY know what U R doing! | adiblol | 2013-09-23 | 1 | -3/+1 | |
| |/ |/| | | | | | | | | | Revert "Added '-game' launch option" This reverts commit 2891c2ea4ce2e7c844d1e93db71dcfa8ad2ca100. | |||||
* | | 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 | |
|\| | ||||||
| * | Colobot Gold 0.1.0-alpha | Piotr Dziwinski | 2013-06-24 | 2 | -36/+27 | |
| | | ||||||
| * | Fix for tests compilation | Piotr Dziwinski | 2013-06-24 | 1 | -0/+2 | |
| | | ||||||
| * | Fix for travis CI build | Piotr Dziwinski | 2013-06-24 | 1 | -1/+1 | |
| | | ||||||
| * | Some further changes in CMakeLists | Piotr Dziwinski | 2013-06-24 | 8 | -52/+55 | |
| | | | | | | | | | | | | * removed DEV_BUILD autodetection (could be confusing) * ignore desktop subdirectory on Windows * some refactoring | |||||
| * | Fixed auto-detecting locale on Windows | Piotr Dziwinski | 2013-06-24 | 9 | -23/+3261 | |
| | | | | | | | | | | | | * localename library is now used to determine the actual locale used * added patched version of FindGettext.cmake to fix installation path of translation files | |||||
| * | Fix for MSYS/MXE build | Piotr Dziwinski | 2013-06-22 | 1 | -1/+1 | |
| | | ||||||
| * | Updated INSTALL files | Piotr Dziwinski | 2013-06-22 | 3 | -23/+22 | |
| | | ||||||
| * | gitignore update | Piotr Dziwinski | 2013-06-22 | 7 | -11/+24 | |
| | | | | | | | | | | * git should now ignore all generated files when building without separate build directory | |||||
| * | Futher changes to CMake options | Piotr Dziwinski | 2013-06-22 | 1 | -7/+7 | |
| | | | | | | | | | | * OpenAL sound is now enabled by default * Boost is linked dynamically by default | |||||
| * | Fix man build target dependencies | Piotr Dziwinski | 2013-06-22 | 1 | -0/+1 | |
| | | | | | | | | * could cause fails when make is run with many threads | |||||
| * | Changes in build organization | Piotr Dziwinski | 2013-06-22 | 34 | -191/+92 | |
| | | | | | | | | | | | | | | | | * targets are now created in top-level build directory * more things are now configured through CMake options * changed debug build detection from NDEBUG to DEV_BUILD * moved po and desktop directories * moved last unit test out of src directory | |||||
| * | Reverted enum values to fix UT regression | Piotr Dziwinski | 2013-06-22 | 1 | -3/+3 | |
| | | ||||||
| * | Fixed terrain light priorities (fix for #139) | Piotr Dziwinski | 2013-06-20 | 4 | -3/+21 | |
| | | | | | | | | | | * lights illuminating the terrain specified in scene file are now always moved to front of light ordering | |||||
| * | Fixed string formats in light debug prints | Piotr Dziwinski | 2013-06-17 | 1 | -5/+5 | |
| | |