summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed version codename (-alpha)Piotr Dziwinski2013-11-031-2/+2
|
* Colobot Gold 0.1.1-alphaPiotr Dziwinski2013-11-0359-279/+370
|\
| * Version bump (0.1.1)Piotr Dziwinski2013-11-031-1/+1
| |
| * Updated data submodulePiotr Dziwinski2013-11-031-0/+0
| |
| * Merge pull request #241 from OdyX/dev-fix-licensing-problemsPiotr Dziwiński2013-11-031-11/+0
| |\ | | | | | | colobot-data: Files under unclear license
| | * Drop now-useless display of licenses.txt in PHASE_GENERICDidier Raboud2013-10-301-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-fixesPiotr Dziwiński2013-10-296-75/+110
| |\ | | | | | | Platform fixes (Windows Icon and Mac OSX SDL_Main fix)
| | * On MacOSX, use SDL_MainDidier 'OdyX' Raboud2013-10-291-0/+2
| | |
| | * Revert "Include SDL.h in main.cpp to make sure the main loop is SDL's main loop"Didier 'OdyX' Raboud2013-10-291-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 MXEDidier 'OdyX' Raboud2013-10-295-74/+108
| | |
| * | Revert back "Merge pull request #243 from OdyX/dev-fix-textures-loading"Piotr Dziwinski2013-10-292-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 Dziwinski2013-10-282-7/+3
| | | | | | | | Looks like it doesn't work on all platforms
| * Merge pull request #243 from OdyX/dev-fix-textures-loadingPiotr Dziwiński2013-10-282-3/+7
| |\ | | | | | | Fix the detection of alpha-channel in textures as created by IMG_Load
| | * Let mouse.png's format be detectedDidier Raboud2013-10-281-1/+1
| | | | | | | | | | | | Fixes the mouse cursor on Mac OS X
| | * Fix the detection of alpha-channel in textures as created by IMG_LoadDidier 'OdyX' Raboud2013-10-281-2/+6
| |/ | | | | | | This fixes the textures loading under Mac OS X
| * Merge pull request #242 from OdyX/dev-macosxPiotr Dziwiński2013-10-262-1/+3
| |\ | | | | | | Mac OSX (Darwin) build support
| | * Add libintl library to the unit tests on Mac OSXDidier 'OdyX' Raboud2013-10-261-1/+2
| | |
| | * Include SDL.h in main.cpp to make sure the main loop is SDL's main loopDidier 'OdyX' Raboud2013-10-261-0/+1
| |/ | | | | | | This allows the MacOSX program to start.
| * Fix for CMakeLists errorPiotr Dziwinski2013-10-241-1/+1
| |
| * Added option to force to use bundled gmock/gtestPiotr Dziwinski2013-10-242-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 constDidier 'OdyX' Raboud2013-10-242-2/+3
| |
| * Include the OpenAL headers using the "al.h" form, as recommended by its ↵Didier 'OdyX' Raboud2013-10-245-7/+8
| | | | | | | | CMake finder script
| * MacOSX: Add initial support in CMake build infraDidier 'OdyX' Raboud2013-10-245-25/+45
| |
| * Updated data submodulePiotr Dziwinski2013-10-241-0/+0
| |
| * Fixed CTerrain-related memory leaksPiotr Dziwinski2013-10-134-3/+47
| |
| * Fixed memory leaks in CTextPiotr Dziwinski2013-10-121-5/+18
| |
| * Fixed some CBot-related memory leaksPiotr Dziwinski2013-10-125-37/+37
| | | | | | | | | | | | * fixed leaks in CScript::CheckToken() * fixed leaks in CInterface * commented out unused function in robotmain.cpp
| * Updated data submodulePiotr Dziwinski2013-10-121-0/+0
| |
| * Fix for #232 - Images in SatComkrzys-h2013-09-282-6/+6
| | | | | | | | Only images, icons still don't work
| * Fixed @Emxx52 's fail :Pkrzys-h2013-09-081-1/+3
| |\ | | | | | | | | | | | | | | | Merge branch 'master' into dev Conflicts: src/app/app.cpp
| * | Datadir in command line didn't work with config.erihel2013-07-162-3/+8
| | | | | | | | | | | | Values from config file overwrote datadir
| * | Fixed test binaries locationPiotr Dziwinski2013-06-292-2/+2
| | |
| * | Typo fixPiotr Dziwinski2013-06-271-1/+1
| | |
| * | Fix for #228Piotr Dziwinski2013-06-261-9/+15
| | | | | | | | | | | | * "empty" objects were wrongly handled in CPyro
| * | Forgotten compile flagPiotr Dziwinski2013-06-261-0/+3
| | |
| * | Some Ui refactoringerihel2013-06-2430-83/+51
| | |
| * | Post-alpha phasePiotr Dziwinski2013-06-241-2/+2
| | |
* | | Do not change master branch unless you REALLY know what U R doing!adiblol2013-09-231-3/+1
| |/ |/| | | | | | | | | Revert "Added '-game' launch option" This reverts commit 2891c2ea4ce2e7c844d1e93db71dcfa8ad2ca100.
* | Added '-game' launch optionEmxx522013-09-081-1/+3
| |
* | Colobot Gold 0.1.0-alphaPiotr Dziwinski2013-06-24296-3517/+12532
|\|
| * Colobot Gold 0.1.0-alphaPiotr Dziwinski2013-06-242-36/+27
| |
| * Fix for tests compilationPiotr Dziwinski2013-06-241-0/+2
| |
| * Fix for travis CI buildPiotr Dziwinski2013-06-241-1/+1
| |
| * Some further changes in CMakeListsPiotr Dziwinski2013-06-248-52/+55
| | | | | | | | | | | | * removed DEV_BUILD autodetection (could be confusing) * ignore desktop subdirectory on Windows * some refactoring
| * Fixed auto-detecting locale on WindowsPiotr Dziwinski2013-06-249-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 buildPiotr Dziwinski2013-06-221-1/+1
| |
| * Updated INSTALL filesPiotr Dziwinski2013-06-223-23/+22
| |
| * gitignore updatePiotr Dziwinski2013-06-227-11/+24
| | | | | | | | | | * git should now ignore all generated files when building without separate build directory
| * Futher changes to CMake optionsPiotr Dziwinski2013-06-221-7/+7
| | | | | | | | | | * OpenAL sound is now enabled by default * Boost is linked dynamically by default
| * Fix man build target dependenciesPiotr Dziwinski2013-06-221-0/+1
| | | | | | | | * could cause fails when make is run with many threads