Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Also fixed the same thing in file writing code | krzys-h | 2014-10-15 | 1 | -4/+9 |
| | |||||
* | Fixed crash when colobot.ini doesn't exist | krzys-h | 2014-10-15 | 1 | -3/+8 |
| | |||||
* | Updated some more license headers | krzys-h | 2014-10-15 | 20 | -300/+360 |
| | |||||
* | Merge branch 'dev' into dev-physfs | krzys-h | 2014-10-14 | 291 | -5177/+5927 |
|\ | | | | | | | | | Conflicts: data | ||||
| * | Changed all occurences of PPC in the code to TerranovaTeam | krzys-h | 2014-10-14 | 293 | -4527/+5275 |
| | | |||||
| * | Clean up translations | Piotr Dziwinski | 2014-10-09 | 1 | -678/+685 |
| | | | | | | | | | | | | * translate only marked strings from restext.cpp * update and clean pot and po files * remove redundant POT-Creation-Data | ||||
| * | Fixed CBot debugger (#325) | krzys-h | 2014-10-07 | 1 | -2/+3 |
| | | |||||
* | | GCC 4.6 compilation fixes | Piotr Dziwinski | 2014-10-07 | 3 | -12/+11 |
| | | |||||
* | | Fixes in unit tests | Piotr Dziwinski | 2014-10-07 | 5 | -14/+47 |
| | | |||||
* | | Merge with dev | Piotr Dziwinski | 2014-10-07 | 22 | -1552/+568 |
|\| | |||||
| * | Fixed issue #324 | krzys-h | 2014-10-07 | 2 | -2/+15 |
| | | |||||
| * | CProfile refactoring | Piotr Dziwinski | 2014-08-12 | 5 | -197/+197 |
| | | |||||
| * | Better CMake organization and unit test cleanups | Piotr Dziwinski | 2014-08-12 | 3 | -172/+200 |
| | | | | | | | | | | | | | | * created a static library containing most source modules to avoid compiling source modules twice in code and unit tests * moved profile_test to main unit tests executable * removed image_test and edit_test as not really useful | ||||
| * | Remove unused accessors from CDevice | Piotr Dziwinski | 2014-08-12 | 3 | -314/+49 |
| | | |||||
| * | Fix task stopping checks in CBrain | Piotr Dziwinski | 2014-08-10 | 2 | -124/+39 |
| | | | | | | | | | | | | This possibly fixes some issues resulting from improperly stopping tasks (CTask::Abort() not called before deleting the task). Found while looking for instances of #318. | ||||
| * | Remove some more delete checks (#318) | Piotr Dziwinski | 2014-08-10 | 4 | -69/+28 |
| | | |||||
| * | Remove unnecessary delete checks (#318) | Piotr Dziwinski | 2014-08-09 | 5 | -23/+9 |
| | | |||||
| * | Fixed #315 | krzys-h | 2014-08-08 | 1 | -4/+4 |
| | | |||||
| * | Fixed #314 | krzys-h | 2014-08-06 | 1 | -2/+2 |
| | | |||||
| * | Removed some unused code | krzys-h | 2014-08-06 | 3 | -620/+0 |
| | | |||||
| * | fixed issue #223 about disabling shadows/ground textures | Mohamed Waheed | 2014-07-12 | 1 | -40/+40 |
| | | |||||
* | | Added %chap% for current chapter directory | krzys-h | 2014-09-29 | 2 | -1/+3 |
| | | |||||
* | | On development builds store savegame data in current directory | krzys-h | 2014-09-29 | 1 | -0/+4 |
| | | |||||
* | | Replaced std::to_string with boost::lexical_cast<std::string> | krzys-h | 2014-09-28 | 4 | -13/+16 |
| | | | | | | | | MXE has problems with std::to_string | ||||
* | | Made proxyDistance optional | krzys-h | 2014-09-27 | 1 | -2/+1 |
| | | |||||
* | | Moved effect??.png textures and made pos= in GroundSpot optional | krzys-h | 2014-09-27 | 4 | -10/+10 |
| | | |||||
* | | Fixed TerrainLevel bug | krzys-h | 2014-09-27 | 1 | -0/+1 |
| | | |||||
* | | Removed more unused variables | krzys-h | 2014-09-27 | 2 | -20/+0 |
| | | |||||
* | | Fixed some warnings | krzys-h | 2014-09-27 | 3 | -14/+8 |
| | | | | | | | | Removed unused variables and fixed signed/unsigned comparation warnings | ||||
* | | Merge branch 'dev-physfs' into dev-physfs-levels | krzys-h | 2014-09-26 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fixed human.png texture | krzys-h | 2014-09-26 | 1 | -1/+1 |
| | | | |||||
* | | | Userlevel listing | krzys-h | 2014-09-26 | 8 | -187/+81 |
| | | | |||||
* | | | Don't use physfs in saving code for now | krzys-h | 2014-09-26 | 2 | -73/+182 |
| | | | | | | | | | | | | | | | This requires too much refactoring and we want to release 0.1.5 soon. We'll need to rewrite saving/loading code to fully implement new level parser anyway. | ||||
* | | | New level parser | krzys-h | 2014-09-24 | 12 | -709/+2179 |
|/ / | | | | | | | | | | | Known issues: * TerrainLevel for some reason doesn't work * %lvl% is not yet implemented everywhere because of hardcoded directories in functions | ||||
* | | Fix zenity version checking problems | Piotr Dziwinski | 2014-09-21 | 1 | -1/+1 |
| | | |||||
* | | Rewrite CMainDialog to use physfs | Piotr Dziwinski | 2014-09-21 | 4 | -183/+139 |
| | | |||||
* | | Some cleaning up | Piotr Dziwinski | 2014-09-21 | 17 | -60/+64 |
| | | |||||
* | | Loading all mods found in "mods" directory | krzys-h | 2014-09-21 | 4 | -1/+43 |
| | | |||||
* | | Restored -datadir and -langdir arguments, added -savedir | krzys-h | 2014-08-06 | 11 | -38/+99 |
| | | | | | | | | Also, fixed some crashes when unable to open file | ||||
* | | Saving colobot.ini through physfs | krzys-h | 2014-07-24 | 12 | -53/+70 |
| | | |||||
* | | Added -mod commandline argument to add additional locations to physfs | krzys-h | 2014-07-24 | 2 | -2/+12 |
| | | |||||
* | | Fixed SatCom image loading | krzys-h | 2014-07-24 | 25 | -155/+158 |
| | | | | | | | | Now LoadTexture/SetTexture functions require full path with "textures/" directory | ||||
* | | Help file loading | krzys-h | 2014-07-11 | 5 | -30/+80 |
| | | |||||
* | | Merge branch 'dev' into dev-physfs | krzys-h | 2014-07-11 | 27 | -606/+110 |
|\| | | | | | | | | | | | | | | | | | Conflicts: data src/app/gamedata.cpp src/ui/control.cpp src/ui/edit.cpp src/ui/maindialog.cpp | ||||
| * | Removed some old stuff related to Ceebot-Teen | krzys-h | 2014-07-10 | 6 | -27/+1 |
| | | |||||
| * | Removed some unused code related to Quit button | krzys-h | 2014-07-10 | 6 | -65/+0 |
| | | | | | | | | The button itself has been removed a long time ago | ||||
| * | Removed old code based on #ifs (issue #55) | krzys-h | 2014-06-27 | 14 | -516/+11 |
| | | |||||
| * | Fix test compilation | Piotr Dziwinski | 2014-06-26 | 1 | -1/+3 |
| | | |||||
| * | Fixed tests | krzys-h | 2014-06-26 | 1 | -2/+18 |
| | | |||||
| * | Fixed not destroying CGameData | krzys-h | 2014-06-26 | 1 | -0/+3 |
| | | | | | | | | This also fixed failing assertion in tests |