summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into devPiotr Dziwinski2012-12-1512-3938/+5758
|\
| * Reverted lib/, fixed gtest path in CMakeLists.txtPiotr Dziwinski2012-12-1440-3/+30658
| | | | | | | | | | Some gtest system packages use name gtest-all.cc. lib/ directory should be left in repository.
| * Merge pull request #85 from OdyX/cmake_find_ltdlMichał Zieliński2012-12-145-3/+34
| |\ | | | | | | Add FindLTDL cmake module
| | * Add FindLTDL cmake moduleDidier Raboud2012-12-145-3/+34
| | | | | | | | | | | | | | | | | | | | | As mentionned in FindLTDL.cmake, this is code that is hereby relicensed under GPLv3. closes #68
| * | 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
| |
* | Updated info in README filesPiotr Dziwinski2012-11-263-18/+17
| |
* | Restext rewrite to runtime initialized arraysPiotr Dziwinski2012-10-1713-1840/+1739
| |
* | Doxygen/comment fixes and some #include refactoringPiotr Dziwinski2012-10-1769-306/+333
| |
* | Removed unnecessary dynamic_castsPiotr Dziwinski2012-10-173-21/+19
| |
* | Saving scripts on game save should work. Added stub for particle.Zaba9992012-10-112-1/+292
| |
* | Merge branch 'dev' of https://github.com/colobot/colobot into devZaba9992012-10-1134-786/+7014
|\ \
| * | Removed Gfx:: from license notice (introduced in 8ad15c0e)Michał Zieliński2012-10-081-2/+1
| | |
| * | Changing and saving input bindingsPiotr Dziwinski2012-10-0713-305/+268
| | |
| * | Fixed stupid coding mistake in CBotString.cppadiblol2012-10-071-1/+1
| | |
| * | Setting speed now works. Added ability to set 4x and 8x using "speed4" and ↵adiblol2012-10-062-5/+24
| |/ | | | | | | "speed8" cheat codes respectively.
| * 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
| |/
* / Added saving user scripts on game save. Fixed bug in writing script to file.Zaba9992012-10-1145-34/+16693
|/
* 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
| | | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-05 18:17:21 +0000