Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixes in [object/auto] | Michał Konopacki | 2012-09-13 | 5 | -40/+43 |
| | |||||
* | [object/motion] Folder compiles | Michał Konopacki | 2012-09-13 | 13 | -543/+543 |
| | |||||
* | all tasks compile. | Zaba999 | 2012-09-12 | 11 | -273/+255 |
| | |||||
* | Merge branch 'dev-object' of github.com:adiblol/colobot into dev-object | Michał Konopacki | 2012-09-11 | 25 | -896/+690 |
|\ | |||||
| * | commented part of tasks that does not compile. | Zaba999 | 2012-09-11 | 1 | -7/+7 |
| | | |||||
| * | half of task compile. | Zaba999 | 2012-09-11 | 25 | -903/+697 |
| | | |||||
* | | [src/object] motion.* motionant.* motionbee.* should compile | Michał Konopacki | 2012-09-11 | 5 | -161/+165 |
|/ | |||||
* | commented new part in cmakelist and reverted stubs in camera.cpp. Will be ↵ | Zaba999 | 2012-09-10 | 2 | -5/+67 |
| | | | | commited later after implementation is finished in dev-object branch. | ||||
* | Merge with changes from Zaba999 fork. | Zaba999 | 2012-09-10 | 72 | -5531/+8865 |
| | |||||
* | Commenting out src/object/auto temporarily | Piotr Dziwinski | 2012-09-09 | 1 | -26/+26 |
| | |||||
* | [src/object/auto] Folder rewritten | Michał Konopacki | 2012-09-09 | 53 | -1167/+1222 |
| | |||||
* | Merge branch 'dev' into dev-graphics | Piotr Dziwinski | 2012-09-09 | 14 | -4528/+8201 |
|\ | |||||
| * | Whitespace fix | Piotr Dziwinski | 2012-08-27 | 1 | -22/+22 |
| | | |||||
| * | Merge pull request #42 from amonakov/dev | Piotr Dziwiński | 2012-08-25 | 14 | -4528/+8201 |
| |\ | | | | | | | Slim down restext.cpp, make it gettext-ready | ||||
| | * | Add translation files | Alexander Monakov | 2012-08-25 | 3 | -0/+6291 |
| | | | |||||
| | * | Move strings out of restext. Add i18n via gettext | Alexander Monakov | 2012-08-25 | 4 | -3525/+842 |
| | | | |||||
| | * | Move ResTextType enum to a separate file | Alexander Monakov | 2012-08-25 | 2 | -109/+120 |
| | | | |||||
| | * | Move ObjectType enum to a separate file | Alexander Monakov | 2012-08-25 | 2 | -245/+263 |
| | | | |||||
| | * | Move Error enum to a separate file | Alexander Monakov | 2012-08-25 | 2 | -133/+151 |
| | | | |||||
| | * | Move EventType enum to a separate file | Alexander Monakov | 2012-08-25 | 2 | -516/+534 |
| |/ | |||||
* | | Texture format detection; minor fixes | Piotr Dziwinski | 2012-09-09 | 5 | -25/+77 |
| | | | | | | | | | | | | - detection of texture format - fixed depth mask bug - minor refactoring | ||||
* | | CTerrain refactoring & fixes | Piotr Dziwinski | 2012-09-08 | 10 | -663/+715 |
| | | | | | | | | | | - refactored CTerrain code - fixed some minor bugs | ||||
* | | Fix in texture handling in Blender script | Piotr Dziwinski | 2012-09-08 | 1 | -18/+36 |
| | | |||||
* | | CModelFile fixes; test framework | Piotr Dziwinski | 2012-09-08 | 44 | -183/+31125 |
| | | | | | | | | | | | | - fixes in CModelFile IO - added Google Test framework for automatic testing - rewrote modelfile_test in the new framework | ||||
* | | Import/export script for Blender | Piotr Dziwinski | 2012-09-05 | 2 | -132/+524 |
| | | | | | | | | | | - rewrote old export script - added import and texture support | ||||
* | | Blender script to export models | Piotr Dziwinski | 2012-09-03 | 1 | -0/+132 |
| | | |||||
* | | Fix | Piotr Dziwinski | 2012-09-03 | 1 | -2/+6 |
| | | |||||
* | | Fix | Piotr Dziwinski | 2012-09-03 | 1 | -4/+3 |
| | | |||||
* | | Fix | Piotr Dziwinski | 2012-08-31 | 2 | -12/+1 |
| | | |||||
* | | New model file format | Piotr Dziwinski | 2012-08-31 | 11 | -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 rendering | Piotr Dziwinski | 2012-08-27 | 3 | -14/+31 |
|/ | |||||
* | Merge branch 'dev-graphics' into dev | Piotr Dziwinski | 2012-08-13 | 24 | -516/+652 |
|\ | | | | | | | Documentation, rendering functions & fixes | ||||
| * | Improved error messages | Piotr Dziwinski | 2012-08-13 | 7 | -47/+59 |
| | | | | | | | | Added some logging and improved error messages displayed to user | ||||
| * | Fix | Piotr Dziwinski | 2012-08-13 | 1 | -1/+1 |
| | | |||||
| * | Test fix | Piotr Dziwinski | 2012-08-13 | 5 | -16/+17 |
| | | |||||
| * | Rendering functions, documentation | Piotr Dziwinski | 2012-08-13 | 12 | -452/+575 |
| | | | | | | | | | | - rewrote the render functions for CEngine, CCloud and CWater - added documentation | ||||
* | | Merge pull request #37 from konopackim/dev | Piotr Dziwiński | 2012-08-13 | 110 | -4453/+2232 |
|\ \ | |/ |/| | Fixes and console interpreter | ||||
| * | Reduced amount of warnings in CBot library | Michał Konopacki | 2012-08-13 | 12 | -152/+157 |
| | | | | | | | | | | Changed most of C-style casting to C++ casting Commented unused variables | ||||
| * | Changed GivAttrName() to GetAttrName() | Michał Konopacki | 2012-08-11 | 25 | -1397/+1397 |
| | | |||||
| * | CBot console interpreter | Michał Konopacki | 2012-08-09 | 89 | -2958/+732 |
| | | | | | | | | Based on program found in sources | ||||
| * | CBotString.cpp Bug resolve | Michał Konopacki | 2012-08-09 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dev-graphics' into dev | Piotr Dziwinski | 2012-08-12 | 18 | -586/+1745 |
|\ \ | | | | | | | | | | CEngine object handling | ||||
| * | | Object handling in CEngine | Piotr Dziwinski | 2012-08-12 | 18 | -586/+1745 |
| | | | | | | | | | | | | | | | | | | - finished rewriting CEngine object, shadow, etc. handling - refactored texture code - added new log levels | ||||
* | | | Compile fix | Piotr Dziwinski | 2012-08-12 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #36 from Erihel/dev | Piotr Dziwiński | 2012-08-12 | 115 | -2342/+18090 |
|\ \ \ | |_|/ |/| | | Merge of new features: plugins and INI profile, changes from dev-graphics | ||||
| * | | * Final changes to plugin interface | erihel | 2012-08-12 | 9 | -23/+153 |
| | | | | | | | | | | | | * Added doxygen comments to plugin manager and plugin loader | ||||
| * | | Merge branch 'dev-opengl' into dev | erihel | 2012-08-12 | 67 | -2233/+9103 |
| |\| | |||||
| | * | Fixes & testing in CEngine | Piotr Dziwinski | 2012-08-12 | 10 | -127/+332 |
| | | | | | | | | | | | | | | | - fixed bugs in settings modes, etc. - some additions and minor refactoring | ||||
| | * | Documentation update | Piotr Dziwinski | 2012-08-11 | 47 | -975/+1071 |
| | | | | | | | | | | | | | | | | | | - updated Doxyfile - added/changed file, dir and namespace descriptions - fixed some errors in doxygen tags | ||||
| | * | Render mode setting, refactoring | Piotr Dziwinski | 2012-08-11 | 11 | -430/+291 |
| | | | | | | | | | | | | | | | | | | - finished SetState in CEngine - refactored Size and IntSize back to Point and IntPoint - other minor changes in CEngine |