Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into dev-graphics | Piotr Dziwinski | 2013-01-04 | 1 | -4/+8 |
|\ | |||||
| * | Implement language Char for level files | Didier Raboud | 2012-12-28 | 1 | -4/+4 |
| | | | | | | | | This currently lacks fallback to an existing entry for non-translated entries | ||||
| * | * Changed log level in sound module | erihel | 2012-12-25 | 1 | -0/+4 |
| | | | | | | | | | | * Fixed warnings in sound module * Fixed problem with map loading when locale with different number separator | ||||
* | | Engine optimization - rewritten model management | Piotr Dziwinski | 2012-12-26 | 1 | -2/+2 |
|/ | | | | | | | | - new class CModelManager - rewritten engine object structure in CEngine - created shared model data instead of separate objects per each model instance - minor refactoring | ||||
* | Removed unnecessary dynamic_casts | Piotr Dziwinski | 2012-10-17 | 1 | -18/+16 |
| | |||||
* | Merge branch 'dev' of https://github.com/colobot/colobot into dev | Zaba999 | 2012-10-11 | 1 | -119/+137 |
|\ | |||||
| * | Changing and saving input bindings | Piotr Dziwinski | 2012-10-07 | 1 | -105/+105 |
| | | |||||
| * | Setting speed now works. Added ability to set 4x and 8x using "speed4" and ↵ | adiblol | 2012-10-06 | 1 | -5/+23 |
| | | | | | | | | "speed8" cheat codes respectively. | ||||
| * | Refactoring: changed UNIT to g_unit in CRobotMain class | adiblol | 2012-10-05 | 1 | -9/+9 |
| | | |||||
* | | Added saving user scripts on game save. Fixed bug in writing script to file. | Zaba999 | 2012-10-11 | 1 | -1/+1 |
|/ | |||||
* | Fixed invradar cheat code. | adiblol | 2012-09-30 | 1 | -2/+31 |
| | | | | | Replaced CRobotMain::GetCheatRadar with CRobotMain::GetRadar. Changed logger level of "invalid m_motion" messages. | ||||
* | Texture coloring | Piotr Dziwinski | 2012-09-29 | 1 | -16/+16 |
| | |||||
* | Fixed object selection by clicking | Piotr Dziwinski | 2012-09-29 | 1 | -2/+2 |
| | |||||
* | Merge branch 'dev' into dev-graphics | Piotr Dziwinski | 2012-09-29 | 1 | -22/+25 |
|\ | |||||
| * | Work in progress on opening files, and listing dirs | Zaba999 | 2012-09-26 | 1 | -22/+25 |
| | | | | | | | | | | Fixed includes profile changed from SimpleIni to boost::ptree -> not finished yet | ||||
* | | Fixed blinking light problem | Piotr Dziwinski | 2012-09-27 | 1 | -3/+3 |
| | | | | | | | | | | | | - temporarily commented out misbehaving code in CPhysics - some fixes in CLightManager - minor refactoring in CRobotMain | ||||
* | | Lighting fix (experimental) | Piotr Dziwinski | 2012-09-26 | 1 | -3/+5 |
|/ | | | | | - changed fixed light allocation to prioritized per-use basis - minor refactoring in CPlanet and CWater | ||||
* | Various fixes | Piotr Dziwinski | 2012-09-22 | 1 | -20/+23 |
| | | | | | | | | - disabled UserDir() in path lookup - fixed crashes on loading missions in CObject - fixed texture bug in CTerrain - changed mouse move event handling to avoid flooding event queue - enabled all missions for testing | ||||
* | Data dir paths | Piotr Dziwinski | 2012-09-22 | 1 | -13/+13 |
| | | | | | - changed access to paths in data directory in CApplication - models now load from data directory | ||||
* | Event fixes & refactoring | Piotr Dziwinski | 2012-09-22 | 1 | -5/+5 |
| | | | | | | - added new state tracking to Event - removed old fields from Event - fixed some issues with Events and fps counter | ||||
* | robotmain, restext and engine fixes | Piotr Dziwinski | 2012-09-21 | 1 | -0/+5 |
| | |||||
* | Mouse pos setting, low cpu mode, stats display | Piotr Dziwinski | 2012-09-20 | 1 | -14/+23 |
| | |||||
* | Mouse wheel events, motion vectors | Piotr Dziwinski | 2012-09-19 | 1 | -4/+104 |
| | | | | | | - added mouse wheel events - added motion vectors to CRobotMain - other minor changes in event.h | ||||
* | Input bindings rewrite | Piotr Dziwinski | 2012-09-19 | 1 | -54/+106 |
| | | | | | | - moved input bindings to CRobotMain - added virtual keymod and joystick button key presses - fixed putenv error; other minor fixes | ||||
* | Warnings cleaned, left only those connected to commented out code. | Zaba999 | 2012-09-18 | 1 | -1/+1 |
| | |||||
* | warnings fight in progress. | Zaba999 | 2012-09-18 | 1 | -51/+49 |
| | |||||
* | changes needeto to cimpile on windows. | Zaba999 | 2012-09-17 | 1 | -6/+6 |
| | |||||
* | Some memory leaks fixed | Piotr Dziwinski | 2012-09-16 | 1 | -2/+24 |
| | |||||
* | CMainDialog rewrite | Piotr Dziwinski | 2012-09-15 | 1 | -64/+65 |
| | | | | - rewritten CMainDialog and updated CRobotMain | ||||
* | Merge dev-common and various fixes to achieve compilation | Piotr Dziwinski | 2012-09-15 | 1 | -4/+4 |
|\ | | | | | | | | | | | | | | | - 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 | 1 | -2983/+2103 |
| | | | | | | | | | | - rewritten CRobotMain - won't compile yet because of dependencies to CMainDialog | ||||
* | | Merge with changes from Zaba999 fork. | Zaba999 | 2012-09-10 | 1 | -26/+26 |
|/ | |||||
* | Merge pull request #37 from konopackim/dev | Piotr Dziwiński | 2012-08-13 | 1 | -66/+66 |
|\ | | | | | Fixes and console interpreter | ||||
| * | Changed GivAttrName() to GetAttrName() | Michał Konopacki | 2012-08-11 | 1 | -66/+66 |
| | | |||||
| * | 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 | 1 | -8/+8 |
| | |||||
* | Whitespace and language change | Piotr Dziwinski | 2012-06-26 | 1 | -7032/+7032 |
| | | | | | | | - 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 | 1 | -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 | ||||
* | Declarations for graphics/common | Programerus | 2012-06-25 | 1 | -1/+1 |
| | |||||
* | Templates for new implementation | Piotr Dziwinski | 2012-06-22 | 1 | -14/+14 |
| | | | | | | - added template of classes/structs for new implementation - changed #include paths - updated README files | ||||
* | Switched to new implementation of the rest of math module | Piotr Dziwinski | 2012-06-19 | 1 | -62/+63 |
| | | | | | | | | - 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 | 1 | -88/+88 |
| | | | | | | | | | - 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 | 1 | -1/+1 |
| | |||||
* | BOOL -> bool; additional fixes in constructors/destructors | Piotr Dziwinski | 2012-06-10 | 1 | -285/+285 |
| | |||||
* | Fixed include paths and CMakeLists.txt | Piotr Dziwinski | 2012-06-10 | 1 | -54/+54 |
| | | | | Additionally, changed #ifndef to #pragma once everywhere | ||||
* | Source files split into modules | Piotr Dziwinski | 2012-04-28 | 1 | -0/+7031 |