Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Dirty hack to allow window resizing or even full screen. | adiblol | 2012-09-30 | 1 | -0/+5 | |
|/ / / | | | | | | | | | | | | | Currently makes text buggy! (full screen must be initiated by window manager, for example Alt+F11 in Fluxbox) | |||||
* | | | Fixed invradar cheat code. | adiblol | 2012-09-30 | 1 | -7/+2 | |
| | | | | | | | | | | | | | | | Replaced CRobotMain::GetCheatRadar with CRobotMain::GetRadar. Changed logger level of "invalid m_motion" messages. | |||||
* | | | Map texture painting | Piotr Dziwinski | 2012-09-30 | 1 | -29/+28 | |
| |/ |/| | ||||||
* | | Fixed CEdit delete[] issues | Piotr Dziwinski | 2012-09-29 | 1 | -6/+6 | |
| | | ||||||
* | | Fixed CEdit cursor | Piotr Dziwinski | 2012-09-29 | 1 | -8/+8 | |
| | | ||||||
* | | Merge branch 'dev' into dev-graphics | Piotr Dziwinski | 2012-09-29 | 2 | -99/+133 | |
|\| | ||||||
| * | Merge branch 'master' of https://github.com/colobot/colobot into dev | unknown | 2012-09-28 | 2 | -99/+133 | |
| |\ | ||||||
| | * | Merge branch 'master' of git://github.com/colobot/colobot | Zaba999 | 2012-09-26 | 1 | -4/+4 | |
| | |\ | ||||||
| | * | | Work in progress on opening files, and listing dirs | Zaba999 | 2012-09-26 | 2 | -99/+133 | |
| | | | | | | | | | | | | | | | | | | | | Fixed includes profile changed from SimpleIni to boost::ptree -> not finished yet | |||||
* | | | | Merge remote-tracking branch 'origin/dev' into dev-graphics | adiblol | 2012-09-27 | 2 | -47/+49 | |
|\| | | | ||||||
| * | | | * Ingame help should now display correctly | erihel | 2012-09-27 | 2 | -47/+49 | |
| | | | | ||||||
* | | | | Updated docs and some Doxygen fixes | Piotr Dziwinski | 2012-09-27 | 1 | -2/+2 | |
|/ / / | ||||||
* | / | Fixed CEdit text input and drawing issues | Piotr Dziwinski | 2012-09-26 | 1 | -12/+12 | |
| |/ |/| | ||||||
* | | Fog color fix; refactoring | Piotr Dziwinski | 2012-09-26 | 1 | -4/+4 | |
|/ | | | | | | - fixed fog color setting - removed unused glSecondaryColor and altered struct VertexCol - minor refactoring in CText | |||||
* | Various fixes | Piotr Dziwinski | 2012-09-22 | 2 | -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 paths | Piotr Dziwinski | 2012-09-22 | 1 | -3/+5 | |
| | | | | | - changed access to paths in data directory in CApplication - models now load from data directory | |||||
* | * Removed some warnings | erihel | 2012-09-22 | 1 | -1/+1 | |
| | ||||||
* | Event fixes & refactoring | Piotr Dziwinski | 2012-09-22 | 20 | -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 fixes | Piotr Dziwinski | 2012-09-21 | 1 | -35/+43 | |
| | ||||||
* | changed paths for models and levels. Now it's possible to load level. Merged ↵ | Zaba999 | 2012-09-20 | 5 | -107/+32 | |
|\ | | | | | | | with latest trunk | |||||
| * | Checkbox fix; main dialog buttons | Piotr Dziwinski | 2012-09-20 | 2 | -89/+10 | |
| | | ||||||
| * | Whitespace fix | Piotr Dziwinski | 2012-09-20 | 3 | -4/+4 | |
| | | ||||||
| * | Mouse pos setting, low cpu mode, stats display | Piotr Dziwinski | 2012-09-20 | 1 | -15/+19 | |
| | | ||||||
* | | changed paths for models and levels. Now it's possible to load level. | Zaba999 | 2012-09-20 | 1 | -30/+43 | |
|/ | ||||||
* | Changes in Ui, solves part of #47 | Michał Konopacki | 2012-09-19 | 17 | -77/+77 | |
| | ||||||
* | Mouse wheel fixes | Piotr Dziwinski | 2012-09-19 | 5 | -28/+28 | |
| | ||||||
* | Input bindings rewrite | Piotr Dziwinski | 2012-09-19 | 4 | -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. | Zaba999 | 2012-09-19 | 26 | -148/+142 | |
| | ||||||
* | Merge branch 'dev' of https://github.com/adiblol/colobot into dev | Zaba999 | 2012-09-18 | 8 | -37/+37 | |
|\ | | | | | | | | | Conflicts: src/ui/slider.cpp | |||||
| * | Fixed invalid text alignment | Piotr Dziwinski | 2012-09-18 | 7 | -19/+19 | |
| | | ||||||
| * | Change of background image handling | Piotr Dziwinski | 2012-09-17 | 1 | -19/+19 | |
| | | | | | | | | | | | | - removed old 4 quarter backgrounds - fixes in texture loading - other minor fixes | |||||
* | | Warnings cleaned, left only those connected to commented out code. | Zaba999 | 2012-09-18 | 13 | -305/+283 | |
| | | ||||||
* | | warnings fight in progress. | Zaba999 | 2012-09-18 | 8 | -72/+72 | |
|/ | ||||||
* | Some memory leaks fixed | Piotr Dziwinski | 2012-09-16 | 3 | -18/+41 | |
| | ||||||
* | Interface works | Piotr Dziwinski | 2012-09-16 | 17 | -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 dev | Michał Konopacki | 2012-09-15 | 2 | -674/+725 | |
|\ | ||||||
| * | CMainDialog rewrite | Piotr Dziwinski | 2012-09-15 | 2 | -674/+725 | |
| | | | | | | | | - rewritten CMainDialog and updated CRobotMain | |||||
* | | [src/ui] CStudio compiles | Michał Konopacki | 2012-09-15 | 2 | -155/+169 | |
|/ | ||||||
* | Merge dev-common and various fixes to achieve compilation | Piotr Dziwinski | 2012-09-15 | 33 | -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 changes | erihel | 2012-09-11 | 22 | -481/+443 | |
| | | | | | | | | | | * all files except studio, map and maindialog should compile * did some code cleanup | |||||
* | | latest changes; few more classes should compile now | erihel | 2012-08-31 | 17 | -537/+442 | |
| | | ||||||
* | | * added nullptr | erihel | 2012-08-21 | 4 | -87/+77 | |
| | | | | | | | | | | * changed Ret to Get function names * minor changes | |||||
* | | merged changes from michkon | erihel | 2012-08-21 | 34 | -1358/+1542 | |
|\ \ | ||||||
| * | | added ui/shortcut.* | Michał Konopacki | 2012-08-21 | 2 | -31/+40 | |
| | | | ||||||
| * | | Typo fix | Michał Konopacki | 2012-08-20 | 1 | -1/+1 | |
| | | | ||||||
| * | | added ui/scroll.* | Michał Konopacki | 2012-08-20 | 2 | -34/+46 | |
| | | | ||||||
| * | | added ui/slider.* | Michał Konopacki | 2012-08-20 | 2 | -9/+14 | |
| | | | ||||||
| * | | added ui/target.* | Michał Konopacki | 2012-08-20 | 2 | -32/+38 | |
| | | | ||||||
| * | | added ui/window.* -- not fully ported | Michał Konopacki | 2012-08-20 | 2 | -133/+155 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'erihel/dev-ui' into dev-ui | Michał Konopacki | 2012-08-20 | 17 | -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 |