Commit Graph

384 Commits (571cc96523cc5dce0151677e6da1f317ac846866)

Author SHA1 Message Date
erihel 01cc0fbc49 * latest changes
* all files except studio, map and maindialog should compile
* did some code cleanup
2012-09-11 12:49:41 +02:00
erihel 6ba0f42f22 latest changes; few more classes should compile now 2012-08-31 22:28:07 +02:00
erihel 5408fe9252 * added nullptr
* changed Ret to Get function names
* minor changes
2012-08-21 21:38:13 +02:00
erihel 4faa1b9c44 merged changes from michkon 2012-08-21 20:55:03 +02:00
erihel 75a76e8252 latest changes 2012-08-21 20:53:39 +02:00
Michał Konopacki 1997682808 added ui/shortcut.* 2012-08-21 15:23:59 +02:00
Michał Konopacki 60950ce66b Typo fix 2012-08-20 21:45:17 +02:00
Michał Konopacki af45bc399f added ui/scroll.* 2012-08-20 21:42:07 +02:00
Michał Konopacki 59ec83c409 added ui/slider.* 2012-08-20 21:35:11 +02:00
Michał Konopacki 02dc368a38 added ui/target.* 2012-08-20 21:31:16 +02:00
Michał Konopacki bd9c581ced added ui/window.* -- not fully ported 2012-08-20 21:22:24 +02:00
Michał Konopacki 7a4ec2adc4 Merge remote-tracking branch 'erihel/dev-ui' into dev-ui
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
2012-08-20 15:12:26 +02:00
Michał Konopacki 8666d35f7c UI porting 2012-08-20 14:05:36 +02:00
Michał Konopacki 574c07e388 Further improvements in UI porting 2012-08-18 22:56:42 +02:00
erihel 8d4a3ed579 * wrong enum used for text alignment
* wrong event function used
2012-08-18 21:04:51 +02:00
erihel 48ad79a03c * minor changes to control.cpp to compile it without errors 2012-08-18 11:30:29 +02:00
erihel c02ac93379 * list.cpp compiles 2012-08-17 23:56:29 +02:00
erihel a00032d075 * ui/label.cpp compiles 2012-08-17 23:05:59 +02:00
erihel ea6269c411 * ui/key.cpp compiles
* csoundinterface to ccontrol
2012-08-17 23:03:52 +02:00
erihel c2464d4c71 * changes to ui classes 2012-08-17 22:43:07 +02:00
Michał Konopacki 10b2c562fb First approach to port 2D UI Interface
- 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
2012-08-15 01:48:49 +02:00
Piotr Dziwinski 1996507fd3 Documentation update
- updated Doxyfile
- added/changed file, dir and namespace descriptions
- fixed some errors in doxygen tags
2012-08-11 18:39:16 +02:00
Piotr Dziwinski af3057df7e Merged changes from dev
Resolved conflicts & added fixes.
2012-07-04 19:56:22 +02:00
Piotr Dziwinski c2a7375788 Removed trailing whitespace 2012-06-26 23:01:17 +02:00
Piotr Dziwinski ebed57aa22 Whitespace and language change
- 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
2012-06-26 22:23:05 +02:00
Piotr Dziwinski b08a63790c SDL project
- 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
2012-06-25 19:59:17 +02:00
Piotr Dziwinski 8bb223e679 Templates for new implementation
- added template of classes/structs for new implementation
- changed #include paths
- updated README files
2012-06-22 16:31:55 +02:00
Piotr Dziwinski 9f784e81f8 Switched to new implementation of the rest of math module
- 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
2012-06-19 20:11:47 +02:00
Piotr Dziwinski b735913deb FPOINT -> Math::Point & other math functions
- 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
2012-06-13 22:48:35 +02:00
Piotr Dziwinski a8665d2042 Changed #defined constants to consts; typedef struct -> struct 2012-06-11 17:28:27 +02:00
Piotr Dziwinski 697fbdabf1 BOOL -> bool; additional fixes in constructors/destructors 2012-06-10 15:28:12 +02:00
Piotr Dziwinski 680af17819 Fixed include paths and CMakeLists.txt
Additionally, changed #ifndef to #pragma once everywhere
2012-06-10 00:18:08 +02:00
Piotr Dziwinski d6525b5661 Changes from master 2012-06-08 20:30:57 +02:00
Piotr Dziwinski 449cc186d5 Source files split into modules 2012-04-28 17:53:17 +02:00