summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | 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
* | | Fix for #113Piotr Dziwinski2013-01-041-2/+2
* | | Fixed stupid debug codePiotr Dziwinski2013-01-031-1/+1
* | | Fixed spider and worm model loadingPiotr Dziwinski2012-12-284-6/+48
* | | Fixes and refactoringPiotr Dziwinski2012-12-273-239/+122
* | | Engine optimization - rewritten model managementPiotr Dziwinski2012-12-2630-2393/+2116
* | | Revert "Merge pull request #88 from OdyX/dev-graphics-system-gtools"Piotr Dziwinski2012-12-162-18/+3
* | | Merge pull request #88 from OdyX/dev-graphics-system-gtoolsPiotr Dziwiński2012-12-162-3/+18
|\ \ \
| * | | Use system GMock and GTest if they are availableDidier Raboud2012-12-162-4/+15
| * | | Emit info message for GTest source.Didier Raboud2012-12-161-2/+6
|/ / /
* | | Static objects using OpenGL VBOs and display listsPiotr Dziwinski2012-12-1411-99/+491
* | | Fixed syntax error in Blender scriptPiotr Dziwinski2012-11-011-9/+2
* | | Performance countersPiotr Dziwinski2012-10-253-14/+247
* | | Main loop enhancementPiotr Dziwinski2012-10-252-15/+16
* | | ComputeSphereVisibility and fixes in CEngine TODOsPiotr Dziwinski2012-10-207-87/+122
* | | Transparent plant texturesPiotr Dziwinski2012-10-201-3/+4
* | | Ground spot texture drawingPiotr Dziwinski2012-10-203-11/+269
* | | Flare textures should work nowPiotr Dziwinski2012-10-191-2/+1
* | | Fix track mapping and sphere particle positionPiotr Dziwinski2012-10-192-7/+6
* | | Track texture mappingPiotr Dziwinski2012-10-191-9/+92
|/ /
* | 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