summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | * changed 0, NULL to nullptrerihel2012-08-0930-78/+7051
| | | | | | | | | | | | | | | | | | | | | * changed profile.cpp to use SimpleIni to load config files * added new CProfile singleton class for loading config * added SimpleIni to lib/ dir * added config loading tests
| * | Changes after mergeerihel2012-08-095-16/+16
| | |
| * | Merge branch 'dev' of https://github.com/adiblol/colobot into deverihel2012-08-09236-23184/+32370
| |\ \ | |/ / |/| | | | | | | | Conflicts: src/sound/sound.h
* | | Whitespace fixPiotr Dziwinski2012-08-0814-6607/+6607
| | |
* | | Merge pull request #35 from konopackim/devPiotr Dziwiński2012-08-08127-17251/+17469
|\ \ \ | |_|/ |/| | Comment translation and cleanups
| * | CleanupsMichał Konopacki2012-08-08109-55/+197
| | |
| * | Transation of comments completeMichał Konopacki2012-08-0810-5538/+5551
| | |
| * | Further CBot translationsMichał Konopacki2012-08-073-6576/+6578
| | |
| * | CBot library comments further translationsMichał Konopacki2012-08-073-2776/+2827
| | |
| * | Commentary translationMichał Konopacki2012-08-033-2633/+2637
| | |
| * | Comments translationMichał Konopacki2012-08-022-91/+97
|/ /
* | Switched to new style castsPiotr Dziwinski2012-07-3014-86/+90
| | | | | | | | | | | | - rewrote old C-style casts to new ..._cast<> - corrected some dangerous casts - added -Wold-style-cast to compile flags
* | Lines and line strip primitivesPiotr Dziwinski2012-07-302-21/+21
| | | | | | | | Will probably be useful
* | CCamera rewritePiotr Dziwinski2012-07-293-118/+1875
| | | | | | | | | | Rewritten old code; doesn't compile yet because changes in other modules are needed.
* | Video mode changingPiotr Dziwinski2012-07-2911-222/+580
| | | | | | | | | | | | - added video mode querying & changing - added joystick querying & changing - cleaned up CApplication interface
* | GLEWPiotr Dziwinski2012-07-286-15/+144
| | | | | | | | Added GLEW for loading OpenGL extensions
* | Updated readme files; added licensePiotr Dziwinski2012-07-274-57/+792
| | | | | | | | | | - updated info in README and HOWTO files - added file with full license
* | Updated Doxygen main pagePiotr Dziwinski2012-07-271-8/+14
| |
* | Whitespace fixPiotr Dziwinski2012-07-275-399/+399
| |
* | Merge branch 'dev' into dev-openglPiotr Dziwinski2012-07-2726-8263/+7914
|\ \ | | | | | | | | | Pulled changes & resolved conflicts
| * | Compile fixesPiotr Dziwinski2012-07-264-3/+5
| | | | | | | | | | | | Fixed some compiling issues
| * | Merge pull request #33 from Zaba999/devPiotr Dziwiński2012-07-2525-8262/+7911
| |\ \ | | | | | | | | Changes in CBot
| | * | Further translations and doxygen comments.Zaba9992012-07-208-3981/+3957
| | | |
| | * | Dependency on WINAPI completely removed.Zaba9992012-07-109-4206/+3879
| | | |
| | * | Fixed code compilation without fpermissive flag.Zaba9992012-07-0421-1790/+1788
| | | | | | | | | | | | | | | | | | | | Removed Winapi, but now library don't work - work in progress. Some translations.
| | * | translations plus small fixesZaba9992012-07-023-43/+45
| | | |
* | | | Change of paths in src/graphicsPiotr Dziwinski2012-07-2642-128/+167
| | | | | | | | | | | | | | | | | | | | - moved abstract core to src/graphics/core - moved proper graphics engine to src/graphics/engine
* | | | Dynamic light managerPiotr Dziwinski2012-07-265-54/+517
| | | | | | | | | | | | | | | | - rewrote old CLight as CLightManager
* | | | LightingPiotr Dziwinski2012-07-266-42/+615
| | | | | | | | | | | | | | | | | | | | - fixed problems with lighting - added light_test
* | | | Fixed bug in texturingPiotr Dziwinski2012-07-253-13/+20
| | | |
* | | | Fix in CMakeLists.txtPiotr Dziwinski2012-07-251-1/+0
| | | |
* | | | Refactoring of texture codePiotr Dziwinski2012-07-2510-290/+274
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - refactored texture structs & functions - added note about OpenGL extensions - removed device.cpp as unnecessary - minor changes in CEngine
* | | | Cursor drawingPiotr Dziwinski2012-07-2311-249/+266
| | | | | | | | | | | | | | | | | | | | - fixed cursor drawing in CEngine - changed event loop to generate more events
* | | | Texture & mouse functions; refactoring & fixesPiotr Dziwinski2012-07-2222-568/+1488
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - cleaned up and added documentation to engine.h - refactored CEngine interface and associated structs - added mouse handling functions in CApplication & CEngine - fixed bugs in projection matrix setting - changed texture loading & handling - added const-values in CDevice & CGLDevice - changed event management in CApplication - other minor changes & bugfixes
* | | | ComputeSphereVisibility functionPiotr Dziwinski2012-07-184-3/+108
| | | | | | | | | | | | | | | | | | | | - borrowed implementation of ComputeSphereVisibility from libwine - added -lrt to Linux libs
* | | | Fixed OpenGL transformationsPiotr Dziwinski2012-07-185-6/+359
| | | | | | | | | | | | | | | | | | | | - fixed wrong order of transformations - added transform_test
* | | | Fixes in texture loadingPiotr Dziwinski2012-07-167-55/+52
| | | | | | | | | | | | | | | | | | | | | | | | - added other texture formats: BGR and BGRA - fixed texture loading in model viewer - moved code from texture.cpp module to texture.h
* | | | Fix in model loading; simple model viewerPiotr Dziwinski2012-07-1517-236/+1080
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixed model loading code - added simple model viewer (model_test) in src/graphics/opengl/test - added system time stamp code - split the code in app/system modules to separate headers - added debug messages in model loading - minor fixes in OpenGL engine
* | | | Minor changesPiotr Dziwinski2012-07-115-816/+38
| | | | | | | | | | | | | | | | | | | | | | | | - moved mainpage src/doc/docmain.doc.txt to src/app/main.cpp - removed old modfile modules from src/common - removed Snd namespace in engine.h
* | | | Rewritten model loadingPiotr Dziwinski2012-07-1113-303/+1305
| | | | | | | | | | | | | | | | | | | | | | | | - 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-0611-399/+239
| | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | Fixed bug with texturingPiotr Dziwinski2012-07-058-106/+526
| | | | | | | | | | | | | | | | | | | | | | | | - moved creation-time tex params to Gfx::TextureCreateParams - fixed bug with texture creation - added simple test for multitexturing
* | | | Merged changes from devPiotr Dziwinski2012-07-0419-741/+1250
| | | | | | | | | | | | | | | | Resolved conflicts & added fixes.
* | | | Multitexturing supportPiotr Dziwinski2012-07-0411-66/+982
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | CGLDevice implementationPiotr Dziwinski2012-07-0116-365/+1173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - extended Gfx::CDevice interface - written OpenGL implementation in Gfx::CGLDevice - rewrote color and light module - added Gfx::VertexCol - added array casts to Math::Vector, Math::Matrix and Gfx::Color
* | | | CDevice interface and stub of implementationPiotr Dziwinski2012-07-0113-119/+608
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added CDevice abstract interface - began implementation of CGLDevice - added stub for Texture struct - created CGLDeviceConfig - changed particule -> particle & other minor changes
* | | | Removed README-DEV-OPENGL to avoid confusionPiotr Dziwinski2012-06-301-4/+0
| | | |
* | | | Joystick polling with timerPiotr Dziwinski2012-06-302-14/+138
| | | | | | | | | | | | | | | | | | | | - added joystick polling through timer - updated documentation on CApplication class
* | | | Switched back to old standard; addded -WallPiotr Dziwinski2012-06-305-58/+45
| | | | | | | | | | | | | | | | | | | | - removed -std=c++11 - added -Wall and removed most reported warnings
* | | | Event handling, CApplication and switch to c++-11Piotr Dziwinski2012-06-308-341/+546
| | | | | | | | | | | | | | | | | | | | | | | | - added/changed event structs and event queue in common/event.h - added event handling and some minor functions in CApplication - switched to --std=c++11 because of union in Event struct