Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add translated freedesktop 'Desktop Entry' file | Didier Raboud | 2012-12-27 | 1 | -0/+2 |
| | | | | | | - Add po4a as build-dependency for travis (but it fallsback to english-only if not found) - Add (easy) french translation | ||||
* | sound fix | erihel | 2012-12-20 | 1 | -1/+28 |
| | |||||
* | removing plugins for gold version (for mxe cross compiling) | erihel | 2012-12-20 | 1 | -3/+0 |
| | |||||
* | Installation path fixes and CMakeLists refactoring | Piotr Dziwinski | 2012-12-20 | 1 | -2/+2 |
| | | | | make && make install should now give a working installation. | ||||
* | Fix RPath in installed colobot | Didier Raboud | 2012-12-19 | 1 | -1/+1 |
| | |||||
* | Install libCBot to a private directory | Didier Raboud | 2012-12-17 | 1 | -1/+2 |
| | | | | | | | | closes #90 - Make it configurable; - Move stanzas above the src directory inclusion, otherwise the value doesn't propagate. | ||||
* | Split gtest and gmock, fixed using system packages | Piotr Dziwinski | 2012-12-16 | 1 | -1/+1 |
| | | | | | | - split the bundled gtest and gmock libraries - allowed the use of system gmock - refactoring in CMakeLists | ||||
* | Merge branch 'master' into dev | Piotr Dziwinski | 2012-12-15 | 1 | -1/+3 |
|\ | |||||
| * | Add FindLTDL cmake module | Didier Raboud | 2012-12-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | As mentionned in FindLTDL.cmake, this is code that is hereby relicensed under GPLv3. closes #68 | ||||
| * | Handle translations with CMakes. | Didier Raboud | 2012-12-13 | 1 | -0/+2 |
| | | | | | | | | closes #81 | ||||
* | | Restext rewrite to runtime initialized arrays | Piotr Dziwinski | 2012-10-17 | 1 | -1/+0 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/colobot/colobot into dev | Zaba999 | 2012-10-11 | 1 | -0/+2 |
|\| | |||||
| * | Added "make install" target. | Michał Zieliński | 2012-10-05 | 1 | -0/+2 |
| | | |||||
* | | Added saving user scripts on game save. Fixed bug in writing script to file. | Zaba999 | 2012-10-11 | 1 | -0/+1 |
|/ | |||||
* | MXE support and CMake files refactoring | Piotr Dziwinski | 2012-09-29 | 1 | -45/+25 |
| | | | | | | - added support for cross-compiling with MXE (http://mxe.cc/) - refactored CMake files, adding some options and moving definitions to more suitable places | ||||
* | Small fix in profile + profile_test rewritten to gtest. | Zaba999 | 2012-09-28 | 1 | -0/+1 |
| | |||||
* | Removed metafile editor and loader | Piotr Dziwinski | 2012-09-22 | 1 | -1/+0 |
| | |||||
* | * Fixed audio problems | erihel | 2012-09-22 | 1 | -0/+3 |
| | | | | | | * Added colobot.ini to CApp in Create function * Fixes to plugin manager * Fixed CProfile segfault | ||||
* | changed paths for models and levels. Now it's possible to load level. Merged ↵ | Zaba999 | 2012-09-20 | 1 | -1/+0 |
|\ | | | | | | | with latest trunk | ||||
| * | Namespace and styling fix | Piotr Dziwinski | 2012-09-19 | 1 | -1/+0 |
| | | |||||
* | | changed paths for models and levels. Now it's possible to load level. | Zaba999 | 2012-09-20 | 1 | -0/+2 |
|/ | |||||
* | changes needeto to cimpile on windows. | Zaba999 | 2012-09-17 | 1 | -0/+1 |
| | |||||
* | Successful compilation & running | Piotr Dziwinski | 2012-09-15 | 1 | -1/+1 |
| | | | | | | | - temporarily mocked CSoundInterface and CPluginInterface - added CRobotMain to application - successfully compiles & runs, but doesn't display correctly at the moment | ||||
* | CMainDialog rewrite | Piotr Dziwinski | 2012-09-15 | 1 | -2/+2 |
| | | | | - rewritten CMainDialog and updated CRobotMain | ||||
* | Merge dev-common and various fixes to achieve compilation | Piotr Dziwinski | 2012-09-15 | 1 | -34/+33 |
|\ | | | | | | | | | | | | | | | - merged changes from dev-common - fixed many compilation errors (CBrain, UI, ...) - temporarily commented out some problematic code (e.g. input bindings) - (partially) fixed #include styling - everything compiles except for CRobotMain, CMainDialog and CStudio | ||||
| * | Tests rewrite and Doxygen in src/math | Piotr Dziwinski | 2012-09-11 | 1 | -0/+1 |
| | | | | | | | | | | | | - rewritten tests to use new framework - updated/reformatted Doxygen - removed legacy conversions | ||||
| * | Refactoring in src/common | Piotr Dziwinski | 2012-09-09 | 1 | -6/+8 |
| | | | | | | | | | | - refactored CInstanceManager and some headers - removed old headers | ||||
* | | Merge branch 'dev-object' into dev | Michał Konopacki | 2012-09-15 | 1 | -61/+61 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: src/object/robotmain.cpp src/object/robotmain.h | ||||
| * | | Fixes in [object/auto] | Michał Konopacki | 2012-09-13 | 1 | -26/+26 |
| | | | |||||
| * | | [object/motion] Folder compiles | Michał Konopacki | 2012-09-13 | 1 | -9/+9 |
| | | | |||||
| * | | all tasks compile. | Zaba999 | 2012-09-12 | 1 | -7/+7 |
| | | | |||||
| * | | commented part of tasks that does not compile. | Zaba999 | 2012-09-11 | 1 | -7/+7 |
| | | | |||||
| * | | half of task compile. | Zaba999 | 2012-09-11 | 1 | -26/+26 |
| | | | |||||
* | | | Merge branch 'dev-ui' into dev | Michał Konopacki | 2012-09-15 | 1 | -2/+5 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/CMakeLists.txt src/common/misc.cpp src/common/misc.h src/object/robotmain.cpp src/object/robotmain.h src/script/cbottoken.cpp src/script/cbottoken.h src/ui/button.cpp src/ui/button.h src/ui/check.cpp src/ui/check.h src/ui/color.cpp src/ui/color.h src/ui/compass.cpp src/ui/compass.h src/ui/control.cpp src/ui/control.h src/ui/displayinfo.cpp src/ui/displayinfo.h src/ui/displaytext.cpp src/ui/displaytext.h src/ui/edit.cpp src/ui/edit.h src/ui/gauge.cpp src/ui/gauge.h src/ui/interface.cpp src/ui/interface.h src/ui/key.cpp src/ui/map.h src/ui/shortcut.h src/ui/slider.h src/ui/target.cpp src/ui/target.h src/ui/window.cpp src/ui/window.h | ||||
| * | | Merge branch 'dev' of https://github.com/adiblol/colobot into dev-ui | erihel | 2012-09-03 | 1 | -1/+2 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/common/restext.cpp src/common/restext.h | ||||
| * | | | latest changes; few more classes should compile now | erihel | 2012-08-31 | 1 | -2/+2 |
| | | | | |||||
| * | | | * wrong enum used for text alignment | erihel | 2012-08-18 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | * wrong event function used | ||||
| * | | | * minor changes to control.cpp to compile it without errors | erihel | 2012-08-18 | 1 | -5/+6 |
| | | | | |||||
* | | | | commented new part in cmakelist and reverted stubs in camera.cpp. Will be ↵ | Zaba999 | 2012-09-10 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | commited later after implementation is finished in dev-object branch. | ||||
* | | | | Merge with changes from Zaba999 fork. | Zaba999 | 2012-09-10 | 1 | -5/+6 |
| | | | | |||||
* | | | | Commenting out src/object/auto temporarily | Piotr Dziwinski | 2012-09-09 | 1 | -26/+26 |
| | | | | |||||
* | | | | [src/object/auto] Folder rewritten | Michał Konopacki | 2012-09-09 | 1 | -26/+26 |
| |_|/ |/| | | |||||
* | | | Merge branch 'dev' into dev-graphics | Piotr Dziwinski | 2012-09-09 | 1 | -1/+2 |
|\ \ \ | | |/ | |/| | |||||
| * | | Move strings out of restext. Add i18n via gettext | Alexander Monakov | 2012-08-25 | 1 | -1/+2 |
| |/ | |||||
* | | CModelFile fixes; test framework | Piotr Dziwinski | 2012-09-08 | 1 | -0/+3 |
| | | | | | | | | | | | | - fixes in CModelFile IO - added Google Test framework for automatic testing - rewrote modelfile_test in the new framework | ||||
* | | New model file format | Piotr Dziwinski | 2012-08-31 | 1 | -1/+4 |
|/ | | | | | | | - added new binary and text formats for models - fixes and improvements in CModelFile - tool for converting model files - minor additions and fixes | ||||
* | Graphics stubs | Piotr Dziwinski | 2012-08-09 | 1 | -1/+1 |
| | | | | | | | - added stubs for functions in CLightning, CParticle and CPyro - cleaned object.h and physics.h headers - created temporary stubs to compile CCamera - other necessary changes to compile successfully | ||||
* | Basic font rendering | Piotr Dziwinski | 2012-08-03 | 1 | -0/+1 |
| | | | | | - added basic font rendering - minor refactoring & fixes | ||||
* | CCamera rewrite | Piotr Dziwinski | 2012-07-29 | 1 | -1/+1 |
| | | | | | Rewritten old code; doesn't compile yet because changes in other modules are needed. | ||||
* | GLEW | Piotr Dziwinski | 2012-07-28 | 1 | -0/+24 |
| | | | | Added GLEW for loading OpenGL extensions |