summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* * latest changeserihel2012-09-1124-491/+453
* Merge branch 'dev' of https://github.com/adiblol/colobot into dev-uierihel2012-09-0314-4534/+8206
|\
| * Whitespace fixPiotr Dziwinski2012-08-271-22/+22
| * Merge pull request #42 from amonakov/devPiotr Dziwiński2012-08-2514-4528/+8201
| |\
| | * 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
| |/
* | latest changes; few more classes should compile nowerihel2012-08-3120-541/+446
* | * added nullptrerihel2012-08-216-513/+503
* | merged changes from michkonerihel2012-08-2134-1358/+1542
|\ \
| * | added ui/shortcut.*Michał Konopacki2012-08-212-31/+40
| * | Typo fixMichał Konopacki2012-08-201-1/+1
| * | added ui/scroll.*Michał Konopacki2012-08-202-34/+46
| * | added ui/slider.*Michał Konopacki2012-08-202-9/+14
| * | added ui/target.*Michał Konopacki2012-08-202-32/+38
| * | added ui/window.* -- not fully portedMichał Konopacki2012-08-202-133/+155
| * | Merge remote-tracking branch 'erihel/dev-ui' into dev-uiMichał Konopacki2012-08-2019-1255/+830
| |\ \
| * | | UI portingMichał Konopacki2012-08-204-335/+383
| * | | Further improvements in UI portingMichał Konopacki2012-08-1822-803/+891
* | | | latest changeserihel2012-08-215-399/+378
| |/ / |/| |
* | | * wrong enum used for text alignmenterihel2012-08-187-47/+25
* | | * minor changes to control.cpp to compile it without errorserihel2012-08-183-20/+21
* | | * list.cpp compileserihel2012-08-176-380/+332
* | | * ui/label.cpp compileserihel2012-08-171-2/+2
* | | * ui/key.cpp compileserihel2012-08-177-8/+18
* | | * last commit should not include sound changeserihel2012-08-172-6/+6
* | | * changes to ui classeserihel2012-08-1727-907/+547
|/ /
* | 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