summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/colobot/colobot into devZaba9992012-10-1132-781/+6997
|\
| * Removed Gfx:: from license notice (introduced in 8ad15c0e)Michał Zieliński2012-10-081-2/+1
| * Changing and saving input bindingsPiotr Dziwinski2012-10-0713-305/+268
| * Fixed stupid coding mistake in CBotString.cppadiblol2012-10-071-1/+1
| * Setting speed now works. Added ability to set 4x and 8x using "speed4" and "s...adiblol2012-10-062-5/+24
| * Merge branch 'dev' of github.com:colobot/colobot into devPiotr Dziwinski2012-10-051-3/+3
| |\
| | * Commented out profile_testMichał Zieliński2012-10-051-3/+3
| * | Merge branch 'dev-graphics' into devPiotr Dziwinski2012-10-0514-455/+6686
| |\ \ | | |/ | |/|
| | * Merge remote-tracking branch 'origin/dev' into dev-graphicsadiblol2012-10-051-9/+9
| | |\
| | * | CParticle rewritePiotr Dziwinski2012-10-055-287/+3944
| | * | Some CPyro docsPiotr Dziwinski2012-10-051-3/+31
| | * | CLightning rewritePiotr Dziwinski2012-10-053-50/+387
| | * | CPyro rewritePiotr Dziwinski2012-10-032-109/+2319
| | * | Spot light angle fixPiotr Dziwinski2012-10-035-8/+7
| * | | Disabled window resizePiotr Dziwinski2012-10-051-1/+1
| * | | Added "make install" target.Michał Zieliński2012-10-052-0/+4
| | |/ | |/|
| * | Refactoring: changed UNIT to g_unit in CRobotMain classadiblol2012-10-051-9/+9
| |/
* / Added saving user scripts on game save. Fixed bug in writing script to file.Zaba9992012-10-1118-34/+293
|/
* Merge branch 'dev' into dev-graphicsPiotr Dziwinski2012-10-025-297/+166
|\
| * Further work on saving profile and directory listing.Zaba9992012-10-025-297/+166
* | Merge remote-tracking branch 'origin/dev' into dev-graphicsadiblol2012-09-301-0/+1
|\|
| * Fixed not working message(...) CBot functionadiblol2012-09-301-0/+1
* | Merge remote-tracking branch 'origin/dev' into dev-graphicsadiblol2012-09-301-2/+2
|\|
| * Fixed segfault when using empty strings with CBotString::operator+adiblol2012-09-301-2/+2
* | Fixed bugs in texture coloringPiotr Dziwinski2012-09-303-23/+24
* | Font coloring; fix for resize hackPiotr Dziwinski2012-09-308-67/+82
* | Merge remote-tracking branch 'origin/dev' into dev-graphicsadiblol2012-09-301-543/+536
|\|
| * Merge branch 'dev' of github.com:colobot/colobot into devadiblol2012-09-301-543/+536
| |\
| | * Merge branch 'dev' of https://github.com/colobot/colobot into devZaba9992012-09-2944-499/+647
| | |\
| | * | #48 Adding new users works.Zaba9992012-09-291-543/+536
* | | | Dirty hack to allow window resizing or even full screen.adiblol2012-09-305-1/+21
|/ / /
* | | Fixed invradar cheat code.adiblol2012-09-304-16/+40
* | | Map texture paintingPiotr Dziwinski2012-09-305-39/+66
* | | Texture coloringPiotr Dziwinski2012-09-293-23/+169
* | | Merge branch 'dev-graphics' of github.com:colobot/colobot into dev-graphicsadiblol2012-09-296-59/+11
|\ \ \ | |_|/ |/| |
| * | Fix for transparent objects and fadeoutsPiotr Dziwinski2012-09-296-59/+11
* | | Fixed CEdit delete[] issuesPiotr Dziwinski2012-09-291-6/+6
* | | CBotVar SetVal() fixPiotr Dziwinski2012-09-291-1/+1
* | | Enabled CBot (experimental)Piotr Dziwinski2012-09-291-14/+17
|/ /
* | Fixed texture regressionPiotr Dziwinski2012-09-296-80/+21
* | Fixed object selection by clickingPiotr Dziwinski2012-09-291-2/+2
* | Fixed CEdit cursorPiotr Dziwinski2012-09-291-8/+8
* | MXE support and CMake files refactoringPiotr Dziwinski2012-09-293-48/+31
* | Merge branch 'dev' into dev-graphicsPiotr Dziwinski2012-09-2922-229/+351
|\|
| * Small fix in profile + profile_test rewritten to gtest.Zaba9992012-09-285-39/+49
| * Merge branch 'master' of https://github.com/colobot/colobot into devunknown2012-09-2817-189/+301
| |\
| | * Profile rewritten to boost. Read/write to ini should work.Zaba9992012-09-273-23/+26
| | * Merge branch 'master' of git://github.com/colobot/colobotZaba9992012-09-266-67/+65
| | |\
| | * | Work in progress on opening files, and listing dirsZaba9992012-09-2617-187/+296
| * | | * Fixed Issue #54: flags don't show in 3D viewerihel2012-09-281-1/+1