Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #115 from OdyX/dev-add-categories-to-desktop-file | Michał Zieliński | 2013-01-02 | 1 | -0/+1 |
|\ | | | | | Add categories to Desktop Entry file | ||||
| * | Add categories to Desktop Entry file | Didier Raboud | 2013-01-02 | 1 | -0/+1 |
|/ | | | | As per the "Desktop Menu Specification" 1.0, especially Appendix A. | ||||
* | Merge branch 'master' into dev | Piotr Dziwinski | 2012-12-29 | 1 | -22/+26 |
|\ | |||||
| * | Merge of master and dev | Piotr Dziwinski | 2012-12-29 | 29 | -340/+1082 |
| | | |||||
| * | Revert "Merge branch 'dev-desktop-file-man' of https://github.com/OdyX/colobot" | Michał Zieliński | 2012-12-27 | 6 | -324/+5 |
| | | | | | | | | | | This reverts commit 9f3acdcdde36ece74a848370776b2751d20f1c3d, reversing changes made to fb13c0f219282ef888562fb0fcbbeefd915307d4. | ||||
| * | Merge branch 'dev-desktop-file-man' of https://github.com/OdyX/colobot | Michał Zieliński | 2012-12-27 | 6 | -5/+324 |
| |\ | |||||
| * \ | Merge branch 'dev-desktop-file' of git://github.com/OdyX/colobot | Michał Zieliński | 2012-12-27 | 50 | -854/+638 |
| |\ \ | |||||
| * \ \ | Merge pull request #93 from OdyX/master-markdown | Erihel | 2012-12-17 | 1 | -22/+26 |
| |\ \ \ | | | | | | | | | | | Move README to Markdown format | ||||
| | * | | | Move README to Markdown format | Didier Raboud | 2012-12-17 | 1 | -22/+26 |
| |/ / / | |||||
* | | | | Fix for TEST_VIRTUAL | Piotr Dziwinski | 2012-12-29 | 1 | -1/+1 |
| | | | | |||||
* | | | | * Fixed problem with scrolling down text fields with mouse scroll | erihel | 2012-12-29 | 2 | -27/+35 |
| | | | | | | | | | | | | | | | | * Fixed problem with scroll bar not updating position properly in text fields | ||||
* | | | | Merge branch 'dev' of github:colobot/colobot into dev | erihel | 2012-12-29 | 12 | -77/+148 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #108 from OdyX/dev-central-cmake-version | Piotr Dziwiński | 2012-12-29 | 9 | -21/+42 |
| |\ \ \ \ | | | | | | | | | | | | | Create a central version | ||||
| | * | | | | Create a central version | Didier Raboud | 2012-12-27 | 9 | -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-fixes | Piotr Dziwiński | 2012-12-29 | 4 | -56/+106 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Some more language fixes | ||||
| | * | | | | | Implement language Char for level files | Didier Raboud | 2012-12-28 | 4 | -15/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This currently lacks fallback to an existing entry for non-translated entries | ||||
| | * | | | | | Move language initialisation in SetLanguage | Didier Raboud | 2012-12-28 | 1 | -42/+48 |
| |/ / / / / | |||||
* / / / / / | * Fixed segault when could not set sound pitch (bad logger call) | erihel | 2012-12-28 | 3 | -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/delete | Piotr Dziwinski | 2012-12-28 | 5 | -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 sounds | Piotr Dziwinski | 2012-12-28 | 2 | -18/+23 |
|/ / / / | |||||
* | | | | Merge pull request #106 from OdyX/dev-fix-translations | Piotr Dziwiński | 2012-12-27 | 5 | -144/+462 |
|\ \ \ \ | | | | | | | | | | | Fix translations | ||||
| * | | | | Update translations | Didier Raboud | 2012-12-27 | 3 | -135/+369 |
| | | | | | | | | | | | | | | | | | | | | In particular, update french | ||||
| * | | | | Update colobot.pot using update-pot | Didier Raboud | 2012-12-27 | 1 | -6/+91 |
| | | | | | |||||
| * | | | | Update translation pot-file and build-target | Didier Raboud | 2012-12-27 | 1 | -3/+2 |
| | | | | | |||||
* | | | | | Merge pull request #105 from OdyX/dev-desktop-file-man | Piotr Dziwiński | 2012-12-27 | 6 | -5/+324 |
|\ \ \ \ \ | | | | | | | | | | | | | Add manpage for colobot | ||||
| * | | | | | Always build manpages | Didier Raboud | 2012-12-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | solves #105 | ||||
| * | | | | | Merge branch 'dev' into dev-desktop-file-man | Didier Raboud | 2012-12-27 | 1 | -5/+5 |
| |\| | | | | | |_|_|/ | |/| | | | |||||
| * | | | | Add manpage for colobot | Didier Raboud | 2012-12-27 | 6 | -5/+324 |
| | |_|/ | |/| | | | | | | | | | | | | | | - Translate it with po4a - Use POD-format as source, and pod2man for building | ||||
* | | | | Fixed unicode rendering bug | Piotr Dziwinski | 2012-12-27 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #107 from OdyX/dev-fix-locales | Piotr Dziwiński | 2012-12-27 | 1 | -5/+8 |
|\ \ \ \ | |_|/ / |/| | | | Fix locale's loading | ||||
| * | | | Fix locale's loading | Didier Raboud | 2012-12-27 | 1 | -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-fix | Michał Zieliński | 2012-12-27 | 1 | -5/+5 |
|\ \ \ | | | | | | | | | Minor cmake grammar fix | ||||
| * | | | Minor cmake grammar fix | Didier Raboud | 2012-12-27 | 1 | -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-file | Michał Zieliński | 2012-12-27 | 10 | -1/+383 |
|\ \ \ \ | |/ / / |/| / / | |/ / | Add desktop and icon files | ||||
| * | | Add SVG colobot icon | Didier Raboud | 2012-12-27 | 4 | -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' file | Didier Raboud | 2012-12-27 | 9 | -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 module | erihel | 2012-12-25 | 4 | -93/+82 |
| | | | | | | | | | | * Added video settings to profile * Resolution change is now posibble but restart is required | ||||
* | | * Changed log level in sound module | erihel | 2012-12-25 | 5 | -8/+12 |
| | | | | | | | | | | * Fixed warnings in sound module * Fixed problem with map loading when locale with different number separator | ||||
* | | latest changes | erihel | 2012-12-21 | 4 | -8/+14 |
| | | |||||
* | | sound fix | erihel | 2012-12-20 | 11 | -154/+40 |
| | | |||||
* | | removing plugins for gold version (for mxe cross compiling) | erihel | 2012-12-20 | 21 | -551/+1 |
| | | |||||
* | | Installation path fixes and CMakeLists refactoring | Piotr Dziwinski | 2012-12-20 | 7 | -43/+55 |
| | | | | | | | | make && make install should now give a working installation. | ||||
* | | Switched data submodule to dev branch | Piotr Dziwinski | 2012-12-19 | 1 | -0/+0 |
| | | |||||
* | | Added colobot-data as git submodule | Piotr Dziwinski | 2012-12-19 | 3 | -3/+3 |
| | | |||||
* | | Merge pull request #102 from OdyX/dev-fix_cmake_flags | Piotr Dziwiński | 2012-12-19 | 10 | -21/+49 |
|\ \ | | | | | | | Fix CMake flags handling | ||||
| * | | Put common CXX flags in common variables | Didier Raboud | 2012-12-19 | 10 | -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 Raboud | 2012-12-19 | 9 | -9/+27 |
| | | | | | | | | | | | | Only set CMAKE_BUILD_TYPE to Debug when no value is provided. | ||||
* | | | Merge pull request #101 from OdyX/dev-reduce-dependencies-overload | Piotr Dziwiński | 2012-12-19 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Reduce dependencies installation in travis | ||||
| * | | Reduce dependencies installation in travis | Didier Raboud | 2012-12-19 | 1 | -1/+1 |
|/ / | | | | | | | Use apt-get's --no-install-recommends. | ||||
* | | Merge pull request #100 from OdyX/dev-fix-rpath | krzys-h | 2012-12-19 | 1 | -1/+1 |
|\ \ | | | | | | | Fix RPath in installed colobot |