Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Small fix in profile + profile_test rewritten to gtest. | Zaba999 | 2012-09-28 | 5 | -39/+49 |
| | |||||
* | Merge branch 'master' of https://github.com/colobot/colobot into dev | unknown | 2012-09-28 | 17 | -189/+301 |
|\ | |||||
| * | Profile rewritten to boost. Read/write to ini should work. | Zaba999 | 2012-09-27 | 3 | -23/+26 |
| | | | | | | | | Load/Save should work. | ||||
| * | Merge branch 'master' of git://github.com/colobot/colobot | Zaba999 | 2012-09-26 | 6 | -67/+65 |
| |\ | |||||
| * | | Work in progress on opening files, and listing dirs | Zaba999 | 2012-09-26 | 17 | -187/+296 |
| | | | | | | | | | | | | | | | Fixed includes profile changed from SimpleIni to boost::ptree -> not finished yet | ||||
* | | | * Fixed Issue #54: flags don't show in 3D view | erihel | 2012-09-28 | 1 | -1/+1 |
| | | | |||||
* | | | * Ingame help should now display correctly | erihel | 2012-09-27 | 4 | -69/+96 |
| | | | |||||
* | | | Fixed CEdit text input and drawing issues | Piotr Dziwinski | 2012-09-26 | 1 | -12/+12 |
| | | | |||||
* | | | Merge master & dev | Piotr Dziwinski | 2012-09-26 | 6 | -70/+65 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fog color fix; refactoring | Piotr Dziwinski | 2012-09-26 | 6 | -70/+65 |
| | | | | | | | | | | | | | | | | | | - fixed fog color setting - removed unused glSecondaryColor and altered struct VertexCol - minor refactoring in CText | ||||
| * | | made graphics/engine/text cleaner, I hope | Michał Zieliński | 2012-09-24 | 2 | -32/+35 |
| |/ | |||||
* | | made graphics/engine/text cleaner, I hope | Michał Zieliński | 2012-09-25 | 2 | -32/+35 |
| | | |||||
* | | * Building should work now without 'ground not flat' message | erihel | 2012-09-25 | 2 | -7/+7 |
|/ | |||||
* | Removed metafile editor and loader | Piotr Dziwinski | 2012-09-22 | 4 | -490/+0 |
| | |||||
* | Various fixes | Piotr Dziwinski | 2012-09-22 | 8 | -51/+132 |
| | | | | | | | | - 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 | 22 | -506/+601 |
| | | | | | - changed access to paths in data directory in CApplication - models now load from data directory | ||||
* | * Removed some warnings | erihel | 2012-09-22 | 2 | -2/+2 |
| | |||||
* | Event fixes & refactoring | Piotr Dziwinski | 2012-09-22 | 28 | -293/+272 |
| | | | | | | - added new state tracking to Event - removed old fields from Event - fixed some issues with Events and fps counter | ||||
* | * Fixed audio problems | erihel | 2012-09-22 | 9 | -70/+106 |
| | | | | | | * Added colobot.ini to CApp in Create function * Fixes to plugin manager * Fixed CProfile segfault | ||||
* | Alpha operation fix | Piotr Dziwinski | 2012-09-21 | 1 | -1/+1 |
| | |||||
* | robotmain, restext and engine fixes | Piotr Dziwinski | 2012-09-21 | 7 | -355/+118 |
| | |||||
* | changed paths for models and levels. Now it's possible to load level. Merged ↵ | Zaba999 | 2012-09-20 | 54 | -3394/+3580 |
|\ | | | | | | | with latest trunk | ||||
| * | Checkbox fix; main dialog buttons | Piotr Dziwinski | 2012-09-20 | 2 | -89/+10 |
| | | |||||
| * | Whitespace fix | Piotr Dziwinski | 2012-09-20 | 6 | -938/+938 |
| | | |||||
| * | Mouse pos setting, low cpu mode, stats display | Piotr Dziwinski | 2012-09-20 | 6 | -171/+252 |
| | | |||||
| * | Namespace and styling fix | Piotr Dziwinski | 2012-09-19 | 43 | -2223/+2403 |
| | | |||||
| * | Forgotten fix in dev-graphics | Piotr Dziwinski | 2012-09-19 | 229 | -16024/+15065 |
| |\ | |||||
| * | | Fixed old model format bugs | Piotr Dziwinski | 2012-09-09 | 1 | -1/+5 |
| | | | |||||
* | | | changed paths for models and levels. Now it's possible to load level. | Zaba999 | 2012-09-20 | 14 | -453/+467 |
| |/ |/| | |||||
* | | 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 |
| | | |||||
* | | Mouse wheel events, motion vectors | Piotr Dziwinski | 2012-09-19 | 11 | -105/+293 |
| | | | | | | | | | | | | - added mouse wheel events - added motion vectors to CRobotMain - other minor changes in event.h | ||||
* | | Input bindings rewrite | Piotr Dziwinski | 2012-09-19 | 15 | -348/+397 |
| | | | | | | | | | | | | - 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 | 28 | -149/+149 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/adiblol/colobot into dev | Zaba999 | 2012-09-18 | 15 | -200/+141 |
|\ \ | | | | | | | | | | | | | 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 | 8 | -182/+123 |
| | | | | | | | | | | | | | | | | | | - 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 | 19 | -313/+291 |
| | | | |||||
* | | | warnings fight in progress. | Zaba999 | 2012-09-18 | 26 | -184/+167 |
|/ / | |||||
* | | changes needeto to cimpile on windows. | Zaba999 | 2012-09-17 | 10 | -38/+41 |
| | | |||||
* | | Fix max lights error | Piotr Dziwinski | 2012-09-16 | 1 | -2/+4 |
| | | |||||
* | | Some memory leaks fixed | Piotr Dziwinski | 2012-09-16 | 6 | -26/+74 |
| | | |||||
* | | Interface works | Piotr Dziwinski | 2012-09-16 | 24 | -132/+134 |
| | | | | | | | | | | | | - 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 | ||||
* | | Successful compilation & running | Piotr Dziwinski | 2012-09-15 | 6 | -48/+49 |
| | | | | | | | | | | | | | | - temporarily mocked CSoundInterface and CPluginInterface - added CRobotMain to application - successfully compiles & runs, but doesn't display correctly at the moment | ||||
* | | Merge branch 'dev' of github.com:adiblol/colobot into dev | Michał Konopacki | 2012-09-15 | 7 | -752/+804 |
|\ \ | |||||
| * | | CMainDialog rewrite | Piotr Dziwinski | 2012-09-15 | 7 | -752/+804 |
| | | | | | | | | | | | | - 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 | 124 | -5308/+1887 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | - 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 | ||||
| * | | Locale settings and translation fixes | Piotr Dziwinski | 2012-09-13 | 7 | -269/+216 |
| | | | | | | | | | | | | | | | | | | - added locale setting - removed unused translations - updated .po files | ||||
| * | | Image pixel read/write | Piotr Dziwinski | 2012-09-13 | 4 | -17/+167 |
| | | |