summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Further improvements in UI portingMichał Konopacki2012-08-1822-803/+891
* First approach to port 2D UI InterfaceMichał Konopacki2012-08-1519-1825/+1856
* Merge remote-tracking branch 'upstream/dev-ui' into dev-uiMichał Konopacki2012-08-137-47/+59
|\
| * Merge branch 'dev-graphics' into devPiotr Dziwinski2012-08-1324-516/+652
| |\
| | * Improved error messagesPiotr Dziwinski2012-08-137-47/+59
* | | Merge remote-tracking branch 'upstream/dev-graphics' into dev-uiMichał Konopacki2012-08-1318-469/+593
|\ \ \ | |/ / |/| / | |/
| * 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
| * | * changed 0, NULL to nullptrerihel2012-08-0930-78/+7051
| * | Changes after mergeerihel2012-08-095-16/+16
| * | Merge branch 'dev' of https://github.com/adiblol/colobot into deverihel2012-08-09236-23184/+32370
| |\ \ | |/ / |/| |
* | | Whitespace fixPiotr Dziwinski2012-08-0814-6607/+6607
* | | Merge pull request #35 from konopackim/devPiotr Dziwiński2012-08-08127-17251/+17469
|\ \ \ | |_|/ |/| |
| * | 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
* | Lines and line strip primitivesPiotr Dziwinski2012-07-302-21/+21
* | CCamera rewritePiotr Dziwinski2012-07-293-118/+1875
* | Video mode changingPiotr Dziwinski2012-07-2911-222/+580
* | GLEWPiotr Dziwinski2012-07-286-15/+144
* | Updated readme files; added licensePiotr Dziwinski2012-07-274-57/+792
* | Updated Doxygen main pagePiotr Dziwinski2012-07-271-8/+14
* | Whitespace fixPiotr Dziwinski2012-07-275-399/+399