summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Allow building and installation of documentationDidier Raboud2012-12-172-2/+15
* Merge pull request #95 from OdyX/dev-move-cbot-to-private-libErihel2012-12-173-4/+7
|\
| * Install libCBot to a private directoryDidier Raboud2012-12-173-4/+7
|/
* Merge pull request #91 from OdyX/dev-use-installed-i18nErihel2012-12-162-3/+2
|\
| * Merge branch 'dev' into dev-use-installed-i18nDidier Raboud2012-12-163-3/+6
| |\ | |/ |/|
* | Merge pull request #92 from OdyX/dev-default-datadirErihel2012-12-163-4/+8
|\ \
| * | Set a default datadir, in sync with the data installation path.Didier Raboud2012-12-163-4/+8
|/ /
| * Use default installation paths for i18n.Didier Raboud2012-12-162-4/+4
|/
* Merge pull request #89 from OdyX/dev-fix-gmockErihel2012-12-160-0/+0
|\
| * Fix Google Mock system library buildingDidier Raboud2012-12-161-1/+5
* | GMock: fixed using system packagePiotr Dziwinski2012-12-161-1/+5
|/
* Split gtest and gmock, fixed using system packagesPiotr Dziwinski2012-12-1637-440/+465
* Merge branch 'master' into devPiotr Dziwinski2012-12-1512-3938/+5758
|\
| * Reverted lib/, fixed gtest path in CMakeLists.txtPiotr Dziwinski2012-12-1440-3/+30658
| * Merge pull request #85 from OdyX/cmake_find_ltdlMichał Zieliński2012-12-145-3/+34
| |\
| | * Add FindLTDL cmake moduleDidier Raboud2012-12-145-3/+34
| * | Merge pull request #83 from OdyX/fix_i18n_from_envMichał Zieliński2012-12-142-3/+10
| |\ \
| | * | Inherit translation setting from environment.Didier Raboud2012-12-142-3/+10
| | |/
| * | Merge pull request #86 from OdyX/cmake_find_gtestMichał Zieliński2012-12-1440-30657/+6
| |\ \ | | |/ | |/|
| | * Use system-provided Google test library.Didier Raboud2012-12-1440-30657/+6
| |/
| * Merge pull request #82 from OdyX/i81_fix_translationsMichał Zieliński2012-12-136-3930/+5708
| |\
| | * Update translations with newer colobot.pot.Didier Raboud2012-12-133-738/+753
| | * Handle translations with CMakes.Didier Raboud2012-12-133-0/+1762
| | * Sort translation files.Didier Raboud2012-12-133-3936/+3937
| |/
| * 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 "s...adiblol2012-10-062-5/+24
| |/
| * 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
|/