summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #112 from OdyX/dev-levels-fallbackkrzys-h2013-01-091-10/+41
|\ | | | | In levels' lists, fallback to english
| * In levels' lists, fallback to englishDidier Raboud2013-01-021-10/+41
| | | | | | | | | | | | - Implemented in a naive way: Take the English version if found, but continue until the translated version is found. This has the drawback of letting the loop reach its end if the level has no translation.
* | CMakeLists enhancementsPiotr Dziwinski2013-01-084-8/+39
| | | | | | | | | | | | | | - compiler detection (clang and gcc version check) - compile flags only for src/ subdir - system and local include paths - fix for clang compilation
* | Merge dev and dev-graphicsPiotr Dziwinski2013-01-0712-21/+57
|\ \
| * | Small fix in detecting language. Fixes needed to compile code using clangMarcin Zawadzki2013-01-058-9/+12
| | |
| * | * Fixed problem with freeing buffers while conneted to a source resulting ↵erihel2013-01-044-12/+45
| | | | | | | | | | | | | | | | | | with "Unable to unload buffer message" * Fixed posible segfault while trying to play sound after not loading file properly
* | | GLEW fix for some graphics driversPiotr Dziwinski2013-01-062-4/+6
| | |
* | | Corrected OpenGL extension detectionPiotr Dziwinski2013-01-057-162/+146
| | | | | | | | | | | | | | | | | | - corrected multitexture and VBO detection - GLEW is now a required library - minor CMakeLists refactoring
* | | Correct font scaling with resolutionPiotr Dziwinski2013-01-044-5/+17
| | |
* | | Merge branch 'dev' into dev-graphicsPiotr Dziwinski2013-01-0498-5375/+7741
|\| |
| * | Merge pull request #115 from OdyX/dev-add-categories-to-desktop-fileMichał Zieliński2013-01-021-0/+1
| |\ \ | | |/ | |/| Add categories to Desktop Entry file
| | * Add categories to Desktop Entry fileDidier Raboud2013-01-021-0/+1
| |/ | | | | | | As per the "Desktop Menu Specification" 1.0, especially Appendix A.
| * Merge branch 'master' into devPiotr Dziwinski2012-12-291-22/+26
| |\
| | * Merge of master and devPiotr Dziwinski2012-12-2929-340/+1082
| | |
| | * Revert "Merge branch 'dev-desktop-file-man' of https://github.com/OdyX/colobot"Michał Zieliński2012-12-276-324/+5
| | | | | | | | | | | | | | | This reverts commit 9f3acdcdde36ece74a848370776b2751d20f1c3d, reversing changes made to fb13c0f219282ef888562fb0fcbbeefd915307d4.
| | * Merge branch 'dev-desktop-file-man' of https://github.com/OdyX/colobotMichał Zieliński2012-12-276-5/+324
| | |\
| | * \ Merge branch 'dev-desktop-file' of git://github.com/OdyX/colobotMichał Zieliński2012-12-2750-854/+638
| | |\ \
| | * \ \ Merge pull request #93 from OdyX/master-markdownErihel2012-12-171-22/+26
| | |\ \ \ | | | | | | | | | | | | Move README to Markdown format
| | | * | | Move README to Markdown formatDidier Raboud2012-12-171-22/+26
| | |/ / /
| * | | | Fix for TEST_VIRTUALPiotr Dziwinski2012-12-291-1/+1
| | | | |
| * | | | * Fixed problem with scrolling down text fields with mouse scrollerihel2012-12-292-27/+35
| | | | | | | | | | | | | | | | | | | | * Fixed problem with scroll bar not updating position properly in text fields
| * | | | Merge branch 'dev' of github:colobot/colobot into deverihel2012-12-2912-77/+148
| |\ \ \ \
| | * \ \ \ 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
| | |/ / / / /
| * / / / / / * 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
| | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-09 15:27:35 +0000