Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Mouse wheel events, motion vectors | Piotr Dziwinski | 2012-09-19 | 3 | -10/+146 |
| | | | | | | - added mouse wheel events - added motion vectors to CRobotMain - other minor changes in event.h | ||||
* | Input bindings rewrite | Piotr Dziwinski | 2012-09-19 | 3 | -61/+138 |
| | | | | | | - moved input bindings to CRobotMain - added virtual keymod and joystick button key presses - fixed putenv error; other minor fixes | ||||
* | Merge branch 'dev' of https://github.com/adiblol/colobot into dev | Zaba999 | 2012-09-18 | 1 | -3/+3 |
|\ | | | | | | | | | Conflicts: src/ui/slider.cpp | ||||
| * | Change of background image handling | Piotr Dziwinski | 2012-09-17 | 1 | -3/+3 |
| | | | | | | | | | | | | - removed old 4 quarter backgrounds - fixes in texture loading - other minor fixes | ||||
* | | Warnings cleaned, left only those connected to commented out code. | Zaba999 | 2012-09-18 | 2 | -2/+2 |
| | | |||||
* | | warnings fight in progress. | Zaba999 | 2012-09-18 | 5 | -66/+61 |
|/ | |||||
* | changes needeto to cimpile on windows. | Zaba999 | 2012-09-17 | 4 | -16/+16 |
| | |||||
* | Some memory leaks fixed | Piotr Dziwinski | 2012-09-16 | 1 | -2/+24 |
| | |||||
* | Interface works | Piotr Dziwinski | 2012-09-16 | 4 | -11/+11 |
| | | | | | | - 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 rewrite | Piotr Dziwinski | 2012-09-15 | 2 | -65/+66 |
| | | | | - rewritten CMainDialog and updated CRobotMain | ||||
* | Merge dev-common and various fixes to achieve compilation | Piotr Dziwinski | 2012-09-15 | 38 | -209/+156 |
|\ | | | | | | | | | | | | | | | - 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 | ||||
* | | CRobotMain rewrite | Piotr Dziwinski | 2012-09-15 | 5 | -3107/+2226 |
| | | | | | | | | | | - rewritten CRobotMain - won't compile yet because of dependencies to CMainDialog | ||||
* | | brain.* mainmovie.* : Partially rewritten | Michał Konopacki | 2012-09-13 | 4 | -232/+235 |
| | | | | | | | | The remaining part will be revised and rewritten after merge with dev and dev-ui branches | ||||
* | | Fixes in [object/auto] | Michał Konopacki | 2012-09-13 | 4 | -14/+17 |
| | | |||||
* | | [object/motion] Folder compiles | Michał Konopacki | 2012-09-13 | 12 | -534/+534 |
| | | |||||
* | | all tasks compile. | Zaba999 | 2012-09-12 | 10 | -266/+248 |
| | | |||||
* | | Merge branch 'dev-object' of github.com:adiblol/colobot into dev-object | Michał Konopacki | 2012-09-11 | 22 | -816/+670 |
|\ \ | |||||
| * | | half of task compile. | Zaba999 | 2012-09-11 | 22 | -816/+670 |
| | | | |||||
* | | | [src/object] motion.* motionant.* motionbee.* should compile | Michał Konopacki | 2012-09-11 | 5 | -161/+165 |
|/ / | |||||
* | | Merge with changes from Zaba999 fork. | Zaba999 | 2012-09-10 | 14 | -1135/+1127 |
| | | |||||
* | | [src/object/auto] Folder rewritten | Michał Konopacki | 2012-09-09 | 52 | -1141/+1196 |
|/ | |||||
* | Move ObjectType enum to a separate file | Alexander Monakov | 2012-08-25 | 2 | -245/+263 |
| | |||||
* | Merge pull request #37 from konopackim/dev | Piotr Dziwiński | 2012-08-13 | 6 | -106/+106 |
|\ | | | | | Fixes and console interpreter | ||||
| * | Changed GivAttrName() to GetAttrName() | Michał Konopacki | 2012-08-11 | 6 | -106/+106 |
| | | |||||
* | | Merge branch 'dev-opengl' into dev | erihel | 2012-08-12 | 2 | -118/+121 |
|\ \ | |||||
| * | | Documentation update | Piotr Dziwinski | 2012-08-11 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | | | - updated Doxyfile - added/changed file, dir and namespace descriptions - fixed some errors in doxygen tags | ||||
| * | | Partial CEngine implementation | Piotr Dziwinski | 2012-08-10 | 1 | -6/+3 |
| | | | | | | | | | | | | | | | - added rewritten implementation for basic modesetting in CEngine - started rewriting proper rendering and object handling in CEngine | ||||
| * | | Graphics stubs | Piotr Dziwinski | 2012-08-09 | 1 | -109/+111 |
| |/ | | | | | | | | | | | | | - 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 | ||||
| * | Merged changes from dev | Piotr Dziwinski | 2012-07-04 | 1 | -23/+430 |
| | | | | | | | | Resolved conflicts & added fixes. | ||||
* | | * New CPluginManager class for managing plugins based on colobot.ini | erihel | 2012-08-12 | 1 | -1/+1 |
| | | | | | | | | | | * Moved sound plugin into sound dir * Minor changes in logger and profile | ||||
* | | Deleted #include "ClassFILE.cpp" code. | Programerus | 2012-07-01 | 1 | -1/+408 |
| | | |||||
* | | Pulled changes from master branch | Piotr Dziwinski | 2012-06-28 | 1 | -22/+22 |
|/ | |||||
* | Removed trailing whitespace | Piotr Dziwinski | 2012-06-26 | 16 | -47/+47 |
| | |||||
* | Whitespace and language change | Piotr Dziwinski | 2012-06-26 | 120 | -52925/+52925 |
| | | | | | | | - 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 project | Piotr Dziwinski | 2012-06-25 | 4 | -4/+4 |
| | | | | | | | | - 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/common | Programerus | 2012-06-25 | 10 | -10/+10 |
| | |||||
* | Templates for new implementation | Piotr Dziwinski | 2012-06-22 | 36 | -90/+90 |
| | | | | | | - added template of classes/structs for new implementation - changed #include paths - updated README files | ||||
* | Refactoring of #includes and forward declarations in object/ | Piotr Dziwinski | 2012-06-20 | 116 | -1453/+222 |
| | |||||
* | Switched to new implementation of the rest of math module | Piotr Dziwinski | 2012-06-19 | 94 | -1788/+2132 |
| | | | | | | | | - 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 functions | Piotr Dziwinski | 2012-06-13 | 87 | -1807/+1696 |
| | | | | | | | | | - 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 -> struct | Piotr Dziwinski | 2012-06-11 | 39 | -193/+209 |
| | |||||
* | BOOL -> bool; additional fixes in constructors/destructors | Piotr Dziwinski | 2012-06-10 | 118 | -2390/+2336 |
| | |||||
* | Fixed include paths and CMakeLists.txt | Piotr Dziwinski | 2012-06-10 | 118 | -1507/+1344 |
| | | | | Additionally, changed #ifndef to #pragma once everywhere | ||||
* | Changes from master | Piotr Dziwinski | 2012-06-08 | 33 | -66/+0 |
| | |||||
* | Source files split into modules | Piotr Dziwinski | 2012-04-28 | 119 | -0/+54193 |