Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | | 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 |
|/ | |||||
* | Various fixes | Piotr Dziwinski | 2012-09-22 | 2 | -4/+2 |
* | Data dir paths | Piotr Dziwinski | 2012-09-22 | 1 | -3/+5 |
* | * Removed some warnings | erihel | 2012-09-22 | 1 | -1/+1 |
* | Event fixes & refactoring | Piotr Dziwinski | 2012-09-22 | 20 | -118/+120 |
* | 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 |
|\ | |||||
| * | 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 |
* | 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 |
|\ | |||||
| * | 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 |
* | | 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 |
* | 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 |
* | | [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 |
|\ | |||||
* | | * latest changes | erihel | 2012-09-11 | 22 | -481/+443 |
* | | latest changes; few more classes should compile now | erihel | 2012-08-31 | 17 | -537/+442 |
* | | * added nullptr | erihel | 2012-08-21 | 4 | -87/+77 |
* | | 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 |
| |\ \ | |||||
| * | | | UI porting | Michał Konopacki | 2012-08-20 | 4 | -335/+383 |
| * | | | Further improvements in UI porting | Michał Konopacki | 2012-08-18 | 22 | -803/+891 |
* | | | | latest changes | erihel | 2012-08-21 | 5 | -399/+378 |
| |/ / |/| | | |||||
* | | | * wrong enum used for text alignment | erihel | 2012-08-18 | 6 | -43/+21 |
* | | | * minor changes to control.cpp to compile it without errors | erihel | 2012-08-18 | 2 | -15/+15 |