Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/adiblol/colobot into dev-ui | erihel | 2012-09-03 | 14 | -4534/+8206 |
|\ | | | | | | | | | | | Conflicts: src/common/restext.cpp src/common/restext.h | ||||
| * | Whitespace fix | Piotr Dziwinski | 2012-08-27 | 1 | -22/+22 |
| | | |||||
| * | Add translation files | Alexander Monakov | 2012-08-25 | 3 | -0/+6291 |
| | | |||||
| * | Move strings out of restext. Add i18n via gettext | Alexander Monakov | 2012-08-25 | 4 | -3525/+842 |
| | | |||||
| * | Move ResTextType enum to a separate file | Alexander Monakov | 2012-08-25 | 2 | -109/+120 |
| | | |||||
| * | Move ObjectType enum to a separate file | Alexander Monakov | 2012-08-25 | 2 | -245/+263 |
| | | |||||
| * | Move Error enum to a separate file | Alexander Monakov | 2012-08-25 | 2 | -133/+151 |
| | | |||||
| * | Move EventType enum to a separate file | Alexander Monakov | 2012-08-25 | 2 | -516/+534 |
| | | |||||
* | | latest changes; few more classes should compile now | erihel | 2012-08-31 | 20 | -541/+446 |
| | | |||||
* | | * added nullptr | erihel | 2012-08-21 | 6 | -513/+503 |
| | | | | | | | | | | * 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 | 19 | -1255/+830 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | 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 | 7 | -47/+25 |
| | | | | | | | | | | | | * wrong event function used | ||||
* | | | * minor changes to control.cpp to compile it without errors | erihel | 2012-08-18 | 3 | -20/+21 |
| | | | |||||
* | | | * list.cpp compiles | erihel | 2012-08-17 | 6 | -380/+332 |
| | | | |||||
* | | | * ui/label.cpp compiles | erihel | 2012-08-17 | 1 | -2/+2 |
| | | | |||||
* | | | * ui/key.cpp compiles | erihel | 2012-08-17 | 7 | -8/+18 |
| | | | | | | | | | | | | * csoundinterface to ccontrol | ||||
* | | | * last commit should not include sound changes | erihel | 2012-08-17 | 2 | -6/+6 |
| | | | |||||
* | | | * changes to ui classes | erihel | 2012-08-17 | 27 | -907/+547 |
|/ / | |||||
* / | First approach to port 2D UI Interface | Michał Konopacki | 2012-08-15 | 19 | -1825/+1856 |
|/ | | | | | - changes in src/ui ; be CAREFUL, not every file is changed in a proper way -> bugs - necessary changes in object/robotmain.h and common/misc.h/.cpp in order to compile | ||||
* | Merge branch 'dev-graphics' into dev | Piotr Dziwinski | 2012-08-13 | 24 | -516/+652 |
|\ | | | | | | | Documentation, rendering functions & fixes | ||||
| * | Improved error messages | Piotr Dziwinski | 2012-08-13 | 7 | -47/+59 |
| | | | | | | | | Added some logging and improved error messages displayed to user | ||||
| * | Fix | Piotr Dziwinski | 2012-08-13 | 1 | -1/+1 |
| | | |||||
| * | Test fix | Piotr Dziwinski | 2012-08-13 | 5 | -16/+17 |
| | | |||||
| * | Rendering functions, documentation | Piotr Dziwinski | 2012-08-13 | 12 | -452/+575 |
| | | | | | | | | | | - rewrote the render functions for CEngine, CCloud and CWater - added documentation | ||||
* | | Merge pull request #37 from konopackim/dev | Piotr Dziwiński | 2012-08-13 | 110 | -4453/+2232 |
|\ \ | |/ |/| | Fixes and console interpreter | ||||
| * | Reduced amount of warnings in CBot library | Michał Konopacki | 2012-08-13 | 12 | -152/+157 |
| | | | | | | | | | | Changed most of C-style casting to C++ casting Commented unused variables | ||||
| * | Changed GivAttrName() to GetAttrName() | Michał Konopacki | 2012-08-11 | 25 | -1397/+1397 |
| | | |||||
| * | CBot console interpreter | Michał Konopacki | 2012-08-09 | 89 | -2958/+732 |
| | | | | | | | | Based on program found in sources | ||||
| * | CBotString.cpp Bug resolve | Michał Konopacki | 2012-08-09 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dev-graphics' into dev | Piotr Dziwinski | 2012-08-12 | 18 | -586/+1745 |
|\ \ | | | | | | | | | | CEngine object handling | ||||
| * | | Object handling in CEngine | Piotr Dziwinski | 2012-08-12 | 18 | -586/+1745 |
| | | | | | | | | | | | | | | | | | | - finished rewriting CEngine object, shadow, etc. handling - refactored texture code - added new log levels | ||||
* | | | * Final changes to plugin interface | erihel | 2012-08-12 | 9 | -23/+153 |
| | | | | | | | | | | | | * Added doxygen comments to plugin manager and plugin loader | ||||
* | | | Merge branch 'dev-opengl' into dev | erihel | 2012-08-12 | 65 | -1400/+8265 |
|\| | | |||||
| * | | Fixes & testing in CEngine | Piotr Dziwinski | 2012-08-12 | 10 | -127/+332 |
| | | | | | | | | | | | | | | | - fixed bugs in settings modes, etc. - some additions and minor refactoring | ||||
| * | | Documentation update | Piotr Dziwinski | 2012-08-11 | 46 | -142/+234 |
| | | | | | | | | | | | | | | | | | | - updated Doxyfile - added/changed file, dir and namespace descriptions - fixed some errors in doxygen tags | ||||
| * | | Render mode setting, refactoring | Piotr Dziwinski | 2012-08-11 | 11 | -430/+291 |
| | | | | | | | | | | | | | | | | | | - finished SetState in CEngine - refactored Size and IntSize back to Point and IntPoint - other minor changes in CEngine | ||||
| * | | Partial CEngine implementation | Piotr Dziwinski | 2012-08-10 | 6 | -425/+2326 |
| | | | | | | | | | | | | | | | - added rewritten implementation for basic modesetting in CEngine - started rewriting proper rendering and object handling in CEngine | ||||
| * | | Graphics stubs | Piotr Dziwinski | 2012-08-09 | 16 | -275/+989 |
| | | | | | | | | | | | | | | | | | | | | | - added stubs for functions in CLightning, CParticle and CPyro - cleaned object.h and physics.h headers - created temporary stubs to compile CCamera - other necessary changes to compile successfully | ||||
| * | | CPlanet implementation | Piotr Dziwinski | 2012-08-09 | 2 | -27/+209 |
| | | | | | | | | | | | | Added rewritten CPlanet implementation | ||||
| * | | CWater and CCloud basic implementation | Piotr Dziwinski | 2012-08-08 | 4 | -75/+1043 |
| | | | | | | | | | | | | | | | Added rewritten implementation for CWater and CCloud Won't link yet because of missing functions |