summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge with changes from Zaba999 fork.Zaba9992012-09-1072-5531/+8865
* Commenting out src/object/auto temporarilyPiotr Dziwinski2012-09-091-26/+26
* [src/object/auto] Folder rewrittenMichał Konopacki2012-09-0953-1167/+1222
* Merge branch 'dev' into dev-graphicsPiotr Dziwinski2012-09-0914-4528/+8201
|\
| * Whitespace fixPiotr Dziwinski2012-08-271-22/+22
| * Merge pull request #42 from amonakov/devPiotr Dziwiński2012-08-2514-4528/+8201
| |\
| | * Add translation filesAlexander Monakov2012-08-253-0/+6291
| | * Move strings out of restext. Add i18n via gettextAlexander Monakov2012-08-254-3525/+842
| | * Move ResTextType enum to a separate fileAlexander Monakov2012-08-252-109/+120
| | * Move ObjectType enum to a separate fileAlexander Monakov2012-08-252-245/+263
| | * Move Error enum to a separate fileAlexander Monakov2012-08-252-133/+151
| | * Move EventType enum to a separate fileAlexander Monakov2012-08-252-516/+534
| |/
* | Texture format detection; minor fixesPiotr Dziwinski2012-09-095-25/+77
* | CTerrain refactoring & fixesPiotr Dziwinski2012-09-0810-663/+715
* | Fix in texture handling in Blender scriptPiotr Dziwinski2012-09-081-18/+36
* | CModelFile fixes; test frameworkPiotr Dziwinski2012-09-0844-183/+31125
* | Import/export script for BlenderPiotr Dziwinski2012-09-052-132/+524
* | Blender script to export modelsPiotr Dziwinski2012-09-031-0/+132
* | FixPiotr Dziwinski2012-09-031-2/+6
* | FixPiotr Dziwinski2012-09-031-4/+3
* | FixPiotr Dziwinski2012-08-312-12/+1
* | New model file formatPiotr Dziwinski2012-08-3111-350/+1179
* | Fixes in terrain renderingPiotr Dziwinski2012-08-273-14/+31
|/
* Merge branch 'dev-graphics' into devPiotr Dziwinski2012-08-1324-516/+652
|\
| * Improved error messagesPiotr Dziwinski2012-08-137-47/+59
| * FixPiotr Dziwinski2012-08-131-1/+1
| * Test fixPiotr Dziwinski2012-08-135-16/+17
| * Rendering functions, documentationPiotr Dziwinski2012-08-1312-452/+575
* | Merge pull request #37 from konopackim/devPiotr Dziwiński2012-08-13110-4453/+2232
|\ \ | |/ |/|
| * Reduced amount of warnings in CBot libraryMichał Konopacki2012-08-1312-152/+157
| * Changed GivAttrName() to GetAttrName()Michał Konopacki2012-08-1125-1397/+1397
| * CBot console interpreterMichał Konopacki2012-08-0989-2958/+732
| * CBotString.cpp Bug resolveMichał Konopacki2012-08-091-1/+1
* | Merge branch 'dev-graphics' into devPiotr Dziwinski2012-08-1218-586/+1745
|\ \
| * | Object handling in CEnginePiotr Dziwinski2012-08-1218-586/+1745
* | | Compile fixPiotr Dziwinski2012-08-121-1/+1
* | | Merge pull request #36 from Erihel/devPiotr Dziwiński2012-08-12115-2342/+18090
|\ \ \ | |_|/ |/| |
| * | * Final changes to plugin interfaceerihel2012-08-129-23/+153
| * | Merge branch 'dev-opengl' into deverihel2012-08-1267-2233/+9103
| |\|
| | * Fixes & testing in CEnginePiotr Dziwinski2012-08-1210-127/+332
| | * Documentation updatePiotr Dziwinski2012-08-1147-975/+1071
| | * Render mode setting, refactoringPiotr Dziwinski2012-08-1111-430/+291
| | * Partial CEngine implementationPiotr Dziwinski2012-08-106-425/+2326
| | * Graphics stubsPiotr Dziwinski2012-08-0916-275/+989
| | * CPlanet implementationPiotr Dziwinski2012-08-092-27/+209
| | * CWater and CCloud basic implementationPiotr Dziwinski2012-08-084-75/+1043
| | * CTerrain implementationPiotr Dziwinski2012-08-087-104/+1988
| | * Font renderingPiotr Dziwinski2012-08-067-149/+501
| | * Basic font renderingPiotr Dziwinski2012-08-0316-189/+896
| * | * New CPluginManager class for managing plugins based on colobot.inierihel2012-08-1227-37/+358