summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\ \
| | * | | 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
* | | commented new part in cmakelist and reverted stubs in camera.cpp. Will be com...Zaba9992012-09-102-5/+67
* | | Merge with changes from Zaba999 fork.Zaba9992012-09-1072-5531/+8865
* | | Commenting out src/object/auto temporarilyPiotr Dziwinski2012-09-091-26/+26
* | | [src/object/auto] Folder rewrittenMichał Konopacki2012-09-0953-1167/+1222
* | | Merge branch 'dev' into dev-graphicsPiotr Dziwinski2012-09-0914-4528/+8201
|\ \ \ | | |/ | |/|
| * | Whitespace fixPiotr Dziwinski2012-08-271-22/+22
| * | 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
| |/
* | Texture format detection; minor fixesPiotr Dziwinski2012-09-095-25/+77
* | CTerrain refactoring & fixesPiotr Dziwinski2012-09-0810-663/+715
* | CModelFile fixes; test frameworkPiotr Dziwinski2012-09-084-182/+463
* | FixPiotr Dziwinski2012-09-031-2/+6
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-20 20:50:14 +0000