Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | But do 182d5206a8dcdbf112e5e2099a71c8dc82b9ffa1 only on Windows, since it ↵ | krzys-h | 2014-10-25 | 1 | -0/+2 |
| | | | | works correctly on Linux | ||||
* | Disable resolution settings in simulation | krzys-h | 2014-10-25 | 1 | -1/+1 |
| | |||||
* | Fixed NewScript (#341) | krzys-h | 2014-10-25 | 1 | -3/+1 |
| | |||||
* | Fixed #340 again | krzys-h | 2014-10-25 | 1 | -3/+7 |
| | |||||
* | 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 |
| | |||||
* | Updated data submodule | krzys-h | 2014-10-25 | 1 | -0/+0 |
| | |||||
* | 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 |
| | |||||
* | Updated translations | krzys-h | 2014-10-22 | 5 | -0/+15 |
| | |||||
* | 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 | ||||
* | | Updated README with new dependencies | krzys-h | 2014-10-19 | 2 | -1/+3 |
| | | |||||
* | | Updated data submodule | krzys-h | 2014-10-19 | 1 | -0/+0 |
| | | |||||
* | | Merge branch 'dev-physfs' into dev | krzys-h | 2014-10-19 | 89 | -1907/+3933 |
|\ \ | | | | | | | | | | | | | 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 | 328 | -10909/+10993 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: data | ||||
| * | | | Updated data submodule | Piotr Dziwinski | 2014-10-07 | 1 | -0/+0 |
| | | | | |||||
| * | | | GCC 4.6 compilation fixes | Piotr Dziwinski | 2014-10-07 | 3 | -12/+11 |
| | | | | |||||
| * | | | Fixes in unit tests | Piotr Dziwinski | 2014-10-07 | 7 | -16/+49 |
| | | | | |||||
| * | | | Add physfs to travis config | Piotr Dziwinski | 2014-10-07 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge with dev | Piotr Dziwinski | 2014-10-07 | 38 | -2483/+669 |
| |\ \ \ | |||||
| * | | | | 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 |
| | | | | | |||||
| * | | | | Updated data submodule | krzys-h | 2014-09-29 | 1 | -0/+0 |
| | | | | | |||||
| * | | | | 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 | ||||
| * | | | | Updated data submodule | krzys-h | 2014-09-27 | 1 | -0/+0 |
| | | | | | |||||
| * | | | | Made proxyDistance optional | krzys-h | 2014-09-27 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | Updated level check script | krzys-h | 2014-09-27 | 1 | -4/+14 |
| | | | | | |||||
| * | | | | Moved effect??.png textures and made pos= in GroundSpot optional | krzys-h | 2014-09-27 | 5 | -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 | 2 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Fixed human.png texture | krzys-h | 2014-09-26 | 2 | -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 |
| | | | | | |||||
| * | | | | Updated data submodule | Piotr Dziwinski | 2014-09-21 | 1 | -0/+0 |
| | | | | |