summaryrefslogtreecommitdiffstats
path: root/src/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* changes needeto to cimpile on windows.Zaba9992012-09-171-0/+1
|
* Successful compilation & runningPiotr Dziwinski2012-09-151-1/+1
| | | | | | | - temporarily mocked CSoundInterface and CPluginInterface - added CRobotMain to application - successfully compiles & runs, but doesn't display correctly at the moment
* CMainDialog rewritePiotr Dziwinski2012-09-151-2/+2
| | | | - rewritten CMainDialog and updated CRobotMain
* Merge dev-common and various fixes to achieve compilationPiotr Dziwinski2012-09-151-34/+33
|\ | | | | | | | | | | | | | | - 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
| * Tests rewrite and Doxygen in src/mathPiotr Dziwinski2012-09-111-0/+1
| | | | | | | | | | | | - rewritten tests to use new framework - updated/reformatted Doxygen - removed legacy conversions
| * Refactoring in src/commonPiotr Dziwinski2012-09-091-6/+8
| | | | | | | | | | - refactored CInstanceManager and some headers - removed old headers
* | Merge branch 'dev-object' into devMichał Konopacki2012-09-151-61/+61
|\ \ | | | | | | | | | | | | | | | Conflicts: src/object/robotmain.cpp src/object/robotmain.h
| * | Fixes in [object/auto]Michał Konopacki2012-09-131-26/+26
| | |
| * | [object/motion] Folder compilesMichał Konopacki2012-09-131-9/+9
| | |
| * | all tasks compile.Zaba9992012-09-121-7/+7
| | |
| * | commented part of tasks that does not compile.Zaba9992012-09-111-7/+7
| | |
| * | half of task compile.Zaba9992012-09-111-26/+26
| | |
* | | Merge branch 'dev-ui' into devMichał Konopacki2012-09-151-2/+5
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/CMakeLists.txt src/common/misc.cpp src/common/misc.h src/object/robotmain.cpp src/object/robotmain.h src/script/cbottoken.cpp src/script/cbottoken.h src/ui/button.cpp src/ui/button.h src/ui/check.cpp src/ui/check.h src/ui/color.cpp src/ui/color.h src/ui/compass.cpp src/ui/compass.h src/ui/control.cpp src/ui/control.h src/ui/displayinfo.cpp src/ui/displayinfo.h src/ui/displaytext.cpp src/ui/displaytext.h src/ui/edit.cpp src/ui/edit.h src/ui/gauge.cpp src/ui/gauge.h src/ui/interface.cpp src/ui/interface.h src/ui/key.cpp src/ui/map.h src/ui/shortcut.h src/ui/slider.h src/ui/target.cpp src/ui/target.h src/ui/window.cpp src/ui/window.h
| * | Merge branch 'dev' of https://github.com/adiblol/colobot into dev-uierihel2012-09-031-1/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/common/restext.cpp src/common/restext.h
| * | | latest changes; few more classes should compile nowerihel2012-08-311-2/+2
| | | |
| * | | * wrong enum used for text alignmenterihel2012-08-181-4/+4
| | | | | | | | | | | | | | | | * wrong event function used
| * | | * minor changes to control.cpp to compile it without errorserihel2012-08-181-5/+6
| | | |
* | | | commented new part in cmakelist and reverted stubs in camera.cpp. Will be ↵Zaba9992012-09-101-5/+5
| | | | | | | | | | | | | | | | commited later after implementation is finished in dev-object branch.
* | | | Merge with changes from Zaba999 fork.Zaba9992012-09-101-5/+6
| | | |
* | | | Commenting out src/object/auto temporarilyPiotr Dziwinski2012-09-091-26/+26
| | | |
* | | | [src/object/auto] Folder rewrittenMichał Konopacki2012-09-091-26/+26
| |_|/ |/| |
* | | Merge branch 'dev' into dev-graphicsPiotr Dziwinski2012-09-091-1/+2
|\ \ \ | | |/ | |/|
| * | Move strings out of restext. Add i18n via gettextAlexander Monakov2012-08-251-1/+2
| |/
* | CModelFile fixes; test frameworkPiotr Dziwinski2012-09-081-0/+3
| | | | | | | | | | | | - fixes in CModelFile IO - added Google Test framework for automatic testing - rewrote modelfile_test in the new framework
* | New model file formatPiotr Dziwinski2012-08-311-1/+4
|/ | | | | | | - added new binary and text formats for models - fixes and improvements in CModelFile - tool for converting model files - minor additions and fixes
* Graphics stubsPiotr Dziwinski2012-08-091-1/+1
| | | | | | | - added stubs for functions in CLightning, CParticle and CPyro - cleaned object.h and physics.h headers - created temporary stubs to compile CCamera - other necessary changes to compile successfully
* Basic font renderingPiotr Dziwinski2012-08-031-0/+1
| | | | | - added basic font rendering - minor refactoring & fixes
* CCamera rewritePiotr Dziwinski2012-07-291-1/+1
| | | | | Rewritten old code; doesn't compile yet because changes in other modules are needed.
* GLEWPiotr Dziwinski2012-07-281-0/+24
| | | | Added GLEW for loading OpenGL extensions
* Merge branch 'dev' into dev-openglPiotr Dziwinski2012-07-271-2/+3
|\ | | | | | | Pulled changes & resolved conflicts
| * Merge pull request #33 from Zaba999/devPiotr Dziwiński2012-07-251-2/+3
| |\ | | | | | | Changes in CBot
| | * Fixed code compilation without fpermissive flag.Zaba9992012-07-041-2/+3
| | | | | | | | | | | | | | | Removed Winapi, but now library don't work - work in progress. Some translations.
| * | Enabled logging & minor fixesPiotr Dziwinski2012-07-041-1/+2
| |/ | | | | | | | | | | - added logger to main() - removed reference to Snd namespace and renamed back to sound.h - fixed minor issues
* | Change of paths in src/graphicsPiotr Dziwinski2012-07-261-13/+13
| | | | | | | | | | - moved abstract core to src/graphics/core - moved proper graphics engine to src/graphics/engine
* | Fix in CMakeLists.txtPiotr Dziwinski2012-07-251-1/+0
| |
* | Cursor drawingPiotr Dziwinski2012-07-231-1/+0
| | | | | | | | | | - fixed cursor drawing in CEngine - changed event loop to generate more events
* | ComputeSphereVisibility functionPiotr Dziwinski2012-07-181-0/+5
| | | | | | | | | | - borrowed implementation of ComputeSphereVisibility from libwine - added -lrt to Linux libs
* | Fixes in texture loadingPiotr Dziwinski2012-07-161-1/+0
| | | | | | | | | | | | - added other texture formats: BGR and BGRA - fixed texture loading in model viewer - moved code from texture.cpp module to texture.h
* | Rewritten model loadingPiotr Dziwinski2012-07-111-2/+2
| | | | | | | | | | | | - written new implementation of CModelFile (old CModFile) - added stringutils and ioutils in src/common - removed old CModel (model viewer)
* | Refactoring in math & texture modulesPiotr Dziwinski2012-07-061-0/+1
| | | | | | | | | | | | - moved texture-related structs to texture.h & code to texture.cpp - cleaned up texture test code - added Math:: namespace qualifiers to math modules for clarity
* | Merged changes from devPiotr Dziwinski2012-07-041-1/+2
| | | | | | | | Resolved conflicts & added fixes.
* | Multitexturing supportPiotr Dziwinski2012-07-041-1/+8
|/ | | | | | | | - added CImage class for loading/saving images and a simple test for it - added libpng library to build - added Gfx::Texture struct - updated the Gfx::CDevice interface to include new features - implemented the new features in Gfx::CGLDevice
* Removed old code and build targetPiotr Dziwinski2012-06-261-168/+33
| | | | | | | - removed directory with old target - changed CMakeLists.txt to new target only and temporarily commented out reference to CBot - updated README
* SDL projectPiotr Dziwinski2012-06-251-29/+163
| | | | | | | | - 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
* Declarations for graphics/commonProgramerus2012-06-251-1/+2
|
* CApplication and Gfx::CEngine interfaces & otherPiotr Dziwinski2012-06-241-0/+2
| | | | | | | | - added CApplication and Gfx::CEngine interfaces - added Gfx::Material struct - added Math::IntPoint struct - added template for Gfx::CDevice class - added templates for Gfx::CGLDevice and Gfx::CGLEngine classes
* Templates for new implementationPiotr Dziwinski2012-06-221-12/+26
| | | | | | - 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-2/+2
| | | | | | | | - 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-0/+2
| | | | | | | | | - 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
* Fixed include paths and CMakeLists.txtPiotr Dziwinski2012-06-101-119/+121
| | | | Additionally, changed #ifndef to #pragma once everywhere
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-09 03:22:48 +0000