summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Auto-update from Pootle 2014-07-11krzys-h2014-07-115-4782/+4792
| | | | | | | | This commit was automatically generated from http://translations.colobot.info/
| * Merge branch 'dev' of github.com:colobot/colobot into devkrzys-h2014-07-105-88/+96
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: po/de.po po/fr.po po/pl.po po/ru.po
| | * Auto-update from Pootle 2014-07-10krzys-h2014-07-101-10/+10
| | | | | | | | | | | | | | | This commit was automatically generated from http://translations.colobot.info/ (actually, this is just a manual test commit with some Polish translations :p)
| | * Initial Pootle<->Git integration commitkrzys-h2014-07-105-4810/+4825
| | | | | | | | | | | | This commit was automatically generated from http://translations.colobot.info/
| * | Removed some old stuff related to Ceebot-Teenkrzys-h2014-07-1011-47/+18
| |/
| * Removed some unused code related to Quit buttonkrzys-h2014-07-1011-106/+160
| | | | | | | | The button itself has been removed a long time ago
| * Updated data submodulePiotr Dziwinski2014-07-091-0/+0
| |
| * Post-release 0.1.3-alphakrzys-h2014-07-011-2/+2
| |
| * Release 0.1.3-alphakrzys-h2014-07-01106-2862/+2978
| |\
| | * Removed old code based on #ifs (issue #55)krzys-h2014-06-2714-516/+11
| | |
| | * Updated submoduleKrzysztof Dermont2014-06-261-0/+0
| | |
| | * Fix test compilationPiotr Dziwinski2014-06-263-5/+7
| | |
| | * Fixed testskrzys-h2014-06-262-9/+31
| | |
| | * 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 CMake git branch detection with build dir outside of repository ↵krzys-h2014-06-251-0/+2
| | | | | | | | | | | | working dir
| | * Fix test compilationPiotr Dziwinski2014-06-241-0/+2
| | |
| | * Merge pull request #304 from MohamedWaheed/devPiotr Dziwiński2014-06-248-25/+99
| | |\ | | | | | | | | Savefile screenshot implementation and screenshot loading bug fix
| | | * fixed savefile screenshot loading bugMohamed Waheed2014-06-241-19/+16
| | | |
| | | * formatting and enhancements for savefile screenshot featureMohamed Waheed2014-06-245-27/+24
| | | |
| | | * implemented savefile screenshot featureMohamed Waheed2014-06-247-6/+86
| | | |
| | * | Fix test compilationPiotr Dziwinski2014-06-245-14/+6
| | |/
| | * Updated data submodulekrzys-h2014-06-191-0/+0
| | |
| * | Corrected markdown formatting in INSTALLPiotr Dziwinski2013-11-262-29/+52
| | |
| * | Colobot Gold 0.1.2-alphaPiotr Dziwinski2013-11-2641-301/+2616
| |\ \
| * | | Fixed version codename (-alpha)Piotr Dziwinski2013-11-031-2/+2
| | | |
| * | | Colobot Gold 0.1.1-alphaPiotr Dziwinski2013-11-0359-279/+370
| |\ \ \
| * | | | Do not change master branch unless you REALLY know what U R doing!adiblol2013-09-231-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Added '-game' launch option" This reverts commit 2891c2ea4ce2e7c844d1e93db71dcfa8ad2ca100.
* | | | | 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
* | | | | Implemented libsndfile loader in PhysFSKrzysztof Dermont2014-06-218-61/+253
| | | | |
* | | | | Big part of PhysFS supportKrzysztof Dermont2014-06-2052-841/+715
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * removed -mod argument * removed -datadir argument * removed -lang argument * removed some dead ui code * added resource manager and file loaders (stream and SDL) * changed interface textures location to match new directory structure * removed CGameData for mod support * added PhysFS support
* | | | Remove dead codePiotr Dziwinski2014-06-011-6/+0
| | | |
* | | | Better datadir mod supportkrzys-h2014-05-1819-193/+286
| | | |
* | | | Random relief generatorkrzys-h2014-04-103-1/+69
| | | |
* | | | Updated data submodulekrzys-h2014-04-101-0/+0
| | | |
* | | | Updated INSTALL filekrzys-h2014-04-022-1/+12
| | | |
* | | | Merge pull request #297 from kosmakoff/devkrzys-h2014-03-251-1/+7
|\ \ \ \ | | | | | | | | | | Fixes #271
| * | | | Fixes #271Oleg Kosmakov2014-03-251-1/+7
| | | | |
* | | | | Merge pull request #296 from kosmakoff/devkrzys-h2014-03-215-134/+179
|\| | | | | | | | | | | | | | Fixes for issue #295