summaryrefslogtreecommitdiffstats
path: root/src/ui/control.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into dev-physfskrzys-h2014-10-141-16/+18
|\ | | | | | | | | Conflicts: data
| * Changed all occurences of PPC in the code to TerranovaTeamkrzys-h2014-10-141-16/+18
| |
* | Fixed SatCom image loadingkrzys-h2014-07-241-7/+7
| | | | | | | | Now LoadTexture/SetTexture functions require full path with "textures/" directory
* | Merge branch 'dev' into dev-physfskrzys-h2014-07-111-4/+0
|\| | | | | | | | | | | | | | | | | Conflicts: data src/app/gamedata.cpp src/ui/control.cpp src/ui/edit.cpp src/ui/maindialog.cpp
| * Removed old code based on #ifs (issue #55)krzys-h2014-06-271-4/+0
| |
* | Fixed texture and script loadingkrzys-h2014-07-101-8/+8
| |
* | Big part of PhysFS supportKrzysztof Dermont2014-06-201-8/+8
|/ | | | | | | | | | | * removed -mod argument * removed -datadir argument * removed -lang argument * removed some dead ui code * added resource manager and file loaders (stream and SDL) * changed interface textures location to match new directory structure * removed CGameData for mod support * added PhysFS support
* Changed char[] to std::string in restextPiotr Dziwinski2013-12-041-8/+18
| | | | Experimental changes
* Buffer overflow fixPiotr Dziwinski2013-11-131-1/+1
|
* Fixed code formattingPiotr Dziwinski2013-05-271-5/+12
| | | | | | * moved braces to new lines * fixed some function/variable names * fixed whitespace issues
* CInstanceManager refactoringPiotr Dziwiński2013-02-171-10/+8
| | | | | | | | | * removed classes managed by CInstanceManager except for CObject, CPyro, CBrain and CPhysics because of dependencies * refactored instance searching to use existing singleton instances of CApplication, CEngine and CRobotMain and calling their getter functions
* Added saving user scripts on game save. Fixed bug in writing script to file.Zaba9992012-10-111-1/+0
|
* Event fixes & refactoringPiotr Dziwinski2012-09-221-6/+6
| | | | | | - added new state tracking to Event - removed old fields from Event - fixed some issues with Events and fps counter
* Whitespace fixPiotr Dziwinski2012-09-201-2/+2
|
* Changes in Ui, solves part of #47Michał Konopacki2012-09-191-2/+2
|
* Fixed includes in ui.Zaba9992012-09-191-1/+1
|
* Interface worksPiotr Dziwinski2012-09-161-8/+8
| | | | | | - 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
* * latest changeserihel2012-09-111-2/+1
| | | | | * all files except studio, map and maindialog should compile * did some code cleanup
* latest changes; few more classes should compile nowerihel2012-08-311-75/+29
|
* Further improvements in UI portingMichał Konopacki2012-08-181-96/+97
|
* First approach to port 2D UI InterfaceMichał Konopacki2012-08-151-120/+129
| | | | | - 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
* Whitespace and language changePiotr Dziwinski2012-06-261-874/+874
| | | | | | | - 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-4/+4
| | | | | | - 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-50/+50
| | | | | | | | - 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-29/+27
| | | | | | | | | - 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
* BOOL -> bool; additional fixes in constructors/destructorsPiotr Dziwinski2012-06-101-34/+34
|
* Fixed include paths and CMakeLists.txtPiotr Dziwinski2012-06-101-14/+14
| | | | Additionally, changed #ifndef to #pragma once everywhere
* Source files split into modulesPiotr Dziwinski2012-04-281-0/+876