summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* brain.* mainmovie.* : Partially rewrittenMichał Konopacki2012-09-134-232/+235
| | | | The remaining part will be revised and rewritten after merge with dev and dev-ui branches
* Fixes in [object/auto]Michał Konopacki2012-09-135-40/+43
|
* [object/motion] Folder compilesMichał Konopacki2012-09-1313-543/+543
|
* all tasks compile.Zaba9992012-09-1211-273/+255
|
* Merge branch 'dev-object' of github.com:adiblol/colobot into dev-objectMichał Konopacki2012-09-1125-896/+690
|\
| * commented part of tasks that does not compile.Zaba9992012-09-111-7/+7
| |
| * half of task compile.Zaba9992012-09-1125-903/+697
| |
* | [src/object] motion.* motionant.* motionbee.* should compileMichał Konopacki2012-09-115-161/+165
|/
* commented new part in cmakelist and reverted stubs in camera.cpp. Will be ↵Zaba9992012-09-102-5/+67
| | | | commited later after implementation is finished in dev-object branch.
* 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
| |\ | | | | | | Slim down restext.cpp, make it gettext-ready
| | * 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
| | | | | | | | | | | | - detection of texture format - fixed depth mask bug - minor refactoring
* | CTerrain refactoring & fixesPiotr Dziwinski2012-09-0810-663/+715
| | | | | | | | | | - refactored CTerrain code - fixed some minor bugs
* | Fix in texture handling in Blender scriptPiotr Dziwinski2012-09-081-18/+36
| |
* | CModelFile fixes; test frameworkPiotr Dziwinski2012-09-0844-183/+31125
| | | | | | | | | | | | - fixes in CModelFile IO - added Google Test framework for automatic testing - rewrote modelfile_test in the new framework
* | Import/export script for BlenderPiotr Dziwinski2012-09-052-132/+524
| | | | | | | | | | - rewrote old export script - added import and texture support
* | 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
| | | | | | | | | | | | | | - added new binary and text formats for models - fixes and improvements in CModelFile - tool for converting model files - minor additions and fixes
* | Fixes in terrain renderingPiotr Dziwinski2012-08-273-14/+31
|/
* Merge branch 'dev-graphics' into devPiotr Dziwinski2012-08-1324-516/+652
|\ | | | | | | Documentation, rendering functions & fixes
| * Improved error messagesPiotr Dziwinski2012-08-137-47/+59
| | | | | | | | Added some logging and improved error messages displayed to user
| * FixPiotr Dziwinski2012-08-131-1/+1
| |
| * Test fixPiotr Dziwinski2012-08-135-16/+17
| |
| * Rendering functions, documentationPiotr Dziwinski2012-08-1312-452/+575
| | | | | | | | | | - rewrote the render functions for CEngine, CCloud and CWater - added documentation
* | Merge pull request #37 from konopackim/devPiotr Dziwiński2012-08-13110-4453/+2232
|\ \ | |/ |/| Fixes and console interpreter
| * Reduced amount of warnings in CBot libraryMichał Konopacki2012-08-1312-152/+157
| | | | | | | | | | Changed most of C-style casting to C++ casting Commented unused variables
| * Changed GivAttrName() to GetAttrName()Michał Konopacki2012-08-1125-1397/+1397
| |
| * CBot console interpreterMichał Konopacki2012-08-0989-2958/+732
| | | | | | | | Based on program found in sources
| * CBotString.cpp Bug resolveMichał Konopacki2012-08-091-1/+1
| |
* | Merge branch 'dev-graphics' into devPiotr Dziwinski2012-08-1218-586/+1745
|\ \ | | | | | | | | | CEngine object handling
| * | Object handling in CEnginePiotr Dziwinski2012-08-1218-586/+1745
| | | | | | | | | | | | | | | | | | - finished rewriting CEngine object, shadow, etc. handling - refactored texture code - added new log levels
* | | Compile fixPiotr Dziwinski2012-08-121-1/+1
| | |
* | | Merge pull request #36 from Erihel/devPiotr Dziwiński2012-08-12115-2342/+18090
|\ \ \ | |_|/ |/| | Merge of new features: plugins and INI profile, changes from dev-graphics
| * | * Final changes to plugin interfaceerihel2012-08-129-23/+153
| | | | | | | | | | | | * Added doxygen comments to plugin manager and plugin loader
| * | Merge branch 'dev-opengl' into deverihel2012-08-1267-2233/+9103
| |\|
| | * Fixes & testing in CEnginePiotr Dziwinski2012-08-1210-127/+332
| | | | | | | | | | | | | | | - fixed bugs in settings modes, etc. - some additions and minor refactoring
| | * Documentation updatePiotr Dziwinski2012-08-1147-975/+1071
| | | | | | | | | | | | | | | | | | - updated Doxyfile - added/changed file, dir and namespace descriptions - fixed some errors in doxygen tags