summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into dev-physfskrzys-h2014-10-14291-5177/+5927
|\ | | | | | | | | Conflicts: data
| * Changed all occurences of PPC in the code to TerranovaTeamkrzys-h2014-10-14293-4527/+5275
| |
| * Clean up translationsPiotr Dziwinski2014-10-091-678/+685
| | | | | | | | | | | | * translate only marked strings from restext.cpp * update and clean pot and po files * remove redundant POT-Creation-Data
| * Fixed CBot debugger (#325)krzys-h2014-10-071-2/+3
| |
* | GCC 4.6 compilation fixesPiotr Dziwinski2014-10-073-12/+11
| |
* | Fixes in unit testsPiotr Dziwinski2014-10-075-14/+47
| |
* | Merge with devPiotr Dziwinski2014-10-0722-1552/+568
|\|
| * Fixed issue #324krzys-h2014-10-072-2/+15
| |
| * CProfile refactoringPiotr Dziwinski2014-08-125-197/+197
| |
| * Better CMake organization and unit test cleanupsPiotr Dziwinski2014-08-123-172/+200
| | | | | | | | | | | | | | * created a static library containing most source modules to avoid compiling source modules twice in code and unit tests * moved profile_test to main unit tests executable * removed image_test and edit_test as not really useful
| * Remove unused accessors from CDevicePiotr Dziwinski2014-08-123-314/+49
| |
| * Fix task stopping checks in CBrainPiotr Dziwinski2014-08-102-124/+39
| | | | | | | | | | | | This possibly fixes some issues resulting from improperly stopping tasks (CTask::Abort() not called before deleting the task). Found while looking for instances of #318.
| * Remove some more delete checks (#318)Piotr Dziwinski2014-08-104-69/+28
| |
| * Remove unnecessary delete checks (#318)Piotr Dziwinski2014-08-095-23/+9
| |
| * Fixed #315krzys-h2014-08-081-4/+4
| |
| * Fixed #314krzys-h2014-08-061-2/+2
| |
| * Removed some unused codekrzys-h2014-08-063-620/+0
| |
| * fixed issue #223 about disabling shadows/ground texturesMohamed Waheed2014-07-121-40/+40
| |
* | 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
| |
* | Replaced std::to_string with boost::lexical_cast<std::string>krzys-h2014-09-284-13/+16
| | | | | | | | MXE has problems with std::to_string
* | Made proxyDistance optionalkrzys-h2014-09-271-2/+1
| |
* | Moved effect??.png textures and made pos= in GroundSpot optionalkrzys-h2014-09-274-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-261-1/+1
|\ \
| * | Fixed human.png texturekrzys-h2014-09-261-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
| |
* | 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-214-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-1127-606/+110
|\| | | | | | | | | | | | | | | | | Conflicts: data src/app/gamedata.cpp src/ui/control.cpp src/ui/edit.cpp src/ui/maindialog.cpp
| * Removed some old stuff related to Ceebot-Teenkrzys-h2014-07-106-27/+1
| |
| * Removed some unused code related to Quit buttonkrzys-h2014-07-106-65/+0
| | | | | | | | The button itself has been removed a long time ago
| * Removed old code based on #ifs (issue #55)krzys-h2014-06-2714-516/+11
| |
| * Fix test compilationPiotr Dziwinski2014-06-261-1/+3
| |
| * Fixed testskrzys-h2014-06-261-2/+18
| |
| * Fixed not destroying CGameDatakrzys-h2014-06-261-0/+3
| | | | | | | | This also fixed failing assertion in tests
| * Fixed negative parameter in fire() (issue #305)krzys-h2014-06-261-10/+12
| | | | | | | | Also fixed checking parameter count and type for ants, spiders and shooters
| * fixed savefile screenshot loading bugMohamed Waheed2014-06-241-19/+16
| |
| * formatting and enhancements for savefile screenshot featureMohamed Waheed2014-06-245-27/+24
| |