summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * Render mode setting, refactoringPiotr Dziwinski2012-08-1111-430/+291
| | | | | | | | | | | | | | | | | | - finished SetState in CEngine - refactored Size and IntSize back to Point and IntPoint - other minor changes in CEngine
| | * Partial CEngine implementationPiotr Dziwinski2012-08-106-425/+2326
| | | | | | | | | | | | | | | - added rewritten implementation for basic modesetting in CEngine - started rewriting proper rendering and object handling in CEngine
| | * Graphics stubsPiotr Dziwinski2012-08-0916-275/+989
| | | | | | | | | | | | | | | | | | | | | - added stubs for functions in CLightning, CParticle and CPyro - cleaned object.h and physics.h headers - created temporary stubs to compile CCamera - other necessary changes to compile successfully
| | * CPlanet implementationPiotr Dziwinski2012-08-092-27/+209
| | | | | | | | | | | | Added rewritten CPlanet implementation
| | * CWater and CCloud basic implementationPiotr Dziwinski2012-08-084-75/+1043
| | | | | | | | | | | | | | | Added rewritten implementation for CWater and CCloud Won't link yet because of missing functions
| | * CTerrain implementationPiotr Dziwinski2012-08-087-104/+1988
| | | | | | | | | | | | | | | | | | Added rewritten CTerrain implementation Compiles OK, but functions are missing from other classes Also needs testing
| | * Font renderingPiotr Dziwinski2012-08-067-149/+501
| | | | | | | | | | | | - implemented rest of CText interface excluding some minor features
| | * Basic font renderingPiotr Dziwinski2012-08-0316-189/+896
| | | | | | | | | | | | | | | - added basic font rendering - minor refactoring & fixes
| * | * New CPluginManager class for managing plugins based on colobot.inierihel2012-08-1227-37/+358
| | | | | | | | | | | | | | | * Moved sound plugin into sound dir * Minor changes in logger and profile
| * | * changed 0, NULL to nullptrerihel2012-08-0930-78/+7051
| | | | | | | | | | | | | | | | | | | | | * changed profile.cpp to use SimpleIni to load config files * added new CProfile singleton class for loading config * added SimpleIni to lib/ dir * added config loading tests
| * | Changes after mergeerihel2012-08-095-16/+16
| | |
| * | Merge branch 'dev' of https://github.com/adiblol/colobot into deverihel2012-08-09236-23184/+32370
| |\ \ | |/ / |/| | | | | | | | Conflicts: src/sound/sound.h
* | | Whitespace fixPiotr Dziwinski2012-08-0814-6607/+6607
| | |
* | | Merge pull request #35 from konopackim/devPiotr Dziwiński2012-08-08127-17251/+17469
|\ \ \ | |_|/ |/| | Comment translation and cleanups
| * | CleanupsMichał Konopacki2012-08-08109-55/+197
| | |
| * | Transation of comments completeMichał Konopacki2012-08-0810-5538/+5551
| | |
| * | Further CBot translationsMichał Konopacki2012-08-073-6576/+6578
| | |
| * | CBot library comments further translationsMichał Konopacki2012-08-073-2776/+2827
| | |
| * | Commentary translationMichał Konopacki2012-08-033-2633/+2637
| | |
| * | Comments translationMichał Konopacki2012-08-022-91/+97
|/ /
* | Switched to new style castsPiotr Dziwinski2012-07-3014-86/+90
| | | | | | | | | | | | - rewrote old C-style casts to new ..._cast<> - corrected some dangerous casts - added -Wold-style-cast to compile flags
* | Lines and line strip primitivesPiotr Dziwinski2012-07-302-21/+21
| | | | | | | | Will probably be useful
* | CCamera rewritePiotr Dziwinski2012-07-293-118/+1875
| | | | | | | | | | Rewritten old code; doesn't compile yet because changes in other modules are needed.
* | Video mode changingPiotr Dziwinski2012-07-2911-222/+580
| | | | | | | | | | | | - added video mode querying & changing - added joystick querying & changing - cleaned up CApplication interface
* | GLEWPiotr Dziwinski2012-07-286-15/+144
| | | | | | | | Added GLEW for loading OpenGL extensions
* | Updated readme files; added licensePiotr Dziwinski2012-07-274-57/+792
| | | | | | | | | | - updated info in README and HOWTO files - added file with full license
* | Updated Doxygen main pagePiotr Dziwinski2012-07-271-8/+14
| |
* | Whitespace fixPiotr Dziwinski2012-07-275-399/+399
| |
* | Merge branch 'dev' into dev-openglPiotr Dziwinski2012-07-2726-8263/+7914
|\ \ | | | | | | | | | Pulled changes & resolved conflicts
| * | Compile fixesPiotr Dziwinski2012-07-264-3/+5
| | | | | | | | | | | | Fixed some compiling issues
| * | Merge pull request #33 from Zaba999/devPiotr Dziwiński2012-07-2525-8262/+7911
| |\ \ | | | | | | | | Changes in CBot