Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed linking convert_model (#332) | krzys-h | 2014-10-25 | 2 | -5/+37 |
| | |||||
* | Change userlevels button text via text file | krzys-h | 2014-10-25 | 1 | -0/+15 |
| | |||||
* | Fixed #344 | krzys-h | 2014-10-25 | 1 | -1/+1 |
| | |||||
* | Fixed #340 | krzys-h | 2014-10-25 | 3 | -86/+34 |
| | |||||
* | Fixed #341 | krzys-h | 2014-10-25 | 1 | -2/+2 |
| | |||||
* | Added support for VBO in OpenGL older than 1.5 if ARB extension is present | Tomasz Kapuściński | 2014-10-24 | 2 | -31/+129 |
| | |||||
* | Merge branch 'vieux-blood_mode' into dev | krzys-h | 2014-10-22 | 7 | -3/+43 |
|\ | | | | | | | | | | | Conflicts: src/common/restext.cpp src/ui/maindialog.cpp | ||||
| * | add option to disable blood | Victor Vieux | 2014-10-21 | 7 | -3/+43 |
| | | |||||
* | | Improved VBO support detection | Tomasz Kapuściński | 2014-10-22 | 1 | -4/+17 |
| | | |||||
* | | Disabled active window resizing that crashes in some software/hardware ↵ | CoLoRaptor | 2014-10-21 | 1 | -2/+2 |
| | | | | | | | | configurations | ||||
* | | Fixed map turning gray after resizing window | krzys-h | 2014-10-20 | 5 | -8/+18 |
| | | |||||
* | | Fixed save directories in things not yet refactored to use PHYSFS | krzys-h | 2014-10-20 | 7 | -22/+45 |
| | | |||||
* | | Possibly fixed goto() by changing safety margin | krzys-h | 2014-10-20 | 1 | -3/+8 |
| | | | | | | | | | | | | TODO: More testing Closes #326 | ||||
* | | 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 |
| | | | | | |