summaryrefslogtreecommitdiffstats
path: root/src/ui
Commit message (Collapse)AuthorAgeFilesLines
* Don't enforce CMake build type on users.Didier Raboud2012-12-191-1/+3
| | | | Only set CMAKE_BUILD_TYPE to Debug when no value is provided.
* Split gtest and gmock, fixed using system packagesPiotr Dziwinski2012-12-161-1/+2
| | | | | | - split the bundled gtest and gmock libraries - allowed the use of system gmock - refactoring in CMakeLists
* Removed unnecessary dynamic_castsPiotr Dziwinski2012-10-171-2/+2
|
* Saving scripts on game save should work. Added stub for particle.Zaba9992012-10-112-1/+292
|
* Merge branch 'dev' of https://github.com/colobot/colobot into devZaba9992012-10-117-192/+151
|\
| * Removed Gfx:: from license notice (introduced in 8ad15c0e)Michał Zieliński2012-10-081-2/+1
| |
| * Changing and saving input bindingsPiotr Dziwinski2012-10-077-190/+150
| |
* | Added saving user scripts on game save. Fixed bug in writing script to file.Zaba9992012-10-1111-9/+266
|/
* Merge branch 'dev' into dev-graphicsPiotr Dziwinski2012-10-022-288/+157
|\
| * Further work on saving profile and directory listing.Zaba9992012-10-022-288/+157
| |
* | Merge remote-tracking branch 'origin/dev' into dev-graphicsadiblol2012-09-301-543/+536
|\|
| * Merge branch 'dev' of github.com:colobot/colobot into devadiblol2012-09-301-543/+536
| |\
| | * Merge branch 'dev' of https://github.com/colobot/colobot into devZaba9992012-09-292-16/+16
| | |\
| | * | #48 Adding new users works.Zaba9992012-09-291-543/+536
| | | |
* | | | Dirty hack to allow window resizing or even full screen.adiblol2012-09-301-0/+5
|/ / / | | | | | | | | | | | | Currently makes text buggy! (full screen must be initiated by window manager, for example Alt+F11 in Fluxbox)
* | | Fixed invradar cheat code.adiblol2012-09-301-7/+2
| | | | | | | | | | | | | | | Replaced CRobotMain::GetCheatRadar with CRobotMain::GetRadar. Changed logger level of "invalid m_motion" messages.
* | | Map texture paintingPiotr Dziwinski2012-09-301-29/+28
| |/ |/|
* | Fixed CEdit delete[] issuesPiotr Dziwinski2012-09-291-6/+6
| |
* | 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
|\