Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | |||||
* | | | | 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 |
| |_|/ |/| | | |||||
* | | | 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 |
| | | | |||||
* | | | Added debug aids for lighting | Piotr Dziwinski | 2013-06-17 | 11 | -7/+211 |
| | | | | | | | | | | | | | | | | | | * displaying positions of current lights (F11) * dumping info to console (F10) * added assert() in suspicious place in CPyro | ||||
* | | | Added -proto to options[] | krzys-h | 2013-06-17 | 1 | -0/+1 |
| | | | |||||
* | | | Fix for #133 | Piotr Dziwinski | 2013-06-17 | 3 | -8/+106 |
| | | | | | | | | | | | | | | | * objects are now copied and textures are updated correctly * also added function to debug objects | ||||
* | | | Enhanced logging, option to auto-start mission | Piotr Dziwinski | 2013-06-16 | 17 | -221/+869 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * added logging of application events * changed debug mode flag to independent debug modes * added option to auto-start mission (load a mission immediately after startup) * removed "enum value out of range" prints * some refactoring | ||||
* | | | Fix for #195 | Piotr Dziwinski | 2013-06-13 | 3 | -2/+21 |
| | | | | | | | | | | | | * loading time now is not counted in elapsed time | ||||
* | | | Fixed bug with showing wrong filename in Level Checker errors after using ↵ | krzys-h | 2013-06-10 | 1 | -2/+2 |
| | | | | | | | | | | | | CacheAudio | ||||
* | | | Fixed bug with white map | krzys-h | 2013-06-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | I'm not sure when it was introduced, probably in 8f6fd2a1316432970f1d86515819e7bbe15ddab3. It was showing errors like "Couldn't load texture 'map.png'" and "Invalid texture data" | ||||
* | | | Fixed variable shadowing warnings | Piotr Dziwinski | 2013-05-27 | 14 | -83/+93 |
| | | | | | | | | | | | | | | | * fixed -Wshadow warnings * refactored some constructors | ||||
* | | | Fixed some memory issues | Piotr Dziwinski | 2013-05-27 | 2 | -1/+4 |
| | | | | | | | | | | | | * invalid pointer, uninitialized buffer |