Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | changed paths for models and levels. Now it's possible to load level. Merged ↵ | Zaba999 | 2012-09-20 | 5 | -107/+32 | |
|\ | | | | | | | with latest trunk | |||||
| * | Checkbox fix; main dialog buttons | Piotr Dziwinski | 2012-09-20 | 2 | -89/+10 | |
| | | ||||||
| * | Whitespace fix | Piotr Dziwinski | 2012-09-20 | 3 | -4/+4 | |
| | | ||||||
| * | Mouse pos setting, low cpu mode, stats display | Piotr Dziwinski | 2012-09-20 | 1 | -15/+19 | |
| | | ||||||
* | | changed paths for models and levels. Now it's possible to load level. | Zaba999 | 2012-09-20 | 1 | -30/+43 | |
|/ | ||||||
* | 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 | |
| | ||||||
* | Input bindings rewrite | Piotr Dziwinski | 2012-09-19 | 4 | -46/+41 | |
| | | | | | | - 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 | 26 | -148/+142 | |
| | ||||||
* | Merge branch 'dev' of https://github.com/adiblol/colobot into dev | Zaba999 | 2012-09-18 | 8 | -37/+37 | |
|\ | | | | | | | | | 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 | 1 | -19/+19 | |
| | | | | | | | | | | | | - 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 | 13 | -305/+283 | |
| | | ||||||
* | | warnings fight in progress. | Zaba999 | 2012-09-18 | 8 | -72/+72 | |
|/ | ||||||
* | Some memory leaks fixed | Piotr Dziwinski | 2012-09-16 | 3 | -18/+41 | |
| | ||||||
* | Interface works | Piotr Dziwinski | 2012-09-16 | 17 | -108/+108 | |
| | | | | | | - 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 | |||||
* | Merge branch 'dev' of github.com:adiblol/colobot into dev | Michał Konopacki | 2012-09-15 | 2 | -674/+725 | |
|\ | ||||||
| * | CMainDialog rewrite | Piotr Dziwinski | 2012-09-15 | 2 | -674/+725 | |
| | | | | | | | | - 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 | 33 | -123/+109 | |
|\ | | | | | | | | | | | | | | | - 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 | |||||
* | | * latest changes | erihel | 2012-09-11 | 22 | -481/+443 | |
| | | | | | | | | | | * all files except studio, map and maindialog should compile * did some code cleanup | |||||
* | | latest changes; few more classes should compile now | erihel | 2012-08-31 | 17 | -537/+442 | |
| | | ||||||
* | | * added nullptr | erihel | 2012-08-21 | 4 | -87/+77 | |
| | | | | | | | | | | * 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 | 17 | -1254/+827 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 6 | -43/+21 | |
| | | | | | | | | | | | | * wrong event function used | |||||
* | | | * minor changes to control.cpp to compile it without errors | erihel | 2012-08-18 | 2 | -15/+15 | |
| | | | ||||||
* | | | * 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 | 6 | -8/+17 | |
| | | | | | | | | | | | | * csoundinterface to ccontrol | |||||
* | | | * changes to ui classes | erihel | 2012-08-17 | 25 | -901/+541 | |
|/ / | ||||||
* / | First approach to port 2D UI Interface | Michał Konopacki | 2012-08-15 | 14 | -369/+395 | |
|/ | | | | | - 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 | |||||
* | Documentation update | Piotr Dziwinski | 2012-08-11 | 1 | -3/+4 | |
| | | | | | | - updated Doxyfile - added/changed file, dir and namespace descriptions - fixed some errors in doxygen tags | |||||
* | Merged changes from dev | Piotr Dziwinski | 2012-07-04 | 1 | -81/+81 | |
| | | | | Resolved conflicts & added fixes. | |||||
* | Removed trailing whitespace | Piotr Dziwinski | 2012-06-26 | 6 | -16/+16 | |
| | ||||||
* | Whitespace and language change | Piotr Dziwinski | 2012-06-26 | 52 | -26287/+26287 | |
| | | | | | | | - changed tabs to spaces and DOS line endings to Unix (except in CBot and metafile) - changed language to English - fixed #include <d3d.h> in d3dengine.h | |||||
* | SDL project | Piotr Dziwinski | 2012-06-25 | 5 | -5/+5 | |
| | | | | | | | | - added (very basic) SDL template in CApplication and CEngine - split project into two targets: colobot_old (dependent on DirectX and WinAPI) and colobot_new (dependent on SDL and OpenGL) - moved sound.h/cpp to old/ and created new template in Snd namespace - added platform-independent dialog boxes in app/system.h/cpp | |||||
* | Templates for new implementation | Piotr Dziwinski | 2012-06-22 | 31 | -80/+80 | |
| | | | | | | - added template of classes/structs for new implementation - changed #include paths - updated README files | |||||
* | Switched to new implementation of the rest of math module | Piotr Dziwinski | 2012-06-19 | 8 | -117/+117 | |
| | | | | | | | | - changed structs from D3DVECTOR to Math::Vector and from D3DMATRIX to Math::Matrix - changed functions to new Math namespace functions - moved mainmovie module from graphics to object - added Get and Set to Math::Matrix | |||||
* | FPOINT -> Math::Point & other math functions | Piotr Dziwinski | 2012-06-13 | 52 | -543/+503 | |
| | | | | | | | | | - changed FPOINT to Math::Point and some functions from math module to the new implementation - moved old function and FPOINT struct declarations to math3d.cpp - removed some unused functions in math module - fixed some #include dependencies - moved #define STRICT and #define D3D_OVERLOADS to compile options | |||||
* | Changed #defined constants to consts; typedef struct -> struct | Piotr Dziwinski | 2012-06-11 | 18 | -80/+74 | |
| |