summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into debianDidier Raboud2013-01-2020-101/+281
|\
| * Fixed some clang warningsPiotr Dziwinski2013-01-172-4/+4
| |
| * Fixed edit_test linking issuePiotr Dziwinski2013-01-171-1/+1
| |
| * * Fixed sound pitch causing segfaulterihel2013-01-168-29/+66
| | | | | | | | | | | | * Sound support should now compile fine with MXE * Added cache for 3 music files to speedup loading * Updated howto
| * * Cleaning player list before getting new one (entering user menu several ↵erihel2013-01-151-0/+1
| | | | | | | | times appended user to existing list)
| * * Removed aluterihel2013-01-1413-74/+216
| | | | | | | | | | * Using libsndfile to load sounds and music * Added support for playing music files
* | Install manpageDidier Raboud2013-01-111-0/+2
| |
* | Merge branch 'dev' into debianDidier Raboud2013-01-1114-91/+172
|\| | | | | | | | | Conflicts: .travis.yml
| * Merge pull request #117 from OdyX/dev-C++11-fixesPiotr Dziwiński2013-01-102-11/+18
| |\ | | | | | | C++11 fixes to get travis build
| | * In travis, add boost backport from Mapnik to succeed clang buildDidier Raboud2013-01-101-0/+1
| | |
| | * Also test intallationDidier Raboud2013-01-101-1/+1
| | |
| | * In travis, do out-of-tree buildDidier Raboud2013-01-101-1/+1
| | |
| | * Enable clang build in travisDidier Raboud2013-01-101-0/+1
| | |
| | * Use correct C++11/C++0x flags depending on the used compilerDidier Raboud2013-01-101-10/+15
| |/ | | | | | | See http://gcc.gnu.org/projects/cxx0x.html for details.
| * Added GLEW to travis configPiotr Dziwinski2013-01-091-1/+1
| |
| * Merge branch 'dev' of github:colobot/colobot into deverihel2013-01-097-27/+94
| |\
| | * Disabled travis e-mail notificationsPiotr Dziwinski2013-01-091-0/+2
| | |
| | * Merge pull request #114 from OdyX/dev-update-cmake-with-datakrzys-h2013-01-092-9/+12
| | |\ | | | | | | | | Let CMake rely on data's CMakeLists.txt if it exists
| | | * Let CMake rely on data's CMakeLists.txt if it existsDidier Raboud2013-01-022-4/+7
| | | | | | | | | | | | | | | | - Also update data to latest 'dev', where the CMakeLists exists
| | | * Revert "Minor cmake grammar fix"Didier Raboud2012-12-301-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | It appears I was really wrong. Damn. This reverts commit 277629f9fec069afce32a21fd6baeb4f24d5784c.
| | * | 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
| * | | * Fixed pitch calculation (sound in cut scenes will work as well as robot ↵erihel2013-01-096-63/+69
| |/ / | | | | | | | | | | | | | | | | | | tracks sound) * Fixed applying effects to sounds * Changed volume to range 0.0-1.0 except for values in UI
* | | Merge branch 'dev' into debianDidier Raboud2013-01-0856-2707/+3386
|\| |
| * | 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
| | |\ \ \ \
| | * | | | | * 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
| * | | | | | Fix for #113Piotr Dziwinski2013-01-041-2/+2
| | | | | | |
| * | | | | | Fixed stupid debug codePiotr Dziwinski2013-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Terrain VBOs should work now
| * | | | | | Fixed spider and worm model loadingPiotr Dziwinski2012-12-284-6/+48
| | | | | | |
| * | | | | | Fixes and refactoringPiotr Dziwinski2012-12-273-239/+122
| | | | | | |
| * | | | | | Engine optimization - rewritten model managementPiotr Dziwinski2012-12-2630-2393/+2116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - new class CModelManager - rewritten engine object structure in CEngine - created shared model data instead of separate objects per each model instance - minor refactoring
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-21 01:03:52 +0000