summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Mouse pos setting, low cpu mode, stats displayPiotr Dziwinski2012-09-206-171/+252
|
* Namespace and styling fixPiotr Dziwinski2012-09-1943-2223/+2403
|
* Forgotten fix in dev-graphicsPiotr Dziwinski2012-09-19230-16047/+15088
|\
| * 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
| | | | | | | | | | | | - added mouse wheel events - added motion vectors to CRobotMain - other minor changes in event.h
| * Input bindings rewritePiotr Dziwinski2012-09-1915-348/+397
| | | | | | | | | | | | - moved input bindings to CRobotMain - added virtual keymod and joystick button key presses - fixed putenv error; other minor fixes
| * Fixed includes in ui.Zaba9992012-09-1928-149/+149
| |
| * Merge branch 'dev' of https://github.com/adiblol/colobot into devZaba9992012-09-1815-200/+141
| |\ | | | | | | | | | | | | Conflicts: src/ui/slider.cpp
| | * Fixed invalid text alignmentPiotr Dziwinski2012-09-187-19/+19
| | |
| | * Change of background image handlingPiotr Dziwinski2012-09-178-182/+123
| | | | | | | | | | | | | | | | | | - removed old 4 quarter backgrounds - fixes in texture loading - other minor fixes
| * | Warnings cleaned, left only those connected to commented out code.Zaba9992012-09-1819-313/+291
| | |
| * | warnings fight in progress.Zaba9992012-09-1827-207/+190
| |/
| * 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
| | | | | | | | | | | | - removed mock of CInterface and fixed event passing to CRobotMain - changed texture names from tga and bmp to png - UI now works but interaction is still broken
| * Successful compilation & runningPiotr Dziwinski2012-09-156-48/+49
| | | | | | | | | | | | | | - temporarily mocked CSoundInterface and CPluginInterface - added CRobotMain to application - successfully compiles & runs, but doesn't display correctly at the moment
| * Merge branch 'dev' of github.com:adiblol/colobot into devMichał Konopacki2012-09-157-752/+804
| |\
| | * CMainDialog rewritePiotr Dziwinski2012-09-157-752/+804
| | | | | | | | | | | | - rewritten CMainDialog and updated CRobotMain
| * | [src/ui] CStudio compilesMichał Konopacki2012-09-152-155/+169
| |/
| * Merge dev-common and various fixes to achieve compilationPiotr Dziwinski2012-09-15124-5308/+1887
| |\ | | | | | | | | | | | | | | | | | | | | | - merged changes from dev-common - fixed many compilation errors (CBrain, UI, ...) - temporarily commented out some problematic code (e.g. input bindings) - (partially) fixed #include styling - everything compiles except for CRobotMain, CMainDialog and CStudio
| | * Locale settings and translation fixesPiotr Dziwinski2012-09-137-269/+216
| | | | | | | | | | | | | | | | | | - added locale setting - removed unused translations - updated .po files
| | * Image pixel read/writePiotr Dziwinski2012-09-134-17/+167
| | |
| | * Simulation timestamps and input bindingsPiotr Dziwinski2012-09-127-78/+469
| | | | | | | | | | | | | | | | | | - added new simulation time calculations in CApplication - added simulation frame updates - rewritten old input binding code and input state tracking
| | * Tests rewrite and Doxygen in src/mathPiotr Dziwinski2012-09-1112-403/+264
| | | | | | | | | | | | | | | | | | - rewritten tests to use new framework - updated/reformatted Doxygen - removed legacy conversions
| | * Refactoring in src/commonPiotr Dziwinski2012-09-0928-506/+399
| | | | | | | | | | | | | | | - refactored CInstanceManager and some headers - removed old headers
| * | Merge branch 'dev-object' into devMichał Konopacki2012-09-1558-5164/+4069
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/object/robotmain.cpp src/object/robotmain.h
| | * | CRobotMain rewritePiotr Dziwinski2012-09-155-3107/+2226
| | | | | | | | | | | | | | | | | | | | - rewritten CRobotMain - won't compile yet because of dependencies to CMainDialog
| | * | brain.* mainmovie.* : Partially rewrittenMichał Konopacki2012-09-134-232/+235
| | | | | | | | | | | | | | | | The remaining part will be revised and rewritten after merge with dev and dev-ui branches
| | * | 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
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/CMakeLists.txt src/common/misc.cpp src/common/misc.h src/object/robotmain.cpp src/object/robotmain.h src/script/cbottoken.cpp src/script/cbottoken.h src/ui/button.cpp src/ui/button.h src/ui/check.cpp src/ui/check.h src/ui/color.cpp src/ui/color.h src/ui/compass.cpp src/ui/compass.h src/ui/control.cpp src/ui/control.h src/ui/displayinfo.cpp src/ui/displayinfo.h src/ui/displaytext.cpp src/ui/displaytext.h src/ui/edit.cpp src/ui/edit.h src/ui/gauge.cpp src/ui/gauge.h src/ui/interface.cpp src/ui/interface.h src/ui/key.cpp src/ui/map.h src/ui/shortcut.h src/ui/slider.h src/ui/target.cpp src/ui/target.h src/ui/window.cpp src/ui/window.h
| | * | Merge pull request #45 from Erihel/dev-uiPiotr Dziwiński2012-09-1372-9214/+12518
| | |\ \ | | | | | | | | | | Changes from dev-ui in erihel's fork
| | | * | * latest changeserihel2012-09-1124-491/+453
| | | | | | | | | | | | | | | | | | | | | | | | | * all files except studio, map and maindialog should compile * did some code cleanup
| | | * | Merge branch 'dev' of https://github.com/adiblol/colobot into dev-uierihel2012-09-0314-4534/+8206
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/common/restext.cpp src/common/restext.h
| | | * | | latest changes; few more classes should compile nowerihel2012-08-3120-541/+446
| | | | | |
| | | * | | * added nullptrerihel2012-08-216-513/+503
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changed Ret to Get function names * minor changes
| | | * | | 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
| | | | | | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-09 03:38:45 +0000