Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added build | XienDev | 2013-04-27 | 3 | -1/+90 |
| | | | | Third patch | ||||
* | * Patch for issue #167 | erihel | 2013-04-27 | 1 | -1/+4 |
| | |||||
* | Removed find() & repeat() functions | krzys-h | 2013-04-12 | 2 | -147/+0 |
| | | | | Issue #168 | ||||
* | More parameters to destroy() | krzys-h | 2013-03-31 | 1 | -7/+29 |
| | | | | Also, removed some warnings in script.cpp | ||||
* | Added field "item" to class "object" in CBot | krzys-h | 2013-03-31 | 1 | -6/+3 |
| | |||||
* | Added function destroy(rank) | krzys-h | 2013-03-30 | 2 | -0/+40 |
| | |||||
* | Added SatCom translations | krzys-h | 2013-03-29 | 2 | -199/+200 |
| | |||||
* | Revert "Fix for #30" | krzys-h | 2013-03-27 | 1 | -1/+0 |
| | | | | | This reverts commit bfdd52ade09b4f8ee74e5c9c888a5c76fa60f4b8. That wasn't working. :( | ||||
* | Fix for #30 | krzys-h | 2013-03-27 | 1 | -0/+1 |
| | |||||
* | Changes to Scribbler interface | krzys-h | 2013-03-27 | 1 | -0/+1 |
| | |||||
* | * Changed file loading to fix issue #73 | erihel | 2013-03-17 | 1 | -1/+1 |
| | | | | | | | * Moved few functions from misc.cpp to profile.cpp (used to set/get user dir) * Removed some warnings * More work to change const char* to std::string * Some work on file path to fix issue #60 with bad slashes on POSIX platform | ||||
* | MORE improvements to produce() | krzys-h | 2013-03-01 | 1 | -9/+13 |
| | |||||
* | Fix for #135 | krzys-h | 2013-03-01 | 1 | -0/+2 |
| | | | | jet() parameter > 1 | ||||
* | CInstanceManager refactoring | Piotr Dziwiński | 2013-02-17 | 2 | -46/+52 |
| | | | | | | | | | * removed classes managed by CInstanceManager except for CObject, CPyro, CBrain and CPhysics because of dependencies * refactored instance searching to use existing singleton instances of CApplication, CEngine and CRobotMain and calling their getter functions | ||||
* | Another small fix. | krzys-h | 2013-02-14 | 1 | -1/+1 |
| | | | | I'm a noob. Sorry. | ||||
* | Small fix | krzys-h | 2013-02-14 | 1 | -1/+1 |
| | |||||
* | More fixes to produce() | krzys-h | 2013-02-14 | 1 | -56/+89 |
| | | | | Now every object can be created. | ||||
* | Small fix in produce() | krzys-h | 2013-02-14 | 1 | -0/+1 |
| | |||||
* | produce() extended | krzys-h | 2013-02-14 | 1 | -21/+144 |
| | |||||
* | Merge pull request #125 from PaweX/dev | krzys-h | 2013-02-13 | 3 | -5/+25 |
|\ | |||||
| * | Added cAim(CBotVar* &var, void* user) | PaweX | 2013-02-13 | 1 | -0/+1 |
| | | |||||
| * | Update src/script/script.cpp | PaweX | 2013-02-13 | 1 | -1/+1 |
| | | |||||
| * | Function aim(x, y) - "Giv" to "Get" | PaweX | 2013-02-13 | 1 | -4/+4 |
| | | |||||
| * | aim(x,y) - "Giv" to "Get" | PaweX | 2013-02-13 | 1 | -3/+3 |
| | | |||||
| * | Additional parameter for function aim(x, y). | PaweX | 2013-02-13 | 1 | -1/+1 |
| | | |||||
| * | Additional parameter for function aim(x, y). | PaweX | 2013-02-13 | 1 | -4/+23 |
| | | |||||
* | | Added Destroyer from Ceebot-Teen. | krzys-h | 2013-02-13 | 1 | -0/+1 |
|/ | | | | We need a new icon for it. | ||||
* | * Fixes to ingame editor | erihel | 2013-02-09 | 1 | -2/+1 |
| | | | | * Fixes to editor window. It's now possible to resize, move and press buttons | ||||
* | Merge branch 'dev' into dev-graphics | Piotr Dziwinski | 2013-01-04 | 1 | -27/+20 |
|\ | |||||
| * | Replaced malloc/free with new/delete | Piotr Dziwinski | 2012-12-28 | 1 | -14/+19 |
| | | | | | | | | | | | | - now new/delete used everywhere except for CBotStack, which has to be fixed in other way - some segfaults should be fixed with this | ||||
* | | Engine optimization - rewritten model management | Piotr Dziwinski | 2012-12-26 | 1 | -7/+19 |
|/ | | | | | | | | - new class CModelManager - rewritten engine object structure in CEngine - created shared model data instead of separate objects per each model instance - minor refactoring | ||||
* | Doxygen/comment fixes and some #include refactoring | Piotr Dziwinski | 2012-10-17 | 4 | -7/+23 |
| | |||||
* | Merge branch 'dev' of https://github.com/colobot/colobot into dev | Zaba999 | 2012-10-11 | 1 | -0/+1 |
|\ | |||||
| * | Changing and saving input bindings | Piotr Dziwinski | 2012-10-07 | 1 | -0/+1 |
| | | |||||
* | | Added saving user scripts on game save. Fixed bug in writing script to file. | Zaba999 | 2012-10-11 | 1 | -17/+13 |
|/ | |||||
* | Fixed not working message(...) CBot function | adiblol | 2012-09-30 | 1 | -0/+1 |
| | |||||
* | Enabled CBot (experimental) | Piotr Dziwinski | 2012-09-29 | 1 | -14/+17 |
| | |||||
* | Work in progress on opening files, and listing dirs | Zaba999 | 2012-09-26 | 1 | -2/+2 |
| | | | | | Fixed includes profile changed from SimpleIni to boost::ptree -> not finished yet | ||||
* | Warnings cleaned, left only those connected to commented out code. | Zaba999 | 2012-09-18 | 2 | -4/+4 |
| | |||||
* | warnings fight in progress. | Zaba999 | 2012-09-18 | 3 | -10/+11 |
| | |||||
* | changes needeto to cimpile on windows. | Zaba999 | 2012-09-17 | 2 | -18/+19 |
| | |||||
* | Merge dev-common and various fixes to achieve compilation | Piotr Dziwinski | 2012-09-15 | 5 | -41/+19 |
|\ | | | | | | | | | | | | | | | - 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 | ||||
* \ | Merge branch 'dev-ui' into dev | Michał Konopacki | 2012-09-15 | 2 | -9/+9 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | * latest changes | erihel | 2012-09-11 | 2 | -10/+10 |
| |/ | | | | | | | | | * all files except studio, map and maindialog should compile * did some code cleanup | ||||
* / | Merge with changes from Zaba999 fork. | Zaba999 | 2012-09-10 | 6 | -787/+840 |
|/ | |||||
* | Merged changes from dev | Piotr Dziwinski | 2012-07-04 | 1 | -425/+0 |
| | | | | Resolved conflicts & added fixes. | ||||
* | Removed trailing whitespace | Piotr Dziwinski | 2012-06-26 | 2 | -10/+10 |
| | |||||
* | Whitespace and language change | Piotr Dziwinski | 2012-06-26 | 8 | -6089/+6089 |
| | | | | | | | - 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 | ||||
* | Templates for new implementation | Piotr Dziwinski | 2012-06-22 | 4 | -18/+18 |
| | | | | | | - 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 | 4 | -33/+33 |
| | | | | | | | | - 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 |