Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into dev-graphics | Piotr Dziwinski | 2012-09-09 | 14 | -4528/+8201 |
|\ | |||||
| * | Whitespace fix | Piotr Dziwinski | 2012-08-27 | 1 | -22/+22 |
| | | |||||
| * | 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 | ||||
* | | CModelFile fixes; test framework | Piotr Dziwinski | 2012-09-08 | 4 | -182/+463 |
| | | | | | | | | | | | | - fixes in CModelFile IO - added Google Test framework for automatic testing - rewrote modelfile_test in the new framework | ||||
* | | 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 | ||||
* | | | * 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 | 65 | -1400/+8265 |
|\| | | |||||
| * | | 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 | 46 | -142/+234 |
| | | | | | | | | | | | | | | | | | | - 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 | ||||
| * | | Partial CEngine implementation | Piotr Dziwinski | 2012-08-10 | 6 | -425/+2326 |
| | | | | | | | | | | | | | | | - added rewritten implementation for basic modesetting in CEngine - started rewriting proper rendering and object handling in CEngine | ||||
| * | | Graphics stubs | Piotr Dziwinski | 2012-08-09 | 16 | -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 implementation | Piotr Dziwinski | 2012-08-09 | 2 | -27/+209 |
| | | | | | | | | | | | | Added rewritten CPlanet implementation | ||||
| * | | CWater and CCloud basic implementation | Piotr Dziwinski | 2012-08-08 | 4 | -75/+1043 |
| | | | | | | | | | | | | | | | Added rewritten implementation for CWater and CCloud Won't link yet because of missing functions | ||||
| * | | CTerrain implementation | Piotr Dziwinski | 2012-08-08 | 7 | -104/+1988 |
| | | | | | | | | | | | | | | | | | | Added rewritten CTerrain implementation Compiles OK, but functions are missing from other classes Also needs testing | ||||
| * | | Font rendering | Piotr Dziwinski | 2012-08-06 | 7 | -149/+501 |
| | | | | | | | | | | | | - implemented rest of CText interface excluding some minor features | ||||
| * | | Basic font rendering | Piotr Dziwinski | 2012-08-03 | 15 | -189/+895 |
| | | | | | | | | | | | | | | | - added basic font rendering - minor refactoring & fixes | ||||
* | | | * New CPluginManager class for managing plugins based on colobot.ini | erihel | 2012-08-12 | 27 | -37/+358 |
| | | | | | | | | | | | | | | | * Moved sound plugin into sound dir * Minor changes in logger and profile | ||||
* | | | * changed 0, NULL to nullptr | erihel | 2012-08-09 | 9 | -77/+118 |
| | | | | | | | | | | | | | | | | | | | | | * 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 merge | erihel | 2012-08-09 | 5 | -16/+16 |
| | | | |||||
* | | | Merge branch 'dev' of https://github.com/adiblol/colobot into dev | erihel | 2012-08-09 | 229 | -23120/+31492 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: src/sound/sound.h | ||||
| * | | Whitespace fix | Piotr Dziwinski | 2012-08-08 | 14 | -6607/+6607 |
| | | | |||||
| * | | Cleanups | Michał Konopacki | 2012-08-08 | 109 | -55/+197 |
| | | | |||||
| * | | Transation of comments complete | Michał Konopacki | 2012-08-08 | 10 | -5538/+5551 |
| | | | |||||
| * | | Further CBot translations | Michał Konopacki | 2012-08-07 | 3 | -6576/+6578 |
| | | | |||||
| * | | CBot library comments further translations | Michał Konopacki | 2012-08-07 | 3 | -2776/+2827 |
| | | | |||||
| * | | Commentary translation | Michał Konopacki | 2012-08-03 | 3 | -2633/+2637 |
| | | |