Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Temporairly disabled "test" in travis | krzys-h | 2013-02-14 | 1 | -1/+1 | |
| | | | It always fails. | |||||
* | produce() extended | krzys-h | 2013-02-14 | 1 | -21/+144 | |
| | ||||||
* | Merge pull request #125 from PaweX/dev | krzys-h | 2013-02-13 | 5 | -8/+28 | |
|\ | ||||||
| * | Added cAim(CBotVar* &var, void* user) | PaweX | 2013-02-13 | 1 | -0/+1 | |
| | | ||||||
| * | Update src/script/script.cpp | PaweX | 2013-02-13 | 1 | -1/+1 | |
| | | ||||||
| * | Function aim(x, y) - "Giv" to "Get" | PaweX | 2013-02-13 | 1 | -4/+4 | |
| | | ||||||
| * | aim(x,y) - "Giv" to "Get" | PaweX | 2013-02-13 | 1 | -3/+3 | |
| | | ||||||
| * | Additional parameter for function aim(x, y). | PaweX | 2013-02-13 | 1 | -1/+1 | |
| | | ||||||
| * | Additional parameter for function aim(x, y) | PaweX | 2013-02-13 | 1 | -2/+2 | |
| | | ||||||
| * | Additional parameter for function aim(x, y). | PaweX | 2013-02-13 | 1 | -1/+1 | |
| | | ||||||
| * | Additional parameter for function aim(x, y). | PaweX | 2013-02-13 | 1 | -4/+23 | |
| | | ||||||
* | | Added Destroyer from Ceebot-Teen. | krzys-h | 2013-02-13 | 7 | -15/+94 | |
|/ | | | | We need a new icon for it. | |||||
* | More camera distance from AlienQueen | adiblol | 2013-02-11 | 1 | -0/+1 | |
| | ||||||
* | * Fixed crash when inputing cheats | erihel | 2013-02-11 | 1 | -6/+6 | |
| | ||||||
* | * Syntax highlighting in cbot editor (needs to be tested) | erihel | 2013-02-09 | 4 | -43/+57 | |
| | ||||||
* | * Fixes to ingame editor | erihel | 2013-02-09 | 5 | -28/+29 | |
| | | | | * Fixes to editor window. It's now possible to resize, move and press buttons | |||||
* | Refactoring in tests infrastructure | Piotr Dziwinski | 2013-02-03 | 126 | -4827/+760 | |
| | | | | | | | * all tests are now in /test/ subdirectory * unit tests concatenated to one executable (TODO: ui, common) * preparation for test environments (OpenGL and others) * removed old TestCBot | |||||
* | Updated and improved Blender script | Piotr Dziwinski | 2013-01-27 | 1 | -218/+382 | |
| | | | | | | | * min/max -> lod level change in model format * split objects based on LOD * lod_level, state & var_tex2 saved as properties in Blender objects * UI dialogs | |||||
* | Changed model min/max to LOD levels | Piotr Dziwinski | 2013-01-27 | 16 | -376/+283 | |
| | ||||||
* | Updated blender script | Piotr Dziwinski | 2013-01-26 | 1 | -9/+41 | |
| | | | | | * now script can be installed as add-on * model rotation is upright | |||||
* | Merge pull request #124 from OdyX/dev-OdyX-201301 | Piotr Dziwiński | 2013-01-20 | 4 | -7/+7 | |
|\ | | | | | Makes dev build again in Travis + manpage fix | |||||
| * | In travis, add libsndfile-dev as build-dependency | Didier Raboud | 2013-01-20 | 1 | -1/+1 | |
| | | ||||||
| * | In manpage, correct first header to be 'NAME' not 'COLOBOT' | Didier Raboud | 2013-01-20 | 3 | -6/+6 | |
|/ | ||||||
* | Fixed some clang warnings | Piotr Dziwinski | 2013-01-17 | 2 | -4/+4 | |
| | ||||||
* | Fixed edit_test linking issue | Piotr Dziwinski | 2013-01-17 | 1 | -1/+1 | |
| | ||||||
* | * Fixed sound pitch causing segfault | erihel | 2013-01-16 | 8 | -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 ↵ | erihel | 2013-01-15 | 1 | -0/+1 | |
| | | | | times appended user to existing list) | |||||
* | * Removed alut | erihel | 2013-01-14 | 13 | -74/+216 | |
| | | | | | * Using libsndfile to load sounds and music * Added support for playing music files | |||||
* | Merge pull request #117 from OdyX/dev-C++11-fixes | Piotr Dziwiński | 2013-01-10 | 2 | -11/+18 | |
|\ | | | | | C++11 fixes to get travis build | |||||
| * | In travis, add boost backport from Mapnik to succeed clang build | Didier Raboud | 2013-01-10 | 1 | -0/+1 | |
| | | ||||||
| * | Also test intallation | Didier Raboud | 2013-01-10 | 1 | -1/+1 | |
| | | ||||||
| * | In travis, do out-of-tree build | Didier Raboud | 2013-01-10 | 1 | -1/+1 | |
| | | ||||||
| * | Enable clang build in travis | Didier Raboud | 2013-01-10 | 1 | -0/+1 | |
| | | ||||||
| * | Use correct C++11/C++0x flags depending on the used compiler | Didier Raboud | 2013-01-10 | 1 | -10/+15 | |
|/ | | | | See http://gcc.gnu.org/projects/cxx0x.html for details. | |||||
* | Added GLEW to travis config | Piotr Dziwinski | 2013-01-09 | 1 | -1/+1 | |
| | ||||||
* | Merge branch 'dev' of github:colobot/colobot into dev | erihel | 2013-01-09 | 7 | -27/+94 | |
|\ | ||||||
| * | Disabled travis e-mail notifications | Piotr Dziwinski | 2013-01-09 | 1 | -0/+2 | |
| | | ||||||
| * | Merge pull request #114 from OdyX/dev-update-cmake-with-data | krzys-h | 2013-01-09 | 2 | -9/+12 | |
| |\ | | | | | | | Let CMake rely on data's CMakeLists.txt if it exists | |||||
| | * | Let CMake rely on data's CMakeLists.txt if it exists | Didier Raboud | 2013-01-02 | 2 | -4/+7 | |
| | | | | | | | | | | | | - Also update data to latest 'dev', where the CMakeLists exists | |||||
| | * | Revert "Minor cmake grammar fix" | Didier Raboud | 2012-12-30 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | | | | | It appears I was really wrong. Damn. This reverts commit 277629f9fec069afce32a21fd6baeb4f24d5784c. | |||||
| * | | Merge pull request #112 from OdyX/dev-levels-fallback | krzys-h | 2013-01-09 | 1 | -10/+41 | |
| |\ \ | | | | | | | | | In levels' lists, fallback to english | |||||
| | * | | In levels' lists, fallback to english | Didier Raboud | 2013-01-02 | 1 | -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 enhancements | Piotr Dziwinski | 2013-01-08 | 4 | -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 ↵ | erihel | 2013-01-09 | 6 | -63/+69 | |
|/ / | | | | | | | | | | | | | tracks sound) * Fixed applying effects to sounds * Changed volume to range 0.0-1.0 except for values in UI | |||||
* | | Merge dev and dev-graphics | Piotr Dziwinski | 2013-01-07 | 12 | -21/+57 | |
|\ \ | ||||||
| * | | Small fix in detecting language. Fixes needed to compile code using clang | Marcin Zawadzki | 2013-01-05 | 8 | -9/+12 | |
| | | | ||||||
| * | | * Fixed problem with freeing buffers while conneted to a source resulting ↵ | erihel | 2013-01-04 | 4 | -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 drivers | Piotr Dziwinski | 2013-01-06 | 2 | -4/+6 | |
| | | | ||||||
* | | | Corrected OpenGL extension detection | Piotr Dziwinski | 2013-01-05 | 7 | -162/+146 | |
| | | | | | | | | | | | | | | | | | | - corrected multitexture and VBO detection - GLEW is now a required library - minor CMakeLists refactoring | |||||
* | | | Correct font scaling with resolution | Piotr Dziwinski | 2013-01-04 | 4 | -5/+17 | |
| | | |