Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Saving scripts on game save should work. Added stub for particle. | Zaba999 | 2012-10-11 | 2 | -1/+292 |
| | |||||
* | Merge branch 'dev' of https://github.com/colobot/colobot into dev | Zaba999 | 2012-10-11 | 32 | -781/+6997 |
|\ | |||||
| * | Removed Gfx:: from license notice (introduced in 8ad15c0e) | Michał Zieliński | 2012-10-08 | 1 | -2/+1 |
| | | |||||
| * | Changing and saving input bindings | Piotr Dziwinski | 2012-10-07 | 13 | -305/+268 |
| | | |||||
| * | Fixed stupid coding mistake in CBotString.cpp | adiblol | 2012-10-07 | 1 | -1/+1 |
| | | |||||
| * | Setting speed now works. Added ability to set 4x and 8x using "speed4" and ↵ | adiblol | 2012-10-06 | 2 | -5/+24 |
| | | | | | | | | "speed8" cheat codes respectively. | ||||
| * | Merge branch 'dev' of github.com:colobot/colobot into dev | Piotr Dziwinski | 2012-10-05 | 1 | -3/+3 |
| |\ | |||||
| | * | Commented out profile_test | Michał Zieliński | 2012-10-05 | 1 | -3/+3 |
| | | | |||||
| * | | Merge branch 'dev-graphics' into dev | Piotr Dziwinski | 2012-10-05 | 14 | -455/+6686 |
| |\ \ | | |/ | |/| | |||||
| | * | Merge remote-tracking branch 'origin/dev' into dev-graphics | adiblol | 2012-10-05 | 1 | -9/+9 |
| | |\ | |||||
| | * | | CParticle rewrite | Piotr Dziwinski | 2012-10-05 | 5 | -287/+3944 |
| | | | | |||||
| | * | | Some CPyro docs | Piotr Dziwinski | 2012-10-05 | 1 | -3/+31 |
| | | | | |||||
| | * | | CLightning rewrite | Piotr Dziwinski | 2012-10-05 | 3 | -50/+387 |
| | | | | |||||
| | * | | CPyro rewrite | Piotr Dziwinski | 2012-10-03 | 2 | -109/+2319 |
| | | | | |||||
| | * | | Spot light angle fix | Piotr Dziwinski | 2012-10-03 | 5 | -8/+7 |
| | | | | |||||
| * | | | Disabled window resize | Piotr Dziwinski | 2012-10-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | Added "make install" target. | Michał Zieliński | 2012-10-05 | 2 | -0/+4 |
| | |/ | |/| | |||||
| * | | 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 | 18 | -34/+293 |
|/ | |||||
* | Merge branch 'dev' into dev-graphics | Piotr Dziwinski | 2012-10-02 | 5 | -297/+166 |
|\ | |||||
| * | Further work on saving profile and directory listing. | Zaba999 | 2012-10-02 | 5 | -297/+166 |
| | | |||||
* | | Merge remote-tracking branch 'origin/dev' into dev-graphics | adiblol | 2012-09-30 | 1 | -0/+1 |
|\| | |||||
| * | Fixed not working message(...) CBot function | adiblol | 2012-09-30 | 1 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/dev' into dev-graphics | adiblol | 2012-09-30 | 1 | -2/+2 |
|\| | |||||
| * | Fixed segfault when using empty strings with CBotString::operator+ | adiblol | 2012-09-30 | 1 | -2/+2 |
| | | |||||
* | | Fixed bugs in texture coloring | Piotr Dziwinski | 2012-09-30 | 3 | -23/+24 |
| | | |||||
* | | Font coloring; fix for resize hack | Piotr Dziwinski | 2012-09-30 | 8 | -67/+82 |
| | | | | | | | | | | | | - added font coloring and changed default color to black - fixed resize hack incorrectly changing video config, but font resizing will not work for now | ||||
* | | Merge remote-tracking branch 'origin/dev' into dev-graphics | adiblol | 2012-09-30 | 1 | -543/+536 |
|\| | |||||
| * | Merge branch 'dev' of github.com:colobot/colobot into dev | adiblol | 2012-09-30 | 1 | -543/+536 |
| |\ | |||||
| | * | Merge branch 'dev' of https://github.com/colobot/colobot into dev | Zaba999 | 2012-09-29 | 44 | -499/+647 |
| | |\ | |||||
| | * | | #48 Adding new users works. | Zaba999 | 2012-09-29 | 1 | -543/+536 |
| | | | | |||||
* | | | | Dirty hack to allow window resizing or even full screen. | adiblol | 2012-09-30 | 5 | -1/+21 |
|/ / / | | | | | | | | | | | | | Currently makes text buggy! (full screen must be initiated by window manager, for example Alt+F11 in Fluxbox) | ||||
* | | | Fixed invradar cheat code. | adiblol | 2012-09-30 | 4 | -16/+40 |
| | | | | | | | | | | | | | | | Replaced CRobotMain::GetCheatRadar with CRobotMain::GetRadar. Changed logger level of "invalid m_motion" messages. | ||||
* | | | Map texture painting | Piotr Dziwinski | 2012-09-30 | 5 | -39/+66 |
| | | | |||||
* | | | Texture coloring | Piotr Dziwinski | 2012-09-29 | 3 | -23/+169 |
| | | | |||||
* | | | Merge branch 'dev-graphics' of github.com:colobot/colobot into dev-graphics | adiblol | 2012-09-29 | 6 | -59/+11 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Fix for transparent objects and fadeouts | Piotr Dziwinski | 2012-09-29 | 6 | -59/+11 |
| | | | |||||
* | | | Fixed CEdit delete[] issues | Piotr Dziwinski | 2012-09-29 | 1 | -6/+6 |
| | | | |||||
* | | | CBotVar SetVal() fix | Piotr Dziwinski | 2012-09-29 | 1 | -1/+1 |
| | | | |||||
* | | | Enabled CBot (experimental) | Piotr Dziwinski | 2012-09-29 | 1 | -14/+17 |
|/ / | |||||
* | | Fixed texture regression | Piotr Dziwinski | 2012-09-29 | 6 | -80/+21 |
| | | | | | | | | | | There was a bug in texture modesetting but only visible after certain mode changes. | ||||
* | | Fixed object selection by clicking | Piotr Dziwinski | 2012-09-29 | 1 | -2/+2 |
| | | |||||
* | | Fixed CEdit cursor | Piotr Dziwinski | 2012-09-29 | 1 | -8/+8 |
| | | |||||
* | | MXE support and CMake files refactoring | Piotr Dziwinski | 2012-09-29 | 3 | -48/+31 |
| | | | | | | | | | | | | - added support for cross-compiling with MXE (http://mxe.cc/) - refactored CMake files, adding some options and moving definitions to more suitable places | ||||
* | | Merge branch 'dev' into dev-graphics | Piotr Dziwinski | 2012-09-29 | 22 | -229/+351 |
|\| | |||||
| * | Small fix in profile + profile_test rewritten to gtest. | Zaba999 | 2012-09-28 | 5 | -39/+49 |
| | | |||||
| * | Merge branch 'master' of https://github.com/colobot/colobot into dev | unknown | 2012-09-28 | 17 | -189/+301 |
| |\ | |||||
| | * | Profile rewritten to boost. Read/write to ini should work. | Zaba999 | 2012-09-27 | 3 | -23/+26 |
| | | | | | | | | | | | | Load/Save should work. | ||||
| | * | Merge branch 'master' of git://github.com/colobot/colobot | Zaba999 | 2012-09-26 | 6 | -67/+65 |
| | |\ | |||||
| | * | | Work in progress on opening files, and listing dirs | Zaba999 | 2012-09-26 | 17 | -187/+296 |
| | | | | | | | | | | | | | | | | | | | | Fixed includes profile changed from SimpleIni to boost::ptree -> not finished yet |