Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge dev and dev-graphics | Piotr Dziwinski | 2013-01-07 | 1 | -1/+0 |
|\ | |||||
| * | Small fix in detecting language. Fixes needed to compile code using clang | Marcin Zawadzki | 2013-01-05 | 1 | -1/+0 |
| | | |||||
* | | Corrected OpenGL extension detection | Piotr Dziwinski | 2013-01-05 | 1 | -1/+0 |
| | | | | | | | | | | | | - corrected multitexture and VBO detection - GLEW is now a required library - minor CMakeLists refactoring | ||||
* | | Merge branch 'dev' into dev-graphics | Piotr Dziwinski | 2013-01-04 | 5 | -8/+22 |
|\| | |||||
| * | Merge pull request #108 from OdyX/dev-central-cmake-version | Piotr Dziwiński | 2012-12-29 | 2 | -1/+7 |
| |\ | | | | | | | Create a central version | ||||
| | * | Create a central version | Didier Raboud | 2012-12-27 | 2 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | Replaced malloc/free with new/delete | Piotr Dziwinski | 2012-12-28 | 1 | -2/+2 |
| |/ | | | | | | | | | | | - now new/delete used everywhere except for CBotStack, which has to be fixed in other way - some segfaults should be fixed with this | ||||
| * | latest changes | erihel | 2012-12-21 | 1 | -0/+2 |
| | | |||||
| * | Installation path fixes and CMakeLists refactoring | Piotr Dziwinski | 2012-12-20 | 2 | -3/+2 |
| | | | | | | | | make && make install should now give a working installation. | ||||
| * | Put common CXX flags in common variables | Didier Raboud | 2012-12-19 | 1 | -1/+2 |
| | | | | | | | | | | 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 | 1 | -1/+3 |
| | | | | | | | | Only set CMAKE_BUILD_TYPE to Debug when no value is provided. | ||||
| * | Merge branch 'dev' into dev-use-installed-i18n | Didier Raboud | 2012-12-16 | 1 | -0/+1 |
| |\ | | | | | | | | | | | | | Conflicts: src/common/config.h.cmake | ||||
| | * | Set a default datadir, in sync with the data installation path. | Didier Raboud | 2012-12-16 | 1 | -1/+3 |
| | | | |||||
| * | | Use default installation paths for i18n. | Didier Raboud | 2012-12-16 | 1 | -1/+3 |
| |/ | | | | | | | | | | | This finishes the work started in 19b75e174338f8e7be7486a7445d1e90e9795077 by actually using the translation where they are installed. | ||||
| * | 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 | -0/+1 |
| |\ | |||||
| | * | Inherit translation setting from environment. | Didier Raboud | 2012-12-14 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | This ensures that users with a correctly-defined locale don't need to explicitely set the locale. - By dropping the setlocale content, it fixes the loading of translations. - Add a Debug log message to check what is put in the environment. | ||||
* | | | Ground spot texture drawing | Piotr Dziwinski | 2012-10-20 | 2 | -0/+12 |
|/ / | |||||
* | | Restext rewrite to runtime initialized arrays | Piotr Dziwinski | 2012-10-17 | 8 | -1571/+1480 |
| | | |||||
* | | Doxygen/comment fixes and some #include refactoring | Piotr Dziwinski | 2012-10-17 | 22 | -83/+80 |
| | | |||||
* | | Changing and saving input bindings | Piotr Dziwinski | 2012-10-07 | 1 | -2/+4 |
|/ | |||||
* | Commented out profile_test | Michał Zieliński | 2012-10-05 | 1 | -3/+3 |
| | |||||
* | Merge branch 'dev' into dev-graphics | Piotr Dziwinski | 2012-10-02 | 1 | -2/+2 |
|\ | |||||
| * | Further work on saving profile and directory listing. | Zaba999 | 2012-10-02 | 1 | -2/+2 |
| | | |||||
* | | Fixed bugs in texture coloring | Piotr Dziwinski | 2012-09-30 | 1 | -4/+4 |
|/ | |||||
* | Map texture painting | Piotr Dziwinski | 2012-09-30 | 2 | -0/+9 |
| | |||||
* | MXE support and CMake files refactoring | Piotr Dziwinski | 2012-09-29 | 1 | -2/+1 |
| | | | | | | - added support for cross-compiling with MXE (http://mxe.cc/) - refactored CMake files, adding some options and moving definitions to more suitable places | ||||
* | Merge branch 'dev' into dev-graphics | Piotr Dziwinski | 2012-09-29 | 6 | -71/+156 |
|\ | |||||
| * | Small fix in profile + profile_test rewritten to gtest. | Zaba999 | 2012-09-28 | 4 | -39/+48 |
| | | |||||
| * | Profile rewritten to boost. Read/write to ini should work. | Zaba999 | 2012-09-27 | 2 | -22/+26 |
| | | | | | | | | Load/Save should work. | ||||
| * | Work in progress on opening files, and listing dirs | Zaba999 | 2012-09-26 | 3 | -30/+102 |
| | | | | | | | | | | Fixed includes profile changed from SimpleIni to boost::ptree -> not finished yet | ||||
* | | Updated docs and some Doxygen fixes | Piotr Dziwinski | 2012-09-27 | 3 | -3/+3 |
| | | |||||
* | | Refactored resource and relief loading | Piotr Dziwinski | 2012-09-26 | 2 | -8/+33 |
|/ | | | | | - now loading can be from any image format - added IntColor struct for precise pixel operations | ||||
* | Removed metafile editor and loader | Piotr Dziwinski | 2012-09-22 | 2 | -488/+0 |
| | |||||
* | Various fixes | Piotr Dziwinski | 2012-09-22 | 1 | -2/+6 |
| | | | | | | | | - disabled UserDir() in path lookup - fixed crashes on loading missions in CObject - fixed texture bug in CTerrain - changed mouse move event handling to avoid flooding event queue - enabled all missions for testing | ||||
* | Data dir paths | Piotr Dziwinski | 2012-09-22 | 1 | -0/+20 |
| | | | | | - changed access to paths in data directory in CApplication - models now load from data directory | ||||
* | Event fixes & refactoring | Piotr Dziwinski | 2012-09-22 | 2 | -63/+61 |
| | | | | | | - added new state tracking to Event - removed old fields from Event - fixed some issues with Events and fps counter | ||||
* | * Fixed audio problems | erihel | 2012-09-22 | 1 | -1/+1 |
| | | | | | | * Added colobot.ini to CApp in Create function * Fixes to plugin manager * Fixed CProfile segfault | ||||
* | robotmain, restext and engine fixes | Piotr Dziwinski | 2012-09-21 | 1 | -34/+60 |
| | |||||
* | Mouse wheel events, motion vectors | Piotr Dziwinski | 2012-09-19 | 3 | -54/+85 |
| | | | | | | - added mouse wheel events - added motion vectors to CRobotMain - other minor changes in event.h | ||||
* | Input bindings rewrite | Piotr Dziwinski | 2012-09-19 | 5 | -68/+103 |
| | | | | | | - moved input bindings to CRobotMain - added virtual keymod and joystick button key presses - fixed putenv error; other minor fixes | ||||
* | Warnings cleaned, left only those connected to commented out code. | Zaba999 | 2012-09-18 | 2 | -2/+2 |
| | |||||
* | warnings fight in progress. | Zaba999 | 2012-09-18 | 5 | -9/+9 |
| | |||||
* | Interface works | Piotr Dziwinski | 2012-09-16 | 1 | -1/+7 |
| | | | | | | - removed mock of CInterface and fixed event passing to CRobotMain - changed texture names from tga and bmp to png - UI now works but interaction is still broken | ||||
* | 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 | -1/+1 |
| | | | | - rewritten CMainDialog and updated CRobotMain | ||||
* | Merge dev-common and various fixes to achieve compilation | Piotr Dziwinski | 2012-09-15 | 26 | -4184/+582 |
|\ | | | | | | | | | | | | | | | - 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 | ||||
| * | Locale settings and translation fixes | Piotr Dziwinski | 2012-09-13 | 3 | -63/+4 |
| | | | | | | | | | | | | - added locale setting - removed unused translations - updated .po files | ||||
| * | Image pixel read/write | Piotr Dziwinski | 2012-09-13 | 4 | -17/+167 |
| | | |||||
| * | Simulation timestamps and input bindings | Piotr Dziwinski | 2012-09-12 | 3 | -4/+11 |
| | | | | | | | | | | | | - added new simulation time calculations in CApplication - added simulation frame updates - rewritten old input binding code and input state tracking |