summaryrefslogtreecommitdiffstats
path: root/src/ui/maindialog.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/adiblol/colobot into devZaba9992012-09-181-19/+19
|\ | | | | | | | | Conflicts: src/ui/slider.cpp
| * 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-181-222/+220
| |
* | warnings fight in progress.Zaba9992012-09-181-3/+3
|/
* Some memory leaks fixedPiotr Dziwinski2012-09-161-1/+1
|
* Interface worksPiotr Dziwinski2012-09-161-1/+1
| | | | | | - 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
* CMainDialog rewritePiotr Dziwinski2012-09-151-622/+662
| | | | - rewritten CMainDialog and updated CRobotMain
* Merge dev-common and various fixes to achieve compilationPiotr Dziwinski2012-09-151-2/+0
|\ | | | | | | | | | | | | | | - 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-111-14/+0
|/ | | | | * all files except studio, map and maindialog should compile * did some code cleanup
* Merged changes from devPiotr Dziwinski2012-07-041-81/+81
| | | | Resolved conflicts & added fixes.
* Removed trailing whitespacePiotr Dziwinski2012-06-261-8/+8
|
* Whitespace and language changePiotr Dziwinski2012-06-261-6935/+6935
| | | | | | | - 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-251-1/+1
| | | | | | | | - 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-221-6/+6
| | | | | | - 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-191-14/+14
| | | | | | | | - 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-131-98/+96
| | | | | | | | | - 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-111-4/+4
|
* BOOL -> bool; additional fixes in constructors/destructorsPiotr Dziwinski2012-06-101-222/+222
|
* Fixed include paths and CMakeLists.txtPiotr Dziwinski2012-06-101-32/+32
| | | | Additionally, changed #ifndef to #pragma once everywhere
* Source files split into modulesPiotr Dziwinski2012-04-281-0/+6937