Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'dev-ui' into dev | Michał Konopacki | 2012-09-15 | 45 | -1907/+1752 | |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/CMakeLists.txt src/common/misc.cpp src/common/misc.h src/object/robotmain.cpp src/object/robotmain.h src/script/cbottoken.cpp src/script/cbottoken.h src/ui/button.cpp src/ui/button.h src/ui/check.cpp src/ui/check.h src/ui/color.cpp src/ui/color.h src/ui/compass.cpp src/ui/compass.h src/ui/control.cpp src/ui/control.h src/ui/displayinfo.cpp src/ui/displayinfo.h src/ui/displaytext.cpp src/ui/displaytext.h src/ui/edit.cpp src/ui/edit.h src/ui/gauge.cpp src/ui/gauge.h src/ui/interface.cpp src/ui/interface.h src/ui/key.cpp src/ui/map.h src/ui/shortcut.h src/ui/slider.h src/ui/target.cpp src/ui/target.h src/ui/window.cpp src/ui/window.h | |||||
| * | | * latest changes | erihel | 2012-09-11 | 24 | -491/+453 | |
| | | | | | | | | | | | | | | | * all files except studio, map and maindialog should compile * did some code cleanup | |||||
| * | | 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 | |||||
| * | | | 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 | |||||
* | | | | commented new part in cmakelist and reverted stubs in camera.cpp. Will be ↵ | Zaba999 | 2012-09-10 | 2 | -5/+67 | |
| | | | | | | | | | | | | | | | | commited later after implementation is finished in dev-object branch. | |||||
* | | | | Merge with changes from Zaba999 fork. | Zaba999 | 2012-09-10 | 72 | -5531/+8865 | |
| | | | | ||||||
* | | | | Commenting out src/object/auto temporarily | Piotr Dziwinski | 2012-09-09 | 1 | -26/+26 | |
| | | | | ||||||
* | | | | [src/object/auto] Folder rewritten | Michał Konopacki | 2012-09-09 | 53 | -1167/+1222 | |
| |_|/ |/| | | ||||||
* | | | Merge branch 'dev' into dev-graphics | Piotr Dziwinski | 2012-09-09 | 14 | -4528/+8201 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | 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 | |
| |/ | ||||||
* | | Texture format detection; minor fixes | Piotr Dziwinski | 2012-09-09 | 5 | -25/+77 | |
| | | | | | | | | | | | | - detection of texture format - fixed depth mask bug - minor refactoring | |||||
* | | CTerrain refactoring & fixes | Piotr Dziwinski | 2012-09-08 | 10 | -663/+715 | |
| | | | | | | | | | | - refactored CTerrain code - fixed some minor bugs | |||||
* | | CModelFile fixes; test framework | Piotr Dziwinski | 2012-09-08 | 4 | -182/+463 | |
| | | | | | | | | | | | | - fixes in CModelFile IO - added Google Test framework for automatic testing - rewrote modelfile_test in the new framework | |||||
* | | Fix | Piotr Dziwinski | 2012-09-03 | 1 | -2/+6 | |
| | | ||||||
* | | Fix | Piotr Dziwinski | 2012-09-03 | 1 | -4/+3 | |
| | | ||||||
* | | Fix | Piotr Dziwinski | 2012-08-31 | 2 | -12/+1 | |
| | | ||||||
* | | New model file format | Piotr Dziwinski | 2012-08-31 | 11 | -350/+1179 | |
| | | | | | | | | | | | | | | - added new binary and text formats for models - fixes and improvements in CModelFile - tool for converting model files - minor additions and fixes | |||||
* | | Fixes in terrain rendering | Piotr Dziwinski | 2012-08-27 | 3 | -14/+31 | |
|/ | ||||||
* | 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 |