Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'dev-physfs' into dev | krzys-h | 2014-10-19 | 79 | -1900/+3873 | |
|\ \ | | | | | | | | | | | | | Conflicts: src/app/app.cpp | |||||
| * | | Fixed program saving | krzys-h | 2014-10-19 | 1 | -3/+6 | |
| | | | ||||||
| * | | 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 | |||||
| * | | | 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 | |
| |\ \ \ | ||||||
| * | | | | 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 | |||||
| * | | | | | Fixed mission description loading | krzys-h | 2014-07-10 | 1 | -7/+8 | |
| | | | | | | ||||||
| * | | | | | Fixed texture and script loading | krzys-h | 2014-07-10 | 23 | -139/+143 | |
| | | | | | | ||||||
| * | | | | | Fixed music loading | krzys-h | 2014-07-10 | 3 | -18/+17 | |
| | | | | | | ||||||
| * | | | | | Fixed level list | krzys-h | 2014-07-10 | 1 | -21/+36 | |
| | | | | | | ||||||
| * | | | | | Last changes | Krzysztof Dermont | 2014-06-30 | 2 | -49/+39 | |
| | | | | | | ||||||
| * | | | | | More work on streams | Krzysztof Dermont | 2014-06-23 | 10 | -189/+321 | |
| | | | | | | ||||||
| * | | | | | More work on levels | Krzysztof Dermont | 2014-06-22 | 5 | -20/+26 | |
| | | | | | | ||||||
| * | | | | | Added Exist() to resource manager, updated model | Krzysztof Dermont | 2014-06-22 | 3 | -6/+15 | |
| | | | | | | ||||||
| * | | | | | More work on PhysFS support | Krzysztof Dermont | 2014-06-22 | 8 | -17/+103 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added output stream * fixed music loading | |||||
| * | | | | | Implemented libsndfile loader in PhysFS | Krzysztof Dermont | 2014-06-21 | 8 | -61/+253 | |
| | | | | | | ||||||
| * | | | | | Big part of PhysFS support | Krzysztof Dermont | 2014-06-20 | 49 | -841/+678 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * removed -mod argument * removed -datadir argument * removed -lang argument * removed some dead ui code * added resource manager and file loaders (stream and SDL) * changed interface textures location to match new directory structure * removed CGameData for mod support * added PhysFS support | |||||
* | | | | | | Implemented "Apply changes" button (issue #141) | krzys-h | 2014-10-19 | 3 | -64/+16 | |
| | | | | | | ||||||
* | | | | | | Small fix to 72b4228abe583cd953491575cf42bae17ff5e9d2 | krzys-h | 2014-10-19 | 1 | -2/+4 | |
| | | | | | | ||||||
* | | | | | | Possible fix for #331 | krzys-h | 2014-10-19 | 1 | -0/+1 | |
| | | | | | | ||||||
* | | | | | | Changed max and default font size | krzys-h | 2014-10-19 | 3 | -12/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Min font size is 9, max is now 24 (previously 21) Default size is now 19 (previously 9) Closes #330 | |||||
* | | | | | | Added portable build flag | krzys-h | 2014-10-18 | 2 | -0/+7 | |
| |_|_|/ / |/| | | | | ||||||
* | | | | | 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 |