summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #83 from OdyX/fix_i18n_from_envMichał Zieliński2012-12-142-3/+10
|\ | | | | Inherit translation setting from environment.
| * Inherit translation setting from environment.Didier Raboud2012-12-142-3/+10
| | | | | | | | | | | | | | | | This ensures that users with a correctly-defined locale don't need to explicitely set the locale. - By dropping the setlocale content, it fixes the loading of translations. - Add a Debug log message to check what is put in the environment.
* | Merge pull request #86 from OdyX/cmake_find_gtestMichał Zieliński2012-12-1440-30657/+6
|\ \ | |/ |/| Use system-provided Google test library.
| * Use system-provided Google test library.Didier Raboud2012-12-1440-30657/+6
|/ | | | | | | | | This avoids library duplication, in favour of a shared (source) library: libgtest-dev is available at least on Debian, Ubuntu, Gentoo, Fedora, at the time of committing. If the library is not found in system paths, a copy of it in lib/gtest can work too.
* Merge pull request #82 from OdyX/i81_fix_translationsMichał Zieliński2012-12-136-3930/+5708
|\ | | | | Sorted translations alphabetically and created CMake rules for generating pot files.
| * Update translations with newer colobot.pot.Didier Raboud2012-12-133-738/+753
| |
| * Handle translations with CMakes.Didier Raboud2012-12-133-0/+1762
| | | | | | | | closes #81
| * Sort translation files.Didier Raboud2012-12-133-3936/+3937
|/ | | | This will ease future updates.
* Updated info in README filesPiotr Dziwinski2012-11-263-18/+17
|
* Fixed stupid coding mistake in CBotString.cppadiblol2012-10-071-1/+1
|
* Merge branch 'dev' of github.com:colobot/colobot into devPiotr Dziwinski2012-10-051-3/+3
|\
| * Commented out profile_testMichał Zieliński2012-10-051-3/+3
| |
* | Merge branch 'dev-graphics' into devPiotr Dziwinski2012-10-0514-455/+6686
|\ \ | |/ |/|
| * Merge remote-tracking branch 'origin/dev' into dev-graphicsadiblol2012-10-051-9/+9
| |\
| * | CParticle rewritePiotr Dziwinski2012-10-055-287/+3944
| | |
| * | Some CPyro docsPiotr Dziwinski2012-10-051-3/+31
| | |
| * | CLightning rewritePiotr Dziwinski2012-10-053-50/+387
| | |
| * | CPyro rewritePiotr Dziwinski2012-10-032-109/+2319
| | |
| * | Spot light angle fixPiotr Dziwinski2012-10-035-8/+7
| | |
* | | Disabled window resizePiotr Dziwinski2012-10-051-1/+1
| | |
* | | Added "make install" target.Michał Zieliński2012-10-053-0/+6
| | |
* | | Modified .gitignore file to make git status output clearerMichał Zieliński2012-10-051-5/+15
| |/ |/|
* | Refactoring: changed UNIT to g_unit in CRobotMain classadiblol2012-10-051-9/+9
|/
* Merge branch 'dev' into dev-graphicsPiotr Dziwinski2012-10-025-297/+166
|\
| * Further work on saving profile and directory listing.Zaba9992012-10-025-297/+166
| |
* | Merge remote-tracking branch 'origin/dev' into dev-graphicsadiblol2012-09-301-0/+1
|\|
| * Fixed not working message(...) CBot functionadiblol2012-09-301-0/+1
| |
* | Merge remote-tracking branch 'origin/dev' into dev-graphicsadiblol2012-09-301-2/+2
|\|
| * Fixed segfault when using empty strings with CBotString::operator+adiblol2012-09-301-2/+2
| |
* | Fixed bugs in texture coloringPiotr Dziwinski2012-09-303-23/+24
| |
* | Font coloring; fix for resize hackPiotr Dziwinski2012-09-308-67/+82
| | | | | | | | | | | | - added font coloring and changed default color to black - fixed resize hack incorrectly changing video config, but font resizing will not work for now
* | Merge remote-tracking branch 'origin/dev' into dev-graphicsadiblol2012-09-301-543/+536
|\|
| * Merge branch 'dev' of github.com:colobot/colobot into devadiblol2012-09-301-543/+536
| |\
| | * Merge branch 'dev' of https://github.com/colobot/colobot into devZaba9992012-09-2949-514/+845
| | |\
| | * | #48 Adding new users works.Zaba9992012-09-291-543/+536
| | | |
* | | | Dirty hack to allow window resizing or even full screen.adiblol2012-09-305-1/+21
|/ / / | | | | | | | | | | | | Currently makes text buggy! (full screen must be initiated by window manager, for example Alt+F11 in Fluxbox)
* | | Fixed invradar cheat code.adiblol2012-09-304-16/+40
| | | | | | | | | | | | | | | Replaced CRobotMain::GetCheatRadar with CRobotMain::GetRadar. Changed logger level of "invalid m_motion" messages.
* | | Map texture paintingPiotr Dziwinski2012-09-305-39/+66
| | |
* | | Texture coloringPiotr Dziwinski2012-09-293-23/+169
| | |
* | | Merge branch 'dev-graphics' of github.com:colobot/colobot into dev-graphicsadiblol2012-09-296-59/+11
|\ \ \ | |_|/ |/| |
| * | Fix for transparent objects and fadeoutsPiotr Dziwinski2012-09-296-59/+11
| | |
* | | Fixed CEdit delete[] issuesPiotr Dziwinski2012-09-291-6/+6
| | |
* | | CBotVar SetVal() fixPiotr Dziwinski2012-09-291-1/+1
| | |
* | | Enabled CBot (experimental)Piotr Dziwinski2012-09-291-14/+17
|/ /
* | Fixed texture regressionPiotr Dziwinski2012-09-296-80/+21
| | | | | | | | | | There was a bug in texture modesetting but only visible after certain mode changes.
* | Fixed object selection by clickingPiotr Dziwinski2012-09-291-2/+2
| |
* | Fixed CEdit cursorPiotr Dziwinski2012-09-291-8/+8
| |
* | MXE support and CMake files refactoringPiotr Dziwinski2012-09-297-61/+228
| | | | | | | | | | | | - added support for cross-compiling with MXE (http://mxe.cc/) - refactored CMake files, adding some options and moving definitions to more suitable places
* | Merge branch 'dev' into dev-graphicsPiotr Dziwinski2012-09-2943-7162/+352
|\|
| * Small fix in profile + profile_test rewritten to gtest.Zaba9992012-09-285-39/+49
| |