summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | But do 182d5206a8dcdbf112e5e2099a71c8dc82b9ffa1 only on Windows, since it ↵krzys-h2014-10-251-0/+2
| | | | | | | | works correctly on Linux
* | Disable resolution settings in simulationkrzys-h2014-10-251-1/+1
| |
* | Fixed NewScript (#341)krzys-h2014-10-251-3/+1
| |
* | Fixed #340 againkrzys-h2014-10-251-3/+7
| |
* | Fixed linking convert_model (#332)krzys-h2014-10-252-5/+37
| |
* | Change userlevels button text via text filekrzys-h2014-10-251-0/+15
| |
* | Fixed #344krzys-h2014-10-251-1/+1
| |
* | Fixed #340krzys-h2014-10-253-86/+34
| |
* | Fixed #341krzys-h2014-10-251-2/+2
| |
* | Updated data submodulekrzys-h2014-10-251-0/+0
| |
* | Added support for VBO in OpenGL older than 1.5 if ARB extension is presentTomasz Kapuściński2014-10-242-31/+129
|/
* Updated translationskrzys-h2014-10-225-0/+15
|
* Merge branch 'vieux-blood_mode' into devkrzys-h2014-10-227-3/+43
|\ | | | | | | | | | | Conflicts: src/common/restext.cpp src/ui/maindialog.cpp
| * add option to disable bloodVictor Vieux2014-10-217-3/+43
| |
* | Improved VBO support detectionTomasz Kapuściński2014-10-221-4/+17
| |
* | Disabled active window resizing that crashes in some software/hardware ↵CoLoRaptor2014-10-211-2/+2
| | | | | | | | configurations
* | Fixed map turning gray after resizing windowkrzys-h2014-10-205-8/+18
| |
* | Fixed save directories in things not yet refactored to use PHYSFSkrzys-h2014-10-207-22/+45
| |
* | Possibly fixed goto() by changing safety marginkrzys-h2014-10-201-3/+8
| | | | | | | | | | | | TODO: More testing Closes #326
* | Updated README with new dependencieskrzys-h2014-10-192-1/+3
| |
* | Updated data submodulekrzys-h2014-10-191-0/+0
| |
* | Merge branch 'dev-physfs' into devkrzys-h2014-10-1989-1907/+3933
|\ \ | | | | | | | | | | | | Conflicts: src/app/app.cpp
| * | Fixed program savingkrzys-h2014-10-191-3/+6
| | |
| * | Also fixed the same thing in file writing codekrzys-h2014-10-151-4/+9
| | |
| * | Fixed crash when colobot.ini doesn't existkrzys-h2014-10-151-3/+8
| | |
| * | Updated some more license headerskrzys-h2014-10-1520-300/+360
| | |
| * | Merge branch 'dev' into dev-physfskrzys-h2014-10-14328-10909/+10993
| |\ \ | | | | | | | | | | | | | | | | Conflicts: data
| * | | Updated data submodulePiotr Dziwinski2014-10-071-0/+0
| | | |
| * | | GCC 4.6 compilation fixesPiotr Dziwinski2014-10-073-12/+11
| | | |
| * | | Fixes in unit testsPiotr Dziwinski2014-10-077-16/+49
| | | |
| * | | Add physfs to travis configPiotr Dziwinski2014-10-071-1/+1
| | | |
| * | | Merge with devPiotr Dziwinski2014-10-0738-2483/+669
| |\ \ \
| * | | | Added %chap% for current chapter directorykrzys-h2014-09-292-1/+3
| | | | |
| * | | | On development builds store savegame data in current directorykrzys-h2014-09-291-0/+4
| | | | |
| * | | | Updated data submodulekrzys-h2014-09-291-0/+0
| | | | |
| * | | | Replaced std::to_string with boost::lexical_cast<std::string>krzys-h2014-09-284-13/+16
| | | | | | | | | | | | | | | | | | | | MXE has problems with std::to_string
| * | | | Updated data submodulekrzys-h2014-09-271-0/+0
| | | | |
| * | | | Made proxyDistance optionalkrzys-h2014-09-271-2/+1
| | | | |
| * | | | Updated level check scriptkrzys-h2014-09-271-4/+14
| | | | |
| * | | | Moved effect??.png textures and made pos= in GroundSpot optionalkrzys-h2014-09-275-10/+10
| | | | |
| * | | | Fixed TerrainLevel bugkrzys-h2014-09-271-0/+1
| | | | |
| * | | | Removed more unused variableskrzys-h2014-09-272-20/+0
| | | | |
| * | | | Fixed some warningskrzys-h2014-09-273-14/+8
| | | | | | | | | | | | | | | | | | | | Removed unused variables and fixed signed/unsigned comparation warnings
| * | | | Merge branch 'dev-physfs' into dev-physfs-levelskrzys-h2014-09-262-1/+1
| |\ \ \ \
| | * | | | Fixed human.png texturekrzys-h2014-09-262-1/+1
| | | | | |
| * | | | | Userlevel listingkrzys-h2014-09-268-187/+81
| | | | | |
| * | | | | Don't use physfs in saving code for nowkrzys-h2014-09-262-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 parserkrzys-h2014-09-2412-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 problemsPiotr Dziwinski2014-09-211-1/+1
| | | | |
| * | | | Updated data submodulePiotr Dziwinski2014-09-211-0/+0
| | | | |