Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | 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 | |
| | | | ||||||
| * | | Simulation timestamps and input bindings | Piotr Dziwinski | 2012-09-12 | 7 | -78/+469 | |
| | | | | | | | | | | | | | | | | | | - added new simulation time calculations in CApplication - added simulation frame updates - rewritten old input binding code and input state tracking | |||||
| * | | Tests rewrite and Doxygen in src/math | Piotr Dziwinski | 2012-09-11 | 12 | -403/+264 | |
| | | | | | | | | | | | | | | | | | | - rewritten tests to use new framework - updated/reformatted Doxygen - removed legacy conversions | |||||
| * | | Refactoring in src/common | Piotr Dziwinski | 2012-09-09 | 28 | -506/+399 | |
| |/ | | | | | | | | | - refactored CInstanceManager and some headers - removed old headers | |||||
* | | Merge branch 'dev-object' into dev | Michał Konopacki | 2012-09-15 | 58 | -5164/+4069 | |
|\ \ | | | | | | | | | | | | | | | | Conflicts: src/object/robotmain.cpp src/object/robotmain.h | |||||
| * | | CRobotMain rewrite | Piotr Dziwinski | 2012-09-15 | 5 | -3107/+2226 | |
| | | | | | | | | | | | | | | | - rewritten CRobotMain - won't compile yet because of dependencies to CMainDialog | |||||
| * | | brain.* mainmovie.* : Partially rewritten | Michał Konopacki | 2012-09-13 | 4 | -232/+235 | |
| | | | | | | | | | | | | The remaining part will be revised and rewritten after merge with dev and dev-ui branches | |||||
| * | | Fixes in [object/auto] | Michał Konopacki | 2012-09-13 | 5 | -40/+43 | |
| | | | ||||||
| * | | [object/motion] Folder compiles | Michał Konopacki | 2012-09-13 | 13 | -543/+543 | |
| | | | ||||||
| * | | all tasks compile. | Zaba999 | 2012-09-12 | 11 | -273/+255 | |
| | | | ||||||
| * | | Merge branch 'dev-object' of github.com:adiblol/colobot into dev-object | Michał Konopacki | 2012-09-11 | 25 | -896/+690 | |
| |\ \ | ||||||
| | * | | commented part of tasks that does not compile. | Zaba999 | 2012-09-11 | 1 | -7/+7 | |
| | | | | ||||||
| | * | | half of task compile. | Zaba999 | 2012-09-11 | 25 | -903/+697 | |
| | | | | ||||||
| * | | | [src/object] motion.* motionant.* motionbee.* should compile | Michał Konopacki | 2012-09-11 | 5 | -161/+165 | |
| |/ / | ||||||
* | | | 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 | |
| | | | | |