summaryrefslogtreecommitdiffstats
path: root/src/ui
Commit message (Collapse)AuthorAgeFilesLines
* Changes in Ui, solves part of #47Michał Konopacki2012-09-1917-77/+77
|
* Mouse wheel fixesPiotr Dziwinski2012-09-195-28/+28
|
* Input bindings rewritePiotr Dziwinski2012-09-194-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.Zaba9992012-09-1926-148/+142
|
* Merge branch 'dev' of https://github.com/adiblol/colobot into devZaba9992012-09-188-37/+37
|\ | | | | | | | | Conflicts: src/ui/slider.cpp
| * Fixed invalid text alignmentPiotr Dziwinski2012-09-187-19/+19
| |
| * Change of background image handlingPiotr Dziwinski2012-09-171-19/+19
| | | | | | | | | | | | - removed old 4 quarter backgrounds - fixes in texture loading - other minor fixes
* | Warnings cleaned, left only those connected to commented out code.Zaba9992012-09-1813-305/+283
| |
* | warnings fight in progress.Zaba9992012-09-188-72/+72
|/
* Some memory leaks fixedPiotr Dziwinski2012-09-163-18/+41
|
* Interface worksPiotr Dziwinski2012-09-1617-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 devMichał Konopacki2012-09-152-674/+725
|\
| * CMainDialog rewritePiotr Dziwinski2012-09-152-674/+725
| | | | | | | | - rewritten CMainDialog and updated CRobotMain
* | [src/ui] CStudio compilesMichał Konopacki2012-09-152-155/+169
|/
* Merge dev-common and various fixes to achieve compilationPiotr Dziwinski2012-09-1533-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 changeserihel2012-09-1122-481/+443
| | | | | | | | | | * all files except studio, map and maindialog should compile * did some code cleanup
* | latest changes; few more classes should compile nowerihel2012-08-3117-537/+442
| |
* | * added nullptrerihel2012-08-214-87/+77
| | | | | | | | | | * changed Ret to Get function names * minor changes
* | merged changes from michkonerihel2012-08-2134-1358/+1542
|\ \
| * | added ui/shortcut.*Michał Konopacki2012-08-212-31/+40
| | |
| * | Typo fixMichał Konopacki2012-08-201-1/+1
| | |
| * | added ui/scroll.*Michał Konopacki2012-08-202-34/+46
| | |
| * | added ui/slider.*Michał Konopacki2012-08-202-9/+14
| | |
| * | added ui/target.*Michał Konopacki2012-08-202-32/+38
| | |
| * | added ui/window.* -- not fully portedMichał Konopacki2012-08-202-133/+155
| | |
| * | Merge remote-tracking branch 'erihel/dev-ui' into dev-uiMichał Konopacki2012-08-2017-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 portingMichał Konopacki2012-08-204-335/+383
| | | |
| * | | Further improvements in UI portingMichał Konopacki2012-08-1822-803/+891
| | | |
* | | | latest changeserihel2012-08-215-399/+378
| |/ / |/| |
* | | * wrong enum used for text alignmenterihel2012-08-186-43/+21
| | | | | | | | | | | | * wrong event function used
* | | * minor changes to control.cpp to compile it without errorserihel2012-08-182-15/+15
| | |
* | | * list.cpp compileserihel2012-08-176-380/+332
| | |
* | | * ui/label.cpp compileserihel2012-08-171-2/+2
| | |
* | | * ui/key.cpp compileserihel2012-08-176-8/+17
| | | | | | | | | | | | * csoundinterface to ccontrol
* | | * changes to ui classeserihel2012-08-1725-901/+541
|/ /
* / First approach to port 2D UI InterfaceMichał Konopacki2012-08-1514-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 updatePiotr Dziwinski2012-08-111-3/+4
| | | | | | - updated Doxyfile - added/changed file, dir and namespace descriptions - fixed some errors in doxygen tags
* Merged changes from devPiotr Dziwinski2012-07-041-81/+81
| | | | Resolved conflicts & added fixes.
* Removed trailing whitespacePiotr Dziwinski2012-06-266-16/+16
|
* Whitespace and language changePiotr Dziwinski2012-06-2652-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 projectPiotr Dziwinski2012-06-255-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 implementationPiotr Dziwinski2012-06-2231-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 modulePiotr Dziwinski2012-06-198-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 functionsPiotr Dziwinski2012-06-1352-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 -> structPiotr Dziwinski2012-06-1118-80/+74
|
* BOOL -> bool; additional fixes in constructors/destructorsPiotr Dziwinski2012-06-1052-1190/+1188
|
* Fixed include paths and CMakeLists.txtPiotr Dziwinski2012-06-1052-457/+406
| | | | Additionally, changed #ifndef to #pragma once everywhere
* Changes from masterPiotr Dziwinski2012-06-081-1/+1
|
* Source files split into modulesPiotr Dziwinski2012-04-2853-0/+26389
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-08 18:54:32 +0000