summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* * Fixed segault when could not set sound pitch (bad logger call)erihel2012-12-283-19/+21
| | | | | * All 81 audio files should be loaded instead of 69 high quality * Changed volume ajustment formula to proper one
* Replaced malloc/free with new/deletePiotr Dziwinski2012-12-285-53/+69
| | | | | | - now new/delete used everywhere except for CBotStack, which has to be fixed in other way - some segfaults should be fixed with this
* Fixed path for loading soundsPiotr Dziwinski2012-12-282-18/+23
|
* Merge pull request #106 from OdyX/dev-fix-translationsPiotr Dziwiński2012-12-275-144/+462
|\ | | | | Fix translations
| * Update translationsDidier Raboud2012-12-273-135/+369
| | | | | | | | In particular, update french
| * Update colobot.pot using update-potDidier Raboud2012-12-271-6/+91
| |
| * Update translation pot-file and build-targetDidier Raboud2012-12-271-3/+2
| |
* | Merge pull request #105 from OdyX/dev-desktop-file-manPiotr Dziwiński2012-12-276-5/+324
|\ \ | | | | | | Add manpage for colobot
| * | Always build manpagesDidier Raboud2012-12-271-1/+1
| | | | | | | | | | | | solves #105
| * | Merge branch 'dev' into dev-desktop-file-manDidier Raboud2012-12-271-5/+5
| |\|
| * | Add manpage for colobotDidier Raboud2012-12-276-5/+324
| | | | | | | | | | | | | | | - Translate it with po4a - Use POD-format as source, and pod2man for building
* | | Fixed unicode rendering bugPiotr Dziwinski2012-12-271-1/+1
| | |
* | | Merge pull request #107 from OdyX/dev-fix-localesPiotr Dziwiński2012-12-271-5/+8
|\ \ \ | |_|/ |/| | Fix locale's loading
| * | Fix locale's loadingDidier Raboud2012-12-271-5/+8
|/ / | | | | | | | | - Always inherit LC_ALL from environment; - Enforce environment only if the runtime options require it;
* | Merge pull request #104 from OdyX/dev-minor-cmake-grammaer-fixMichał Zieliński2012-12-271-5/+5
|\ \ | | | | | | Minor cmake grammar fix
| * | Minor cmake grammar fixDidier Raboud2012-12-271-5/+5
| | | | | | | | | | | | | | | | | | It is redundant to have CMAKE_INSTALL_PREFIX in path definitions; drop them. Re-do a7d837460f5eeba060900031322d088ba330964c
* | | Merge pull request #103 from OdyX/dev-desktop-fileMichał Zieliński2012-12-2710-1/+383
|\ \ \ | |/ / |/| / | |/ Add desktop and icon files
| * Add SVG colobot iconDidier Raboud2012-12-274-1/+264
| | | | | | | | | | | | - Refer to the icon in the desktop file - Use rsvg-convert to get scaled PNG versions - Add librsvg2-bin to travis
| * Add translated freedesktop 'Desktop Entry' fileDidier Raboud2012-12-279-1/+120
|/ | | | | | - Add po4a as build-dependency for travis (but it fallsback to english-only if not found) - Add (easy) french translation
* * Changed Ret to Get methods in sound moduleerihel2012-12-254-93/+82
| | | | | * Added video settings to profile * Resolution change is now posibble but restart is required
* * Changed log level in sound moduleerihel2012-12-255-8/+12
| | | | | * Fixed warnings in sound module * Fixed problem with map loading when locale with different number separator
* latest changeserihel2012-12-214-8/+14
|
* sound fixerihel2012-12-2011-154/+40
|
* removing plugins for gold version (for mxe cross compiling)erihel2012-12-2021-551/+1
|
* Installation path fixes and CMakeLists refactoringPiotr Dziwinski2012-12-207-43/+55
| | | | make && make install should now give a working installation.
* Switched data submodule to dev branchPiotr Dziwinski2012-12-191-0/+0
|
* Added colobot-data as git submodulePiotr Dziwinski2012-12-193-3/+3
|
* Merge pull request #102 from OdyX/dev-fix_cmake_flagsPiotr Dziwiński2012-12-1910-21/+49
|\ | | | | Fix CMake flags handling
| * Put common CXX flags in common variablesDidier Raboud2012-12-1910-12/+22
| | | | | | | | | | CMAKE_CXX_FLAGS is taken into account in all builds; build-type-specific flags are appended to it.
| * Don't enforce CMake build type on users.Didier Raboud2012-12-199-9/+27
| | | | | | | | Only set CMAKE_BUILD_TYPE to Debug when no value is provided.
* | Merge pull request #101 from OdyX/dev-reduce-dependencies-overloadPiotr Dziwiński2012-12-191-1/+1
|\ \ | |/ |/| Reduce dependencies installation in travis
| * Reduce dependencies installation in travisDidier Raboud2012-12-191-1/+1
|/ | | | Use apt-get's --no-install-recommends.
* Merge pull request #100 from OdyX/dev-fix-rpathkrzys-h2012-12-191-1/+1
|\ | | | | Fix RPath in installed colobot
| * Fix RPath in installed colobotDidier Raboud2012-12-191-1/+1
|/
* Merge pull request #98 from OdyX/dev-travis-ciPiotr Dziwiński2012-12-181-0/+8
|\ | | | | Configure https://travis-ci.org and add travis YAML configuration file.
| * Add travis YAML configuration file.Didier Raboud2012-12-181-0/+8
|/ | | | | This is intended to be used with http://travis-ci.org, which is neatly integrated with Github (and free).
* Merge pull request #97 from OdyX/dev-minor-cmake-grammar-fixkrzys-h2012-12-182-3/+3
|\ | | | | Minor cmake grammar fix
| * Minor cmake grammar fixDidier Raboud2012-12-182-3/+3
| | | | | | | | It is redundant to have CMAKE_INSTALL_PREFIX in path definitions; drop them.
* | Merge pull request #96 from OdyX/dev-build-dockrzys-h2012-12-182-2/+15
|\ \ | |/ |/| Allow building and installation of documentation
| * Allow building and installation of documentationDidier Raboud2012-12-172-2/+15
|/ | | | | | | Run `make doc` for the building. Then `make install` will install the generated documentation. - Move Doxyfile to Doxyfile.in, put CMAKE_CURRENT_SOURCE_DIR into it.
* Merge pull request #95 from OdyX/dev-move-cbot-to-private-libErihel2012-12-173-4/+7
|\ | | | | Install libCBot to a private directory
| * Install libCBot to a private directoryDidier Raboud2012-12-173-4/+7
|/ | | | | | | | closes #90 - Make it configurable; - Move stanzas above the src directory inclusion, otherwise the value doesn't propagate.
* Merge pull request #91 from OdyX/dev-use-installed-i18nErihel2012-12-162-3/+2
|\ | | | | Use default installation paths for i18n.
| * Merge branch 'dev' into dev-use-installed-i18nDidier Raboud2012-12-163-3/+6
| |\ | |/ |/| | | | | Conflicts: src/common/config.h.cmake
* | Merge pull request #92 from OdyX/dev-default-datadirErihel2012-12-163-4/+8
|\ \ | | | | | | Set a default datadir, in sync with the data installation path.
| * | Set a default datadir, in sync with the data installation path.Didier Raboud2012-12-163-4/+8
|/ /
| * Use default installation paths for i18n.Didier Raboud2012-12-162-4/+4
|/ | | | | | This finishes the work started in 19b75e174338f8e7be7486a7445d1e90e9795077 by actually using the translation where they are installed.
* Merge pull request #89 from OdyX/dev-fix-gmockErihel2012-12-160-0/+0
|\ | | | | Fix Google Mock system library building
| * Fix Google Mock system library buildingDidier Raboud2012-12-161-1/+5
| |
* | GMock: fixed using system packagePiotr Dziwinski2012-12-161-1/+5
|/