summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
| * Forgotten fix in dev-graphicsPiotr Dziwinski2012-09-19229-16024/+15065
| |\
| * | Fixed old model format bugsPiotr Dziwinski2012-09-091-1/+5
* | | changed paths for models and levels. Now it's possible to load level.Zaba9992012-09-2014-453/+467
| |/ |/|
* | Changes in Ui, solves part of #47Michał Konopacki2012-09-1917-77/+77
* | Mouse wheel fixesPiotr Dziwinski2012-09-195-28/+28
* | Mouse wheel events, motion vectorsPiotr Dziwinski2012-09-1911-105/+293
* | Input bindings rewritePiotr Dziwinski2012-09-1915-348/+397
* | Fixed includes in ui.Zaba9992012-09-1928-149/+149
* | Merge branch 'dev' of https://github.com/adiblol/colobot into devZaba9992012-09-1815-200/+141
|\ \
| * | Fixed invalid text alignmentPiotr Dziwinski2012-09-187-19/+19
| * | Change of background image handlingPiotr Dziwinski2012-09-178-182/+123
* | | Warnings cleaned, left only those connected to commented out code.Zaba9992012-09-1819-313/+291
* | | warnings fight in progress.Zaba9992012-09-1826-184/+167
|/ /
* | changes needeto to cimpile on windows.Zaba9992012-09-1710-38/+41
* | Fix max lights errorPiotr Dziwinski2012-09-161-2/+4
* | Some memory leaks fixedPiotr Dziwinski2012-09-166-26/+74
* | Interface worksPiotr Dziwinski2012-09-1624-132/+134
* | Successful compilation & runningPiotr Dziwinski2012-09-156-48/+49
* | Merge branch 'dev' of github.com:adiblol/colobot into devMichał Konopacki2012-09-157-752/+804
|\ \
| * | CMainDialog rewritePiotr Dziwinski2012-09-157-752/+804
* | | [src/ui] CStudio compilesMichał Konopacki2012-09-152-155/+169
|/ /
* | Merge dev-common and various fixes to achieve compilationPiotr Dziwinski2012-09-15124-5308/+1887
|\ \
| * | Locale settings and translation fixesPiotr Dziwinski2012-09-137-269/+216
| * | Image pixel read/writePiotr Dziwinski2012-09-134-17/+167
| * | Simulation timestamps and input bindingsPiotr Dziwinski2012-09-127-78/+469
| * | Tests rewrite and Doxygen in src/mathPiotr Dziwinski2012-09-1112-403/+264
| * | Refactoring in src/commonPiotr Dziwinski2012-09-0928-506/+399
| |/
* | Merge branch 'dev-object' into devMichał Konopacki2012-09-1558-5164/+4069
|\ \
| * | CRobotMain rewritePiotr Dziwinski2012-09-155-3107/+2226
| * | brain.* mainmovie.* : Partially rewrittenMichał Konopacki2012-09-134-232/+235
| * | Fixes in [object/auto]Michał Konopacki2012-09-135-40/+43
| * | [object/motion] Folder compilesMichał Konopacki2012-09-1313-543/+543
| * | all tasks compile.Zaba9992012-09-1211-273/+255
| * | Merge branch 'dev-object' of github.com:adiblol/colobot into dev-objectMichał Konopacki2012-09-1125-896/+690
| |\ \
| | * | commented part of tasks that does not compile.Zaba9992012-09-111-7/+7
| | * | half of task compile.Zaba9992012-09-1125-903/+697
| * | | [src/object] motion.* motionant.* motionbee.* should compileMichał Konopacki2012-09-115-161/+165
| |/ /
* | | Merge branch 'dev-ui' into devMichał Konopacki2012-09-1545-1907/+1752
|\ \ \ | |/ / |/| |
| * | * latest changeserihel2012-09-1124-491/+453
| * | Merge branch 'dev' of https://github.com/adiblol/colobot into dev-uierihel2012-09-0314-4534/+8206
| |\ \
| * | | 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
| | |\ \ \