Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into dev-use-installed-i18n | Didier Raboud | 2012-12-16 | 1 | -0/+1 |
|\ | |||||
| * | Set a default datadir, in sync with the data installation path. | Didier Raboud | 2012-12-16 | 1 | -1/+3 |
* | | Use default installation paths for i18n. | Didier Raboud | 2012-12-16 | 1 | -1/+3 |
|/ | |||||
* | Split gtest and gmock, fixed using system packages | Piotr Dziwinski | 2012-12-16 | 1 | -1/+1 |
* | Merge branch 'master' into dev | Piotr Dziwinski | 2012-12-15 | 1 | -0/+1 |
|\ | |||||
| * | Inherit translation setting from environment. | Didier Raboud | 2012-12-14 | 1 | -0/+1 |
* | | Restext rewrite to runtime initialized arrays | Piotr Dziwinski | 2012-10-17 | 8 | -1571/+1480 |
* | | Doxygen/comment fixes and some #include refactoring | Piotr Dziwinski | 2012-10-17 | 22 | -83/+80 |
* | | Changing and saving input bindings | Piotr Dziwinski | 2012-10-07 | 1 | -2/+4 |
|/ | |||||
* | Commented out profile_test | Michał Zieliński | 2012-10-05 | 1 | -3/+3 |
* | Merge branch 'dev' into dev-graphics | Piotr Dziwinski | 2012-10-02 | 1 | -2/+2 |
|\ | |||||
| * | Further work on saving profile and directory listing. | Zaba999 | 2012-10-02 | 1 | -2/+2 |
* | | Fixed bugs in texture coloring | Piotr Dziwinski | 2012-09-30 | 1 | -4/+4 |
|/ | |||||
* | Map texture painting | Piotr Dziwinski | 2012-09-30 | 2 | -0/+9 |
* | MXE support and CMake files refactoring | Piotr Dziwinski | 2012-09-29 | 1 | -2/+1 |
* | Merge branch 'dev' into dev-graphics | Piotr Dziwinski | 2012-09-29 | 6 | -71/+156 |
|\ | |||||
| * | Small fix in profile + profile_test rewritten to gtest. | Zaba999 | 2012-09-28 | 4 | -39/+48 |
| * | Profile rewritten to boost. Read/write to ini should work. | Zaba999 | 2012-09-27 | 2 | -22/+26 |
| * | Work in progress on opening files, and listing dirs | Zaba999 | 2012-09-26 | 3 | -30/+102 |
* | | Updated docs and some Doxygen fixes | Piotr Dziwinski | 2012-09-27 | 3 | -3/+3 |
* | | Refactored resource and relief loading | Piotr Dziwinski | 2012-09-26 | 2 | -8/+33 |
|/ | |||||
* | Removed metafile editor and loader | Piotr Dziwinski | 2012-09-22 | 2 | -488/+0 |
* | Various fixes | Piotr Dziwinski | 2012-09-22 | 1 | -2/+6 |
* | Data dir paths | Piotr Dziwinski | 2012-09-22 | 1 | -0/+20 |
* | Event fixes & refactoring | Piotr Dziwinski | 2012-09-22 | 2 | -63/+61 |
* | * Fixed audio problems | erihel | 2012-09-22 | 1 | -1/+1 |
* | robotmain, restext and engine fixes | Piotr Dziwinski | 2012-09-21 | 1 | -34/+60 |
* | Mouse wheel events, motion vectors | Piotr Dziwinski | 2012-09-19 | 3 | -54/+85 |
* | Input bindings rewrite | Piotr Dziwinski | 2012-09-19 | 5 | -68/+103 |
* | Warnings cleaned, left only those connected to commented out code. | Zaba999 | 2012-09-18 | 2 | -2/+2 |
* | warnings fight in progress. | Zaba999 | 2012-09-18 | 5 | -9/+9 |
* | Interface works | Piotr Dziwinski | 2012-09-16 | 1 | -1/+7 |
* | Successful compilation & running | Piotr Dziwinski | 2012-09-15 | 1 | -1/+1 |
* | CMainDialog rewrite | Piotr Dziwinski | 2012-09-15 | 1 | -1/+1 |
* | Merge dev-common and various fixes to achieve compilation | Piotr Dziwinski | 2012-09-15 | 26 | -4184/+582 |
|\ | |||||
| * | Locale settings and translation fixes | Piotr Dziwinski | 2012-09-13 | 3 | -63/+4 |
| * | Image pixel read/write | Piotr Dziwinski | 2012-09-13 | 4 | -17/+167 |
| * | Simulation timestamps and input bindings | Piotr Dziwinski | 2012-09-12 | 3 | -4/+11 |
| * | Refactoring in src/common | Piotr Dziwinski | 2012-09-09 | 22 | -461/+331 |
* | | Merge branch 'dev-ui' into dev | Michał Konopacki | 2012-09-15 | 2 | -2/+2 |
|\ \ | |||||
| * \ | Merge branch 'dev' of https://github.com/adiblol/colobot into dev-ui | erihel | 2012-09-03 | 8 | -4288/+1650 |
| |\ \ | |||||
| * | | | latest changes; few more classes should compile now | erihel | 2012-08-31 | 2 | -2/+2 |
| * | | | * ui/key.cpp compiles | erihel | 2012-08-17 | 1 | -0/+1 |
| * | | | First approach to port 2D UI Interface | Michał Konopacki | 2012-08-15 | 4 | -1436/+1439 |
* | | | | Merge with changes from Zaba999 fork. | Zaba999 | 2012-09-10 | 5 | -217/+3791 |
| |_|/ |/| | | |||||
* | | | Merge branch 'dev' into dev-graphics | Piotr Dziwinski | 2012-09-09 | 8 | -4282/+1645 |
|\ \ \ | | |/ | |/| | |||||
| * | | Whitespace fix | Piotr Dziwinski | 2012-08-27 | 1 | -22/+22 |
| * | | Move strings out of restext. Add i18n via gettext | Alexander Monakov | 2012-08-25 | 3 | -3524/+840 |
| * | | Move ResTextType enum to a separate file | Alexander Monakov | 2012-08-25 | 2 | -109/+120 |
| * | | Move Error enum to a separate file | Alexander Monakov | 2012-08-25 | 2 | -133/+151 |