summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into debianDidier Raboud2012-12-2917-148/+240
|\
| * Merge pull request #108 from OdyX/dev-central-cmake-versionPiotr Dziwiński2012-12-299-21/+42
| |\ | | | | | | Create a central version
| | * Create a central versionDidier Raboud2012-12-279-21/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | Make it 0.1.0~pre-alpha for now. - Add it to runtime program - Add it to -help option - Add it to manpage - Update translations
| * | Merge pull request #109 from OdyX/dev-more-language-fixesPiotr Dziwiński2012-12-294-56/+106
| |\ \ | | | | | | | | Some more language fixes
| | * | Implement language Char for level filesDidier Raboud2012-12-284-15/+59
| | | | | | | | | | | | | | | | This currently lacks fallback to an existing entry for non-translated entries
| | * | Move language initialisation in SetLanguageDidier Raboud2012-12-281-42/+48
| |/ /
| * | 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
| |/
* | Install -common content in -common packageDidier Raboud2012-12-271-0/+1
| |
* | Use new data submoduleDidier Raboud2012-12-271-0/+0
| |
* | Update build-depends' listDidier Raboud2012-12-271-0/+3
| |
* | Install colobot icons and desktop filesDidier Raboud2012-12-271-0/+5
| |
* | Merge branch 'dev' into debianDidier Raboud2012-12-2719-155/+1177
|\| | | | | | | | | Conflicts: .travis.yml
| * 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
* | Build with OpenAL + ALUT support.Didier Raboud2012-12-262-1/+4
| |
* | Merge branch 'dev' into debianDidier Raboud2012-12-2630-813/+147
|\| | | | | | | Drop libltdl-dev.
| * * 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
| |
* | Add a doc-base for the Doxygen documentation.Didier Raboud2012-12-201-0/+10
| |
* | Install docs during make installDidier Raboud2012-12-201-1/+2
| |
* | Merge branch 'dev' into debianDidier Raboud2012-12-2020-67/+106
|\| | | | | | | | | Conflicts: .travis.yml
| * 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.
* | Specify build-type RelWithDebInfo in debian/rules.Didier Raboud2012-12-191-0/+3
| |
* | Make debug package priority extraDidier Raboud2012-12-191-0/+1
| |
* | Reduce dependencies installation in travisDidier Raboud2012-12-191-3/+3
| | | | | | | | Use apt-get's --no-install-recommends.