summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* CInstanceManager refactoringPiotr Dziwiński2013-02-17230-1536/+1569
* Merge pull request #127 from OdyX/dev-always-make-testkrzys-h2013-02-152-2/+3
|\
| * Revert "Temporairly disabled "test" in travis"Didier Raboud2013-02-141-1/+1
| * Comment the test that fails, with a TODO.Didier Raboud2013-02-141-1/+2
|/
* Another small fix.krzys-h2013-02-141-1/+1
* Small fixkrzys-h2013-02-141-1/+1
* More fixes to produce()krzys-h2013-02-141-56/+89
* Small fix in produce()krzys-h2013-02-141-0/+1
* Temporairly disabled "test" in traviskrzys-h2013-02-141-1/+1
* produce() extendedkrzys-h2013-02-141-21/+144
* Merge pull request #125 from PaweX/devkrzys-h2013-02-135-8/+28
|\
| * Added cAim(CBotVar* &var, void* user)PaweX2013-02-131-0/+1
| * Update src/script/script.cppPaweX2013-02-131-1/+1
| * Function aim(x, y) - "Giv" to "Get"PaweX2013-02-131-4/+4
| * aim(x,y) - "Giv" to "Get"PaweX2013-02-131-3/+3
| * Additional parameter for function aim(x, y).PaweX2013-02-131-1/+1
| * Additional parameter for function aim(x, y)PaweX2013-02-131-2/+2
| * Additional parameter for function aim(x, y).PaweX2013-02-131-1/+1
| * Additional parameter for function aim(x, y).PaweX2013-02-131-4/+23
* | Added Destroyer from Ceebot-Teen.krzys-h2013-02-137-15/+94
|/
* More camera distance from AlienQueenadiblol2013-02-111-0/+1
* * Fixed crash when inputing cheatserihel2013-02-111-6/+6
* * Syntax highlighting in cbot editor (needs to be tested)erihel2013-02-094-43/+57
* * Fixes to ingame editorerihel2013-02-095-28/+29
* Refactoring in tests infrastructurePiotr Dziwinski2013-02-03126-4827/+760
* Updated and improved Blender scriptPiotr Dziwinski2013-01-271-218/+382
* Changed model min/max to LOD levelsPiotr Dziwinski2013-01-2716-376/+283
* Updated blender scriptPiotr Dziwinski2013-01-261-9/+41
* Merge pull request #124 from OdyX/dev-OdyX-201301Piotr Dziwiński2013-01-204-7/+7
|\
| * In travis, add libsndfile-dev as build-dependencyDidier Raboud2013-01-201-1/+1
| * In manpage, correct first header to be 'NAME' not 'COLOBOT'Didier Raboud2013-01-203-6/+6
|/
* Fixed some clang warningsPiotr Dziwinski2013-01-172-4/+4
* Fixed edit_test linking issuePiotr Dziwinski2013-01-171-1/+1
* * Fixed sound pitch causing segfaulterihel2013-01-168-29/+66
* * Cleaning player list before getting new one (entering user menu several tim...erihel2013-01-151-0/+1
* * Removed aluterihel2013-01-1413-74/+216
* Merge pull request #117 from OdyX/dev-C++11-fixesPiotr Dziwiński2013-01-102-11/+18
|\
| * In travis, add boost backport from Mapnik to succeed clang buildDidier Raboud2013-01-101-0/+1
| * Also test intallationDidier Raboud2013-01-101-1/+1
| * In travis, do out-of-tree buildDidier Raboud2013-01-101-1/+1
| * Enable clang build in travisDidier Raboud2013-01-101-0/+1
| * Use correct C++11/C++0x flags depending on the used compilerDidier Raboud2013-01-101-10/+15
|/
* Added GLEW to travis configPiotr Dziwinski2013-01-091-1/+1
* Merge branch 'dev' of github:colobot/colobot into deverihel2013-01-097-27/+94
|\
| * Disabled travis e-mail notificationsPiotr Dziwinski2013-01-091-0/+2
| * Merge pull request #114 from OdyX/dev-update-cmake-with-datakrzys-h2013-01-092-9/+12
| |\
| | * Let CMake rely on data's CMakeLists.txt if it existsDidier Raboud2013-01-022-4/+7
| | * Revert "Minor cmake grammar fix"Didier Raboud2012-12-301-5/+5
| * | Merge pull request #112 from OdyX/dev-levels-fallbackkrzys-h2013-01-091-10/+41
| |\ \
| | * | In levels' lists, fallback to englishDidier Raboud2013-01-021-10/+41
| | |/