summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | |
| * | | Update .gitignore filesPiotr Dziwinski2014-09-213-0/+6
| | | |
| * | | Rewrite CMainDialog to use physfsPiotr Dziwinski2014-09-214-183/+139
| | | |
| * | | Some cleaning upPiotr Dziwinski2014-09-2117-60/+64
| | | |
| * | | Loading all mods found in "mods" directorykrzys-h2014-09-215-1/+43
| | | |
| * | | Restored -datadir and -langdir arguments, added -savedirkrzys-h2014-08-0611-38/+99
| | | | | | | | | | | | | | | | Also, fixed some crashes when unable to open file
| * | | Saving colobot.ini through physfskrzys-h2014-07-2412-53/+70
| | | |
| * | | Added -mod commandline argument to add additional locations to physfskrzys-h2014-07-242-2/+12
| | | |
| * | | Fixed SatCom image loadingkrzys-h2014-07-2425-155/+158
| | | | | | | | | | | | | | | | Now LoadTexture/SetTexture functions require full path with "textures/" directory
| * | | Help file loadingkrzys-h2014-07-115-30/+80
| | | |
| * | | Merge branch 'dev' into dev-physfskrzys-h2014-07-1139-5365/+5003
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: data src/app/gamedata.cpp src/ui/control.cpp src/ui/edit.cpp src/ui/maindialog.cpp
| * | | | Fixed mission description loadingkrzys-h2014-07-101-7/+8
| | | | |
| * | | | Fixed texture and script loadingkrzys-h2014-07-1023-139/+143
| | | | |
| * | | | Fixed music loadingkrzys-h2014-07-103-18/+17
| | | | |
| * | | | Fixed level listkrzys-h2014-07-101-21/+36
| | | | |
| * | | | Last changesKrzysztof Dermont2014-06-303-49/+39
| | | | |
| * | | | More work on streamsKrzysztof Dermont2014-06-2310-189/+321
| | | | |
| * | | | More work on levelsKrzysztof Dermont2014-06-225-20/+26
| | | | |
| * | | | Added Exist() to resource manager, updated modelKrzysztof Dermont2014-06-223-6/+15
| | | | |
| * | | | More work on PhysFS supportKrzysztof Dermont2014-06-228-17/+103
| | | | | | | | | | | | | | | | | | | | | | | | | * added output stream * fixed music loading