Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with dev | Piotr Dziwinski | 2014-10-07 | 1 | -37/+37 |
|\ | |||||
| * | Better CMake organization and unit test cleanups | Piotr Dziwinski | 2014-08-12 | 1 | -37/+37 |
| | | | | | | | | | | | | | | * created a static library containing most source modules to avoid compiling source modules twice in code and unit tests * moved profile_test to main unit tests executable * removed image_test and edit_test as not really useful | ||||
* | | Merge branch 'dev' into dev-physfs | krzys-h | 2014-07-11 | 1 | -1/+3 |
|\| | | | | | | | | | | | | | | | | | Conflicts: data src/app/gamedata.cpp src/ui/control.cpp src/ui/edit.cpp src/ui/maindialog.cpp | ||||
| * | Post-release 0.1.3-alpha | krzys-h | 2014-07-01 | 1 | -2/+2 |
| | | |||||
| * | Release 0.1.3-alpha | krzys-h | 2014-07-01 | 1 | -11/+37 |
| |\ | |||||
| | * | Fixed CMake git branch detection with build dir outside of repository ↵ | krzys-h | 2014-06-25 | 1 | -0/+2 |
| | | | | | | | | | | | | working dir | ||||
| * | | Colobot Gold 0.1.2-alpha | Piotr Dziwinski | 2013-11-26 | 1 | -1/+19 |
| |\ \ | |||||
| * | | | Fixed version codename (-alpha) | Piotr Dziwinski | 2013-11-03 | 1 | -2/+2 |
| | | | | |||||
* | | | | Big part of PhysFS support | Krzysztof Dermont | 2014-06-20 | 1 | -0/+1 |
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * removed -mod argument * removed -datadir argument * removed -lang argument * removed some dead ui code * added resource manager and file loaders (stream and SDL) * changed interface textures location to match new directory structure * removed CGameData for mod support * added PhysFS support | ||||
* | | | Changed version display in bottom-right corner to be actually version number ↵ | krzys-h | 2013-12-27 | 1 | -9/+16 |
| | | | | | | | | | | | | instead of date | ||||
* | | | Fix problem with gtest and pthread on some systems | Piotr Dziwinski | 2013-12-20 | 1 | -0/+3 |
| | | | |||||
* | | | Add a PLATFORM_GNU global variable matching all GNU systems such as Debian's ↵ | Didier Raboud | 2013-11-27 | 1 | -1/+15 |
| |/ |/| | | | | | Linux, kFreeBSD and Hurd | ||||
* | | Version bump (0.1.2) | Piotr Dziwinski | 2013-11-26 | 1 | -1/+1 |
| | | |||||
* | | Consolidate SYSTEM_CPP_MODULE in the main CMakeLists.txt | Didier 'OdyX' Raboud | 2013-11-20 | 1 | -0/+12 |
| | | |||||
* | | On MacOSX, install files to Bundle-specific directories | Didier 'OdyX' Raboud | 2013-11-13 | 1 | -5/+5 |
| | | |||||
* | | Add MacOSX bundle-specific installation paths | Didier 'OdyX' Raboud | 2013-11-13 | 1 | -0/+6 |
|/ | |||||
* | Version bump (0.1.1) | Piotr Dziwinski | 2013-11-03 | 1 | -1/+1 |
| | |||||
* | On MacOSX, use SDL_Main | Didier 'OdyX' Raboud | 2013-10-29 | 1 | -0/+2 |
| | |||||
* | Add an icon and executable information to the colobot.exe when build in MXE | Didier 'OdyX' Raboud | 2013-10-29 | 1 | -5/+1 |
| | |||||
* | 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 | 1 | -2/+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 | ||||
* | Include the OpenAL headers using the "al.h" form, as recommended by its ↵ | Didier 'OdyX' Raboud | 2013-10-24 | 1 | -0/+1 |
| | | | | CMake finder script | ||||
* | MacOSX: Add initial support in CMake build infra | Didier 'OdyX' Raboud | 2013-10-24 | 1 | -25/+36 |
| | |||||
* | Typo fix | Piotr Dziwinski | 2013-06-27 | 1 | -1/+1 |
| | |||||
* | Forgotten compile flag | Piotr Dziwinski | 2013-06-26 | 1 | -0/+3 |
| | |||||
* | Post-alpha phase | Piotr Dziwinski | 2013-06-24 | 1 | -2/+2 |
| | |||||
* | Colobot Gold 0.1.0-alpha | Piotr Dziwinski | 2013-06-24 | 1 | -3/+5 |
| | |||||
* | Some further changes in CMakeLists | Piotr Dziwinski | 2013-06-24 | 1 | -26/+29 |
| | | | | | | * 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 | 1 | -3/+10 |
| | | | | | | * localename library is now used to determine the actual locale used * added patched version of FindGettext.cmake to fix installation path of translation files | ||||
* | 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 | ||||
* | Changes in build organization | Piotr Dziwinski | 2013-06-22 | 1 | -9/+34 |
| | | | | | | | | * 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 | ||||
* | Enhanced logging, option to auto-start mission | Piotr Dziwinski | 2013-06-16 | 1 | -4/+6 |
| | | | | | | | | | * 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 | ||||
* | Added relative install paths for MXE build | krzys-h | 2013-05-03 | 1 | -5/+14 |
| | |||||
* | * Minor changes to cmake files | erihel | 2013-04-12 | 1 | -1/+1 |
| | |||||
* | * Added X11 to libs in CMakefiles for linux build | erihel | 2013-04-11 | 1 | -1/+1 |
| | |||||
* | * Added clipboard support (issue #60) | erihel | 2013-04-11 | 1 | -0/+7 |
| | | | | * Fixed keyboard shortcuts while code editing in game | ||||
* | Moved boost flags to CMakeLists | Piotr Dziwinski | 2013-03-27 | 1 | -1/+6 |
| | |||||
* | Fixed GCC 4.6 compilation | Piotr Dziwinski | 2013-03-25 | 1 | -1/+1 |
| | |||||
* | Bugfix DESKTOP option initialisation | Didier Raboud | 2013-03-24 | 1 | -1/+1 |
| | |||||
* | Fixed timer functions on win32 | Piotr Dziwinski | 2013-03-24 | 1 | -19/+24 |
| | | | | | | | * changed win32 implementation to QueryPerformaceTimer system function * refactored system utils code * proper tests for time utils and update event creation in application * should fix issue #134 | ||||
* | Updated README files, optional libsndfile | Piotr Dziwinski | 2013-03-22 | 1 | -7/+14 |
| | | | | | | * updated readme files * moved sndfile to optional * changed install paths on Windows | ||||
* | Fixes for compiling on MSYS | Piotr Dziwinski | 2013-03-22 | 1 | -1/+17 |
| | | | | | | * fixed SDL_main() and putenv() issues * disabled desktop subdir for MSYS * disabled building CBot_console for now | ||||
* | CInstanceManager refactoring | Piotr Dziwiński | 2013-02-17 | 1 | -1/+1 |
| | | | | | | | | | * removed classes managed by CInstanceManager except for CObject, CPyro, CBrain and CPhysics because of dependencies * refactored instance searching to use existing singleton instances of CApplication, CEngine and CRobotMain and calling their getter functions | ||||
* | Refactoring in tests infrastructure | Piotr Dziwinski | 2013-02-03 | 1 | -5/+9 |
| | | | | | | | * all tests are now in /test/ subdirectory * unit tests concatenated to one executable (TODO: ui, common) * preparation for test environments (OpenGL and others) * removed old TestCBot | ||||
* | * Fixed sound pitch causing segfault | erihel | 2013-01-16 | 1 | -1/+1 |
| | | | | | | * Sound support should now compile fine with MXE * Added cache for 3 music files to speedup loading * Updated howto | ||||
* | * Removed alut | erihel | 2013-01-14 | 1 | -0/+2 |
| | | | | | * Using libsndfile to load sounds and music * Added support for playing music files | ||||
* | Use correct C++11/C++0x flags depending on the used compiler | Didier Raboud | 2013-01-10 | 1 | -10/+15 |
| | | | | See http://gcc.gnu.org/projects/cxx0x.html for details. | ||||
* | Merge pull request #114 from OdyX/dev-update-cmake-with-data | krzys-h | 2013-01-09 | 1 | -9/+12 |
|\ | | | | | Let CMake rely on data's CMakeLists.txt if it exists | ||||
| * | Let CMake rely on data's CMakeLists.txt if it exists | Didier Raboud | 2013-01-02 | 1 | -4/+7 |
| | | | | | | | | - Also update data to latest 'dev', where the CMakeLists exists | ||||
| * | Revert "Minor cmake grammar fix" | Didier Raboud | 2012-12-30 | 1 | -5/+5 |
| | | | | | | | | | | | | It appears I was really wrong. Damn. This reverts commit 277629f9fec069afce32a21fd6baeb4f24d5784c. |