summaryrefslogtreecommitdiffstats
path: root/src/ui
Commit message (Collapse)AuthorAgeFilesLines
* Fixed CEdit cursorPiotr Dziwinski2012-09-291-8/+8
|
* Merge branch 'dev' into dev-graphicsPiotr Dziwinski2012-09-292-99/+133
|\
| * Merge branch 'master' of https://github.com/colobot/colobot into devunknown2012-09-282-99/+133
| |\
| | * Merge branch 'master' of git://github.com/colobot/colobotZaba9992012-09-261-4/+4
| | |\
| | * | Work in progress on opening files, and listing dirsZaba9992012-09-262-99/+133
| | | | | | | | | | | | | | | | | | | | Fixed includes profile changed from SimpleIni to boost::ptree -> not finished yet
* | | | Merge remote-tracking branch 'origin/dev' into dev-graphicsadiblol2012-09-272-47/+49
|\| | |
| * | | * Ingame help should now display correctlyerihel2012-09-272-47/+49
| | | |
* | | | Updated docs and some Doxygen fixesPiotr Dziwinski2012-09-271-2/+2
|/ / /
* | / Fixed CEdit text input and drawing issuesPiotr Dziwinski2012-09-261-12/+12
| |/ |/|
* | Fog color fix; refactoringPiotr Dziwinski2012-09-261-4/+4
|/ | | | | | - fixed fog color setting - removed unused glSecondaryColor and altered struct VertexCol - minor refactoring in CText
* Various fixesPiotr Dziwinski2012-09-222-4/+2
| | | | | | | | - disabled UserDir() in path lookup - fixed crashes on loading missions in CObject - fixed texture bug in CTerrain - changed mouse move event handling to avoid flooding event queue - enabled all missions for testing
* Data dir pathsPiotr Dziwinski2012-09-221-3/+5
| | | | | - changed access to paths in data directory in CApplication - models now load from data directory
* * Removed some warningserihel2012-09-221-1/+1
|
* Event fixes & refactoringPiotr Dziwinski2012-09-2220-118/+120
| | | | | | - added new state tracking to Event - removed old fields from Event - fixed some issues with Events and fps counter
* robotmain, restext and engine fixesPiotr Dziwinski2012-09-211-35/+43
|
* changed paths for models and levels. Now it's possible to load level. Merged ↵Zaba9992012-09-205-107/+32
|\ | | | | | | with latest trunk
| * Checkbox fix; main dialog buttonsPiotr Dziwinski2012-09-202-89/+10
| |
| * Whitespace fixPiotr Dziwinski2012-09-203-4/+4
| |
| * Mouse pos setting, low cpu mode, stats displayPiotr Dziwinski2012-09-201-15/+19
| |
* | changed paths for models and levels. Now it's possible to load level.Zaba9992012-09-201-30/+43
|/
* Changes in Ui, solves part of #47Michał Konopacki2012-09-1917-77/+77
|
* Mouse wheel fixesPiotr Dziwinski2012-09-195-28/+28
|
* Input bindings rewritePiotr Dziwinski2012-09-194-46/+41
| | | | | | - 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-1926-148/+142
|
* Merge branch 'dev' of https://github.com/adiblol/colobot into devZaba9992012-09-188-37/+37
|\ | | | | | | | | Conflicts: src/ui/slider.cpp
| * Fixed invalid text alignmentPiotr Dziwinski2012-09-187-19/+19
| |
| * Change of background image handlingPiotr Dziwinski2012-09-171-19/+19
| | | | | | | | | | | | - removed old 4 quarter backgrounds - fixes in texture loading - other minor fixes
* | Warnings cleaned, left only those connected to commented out code.Zaba9992012-09-1813-305/+283
| |
* | warnings fight in progress.Zaba9992012-09-188-72/+72
|/
* Some memory leaks fixedPiotr Dziwinski2012-09-163-18/+41
|
* Interface worksPiotr Dziwinski2012-09-1617-108/+108
| | | | | | - 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
* Merge branch 'dev' of github.com:adiblol/colobot into devMichał Konopacki2012-09-152-674/+725
|\
| * CMainDialog rewritePiotr Dziwinski2012-09-152-674/+725
| | | | | | | | - 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-1533-123/+109
|\ | | | | | | | | | | | | | | - 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
* | * latest changeserihel2012-09-1122-481/+443
| | | | | | | | | | * all files except studio, map and maindialog should compile * did some code cleanup
* | latest changes; few more classes should compile nowerihel2012-08-3117-537/+442
| |
* | * added nullptrerihel2012-08-214-87/+77
| | | | | | | | | | * 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
| | |
| * | Merge remote-tracking branch 'erihel/dev-ui' into dev-uiMichał Konopacki2012-08-2017-1254/+827
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ui/button.h src/ui/color.h src/ui/compass.h src/ui/control.h src/ui/displayinfo.h src/ui/displaytext.h src/ui/edit.h src/ui/editvalue.h src/ui/gauge.h src/ui/group.h src/ui/image.h src/ui/slider.h
| * | | 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-186-43/+21
| | | | | | | | | | | | * wrong event function used
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-10 00:32:23 +0000