Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge of master and dev | Piotr Dziwinski | 2012-12-29 | 28 | -334/+1050 |
| | |||||
* | Revert "Merge branch 'dev-desktop-file-man' of https://github.com/OdyX/colobot" | Michał Zieliński | 2012-12-27 | 6 | -324/+5 |
| | | | | | This reverts commit 9f3acdcdde36ece74a848370776b2751d20f1c3d, reversing changes made to fb13c0f219282ef888562fb0fcbbeefd915307d4. | ||||
* | Add manpage for colobot | Didier Raboud | 2012-12-27 | 6 | -5/+324 |
| | | | | | - Translate it with po4a - Use POD-format as source, and pod2man for building | ||||
* | Add SVG colobot icon | Didier Raboud | 2012-12-27 | 3 | -0/+263 |
| | | | | | | - 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' file | Didier Raboud | 2012-12-27 | 8 | -0/+119 |
| | | | | | | - 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 module | erihel | 2012-12-25 | 4 | -93/+82 |
| | | | | | * Added video settings to profile * Resolution change is now posibble but restart is required | ||||
* | * Changed log level in sound module | erihel | 2012-12-25 | 5 | -8/+12 |
| | | | | | * Fixed warnings in sound module * Fixed problem with map loading when locale with different number separator | ||||
* | latest changes | erihel | 2012-12-21 | 2 | -6/+13 |
| | |||||
* | sound fix | erihel | 2012-12-20 | 8 | -124/+37 |
| | |||||
* | removing plugins for gold version (for mxe cross compiling) | erihel | 2012-12-20 | 20 | -550/+1 |
| | |||||
* | Installation path fixes and CMakeLists refactoring | Piotr Dziwinski | 2012-12-20 | 6 | -27/+17 |
| | | | | make && make install should now give a working installation. | ||||
* | Put common CXX flags in common variables | Didier Raboud | 2012-12-19 | 9 | -10/+19 |
| | | | | | 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 | 8 | -8/+24 |
| | | | | Only set CMAKE_BUILD_TYPE to Debug when no value is provided. | ||||
* | Fix RPath in installed colobot | Didier Raboud | 2012-12-19 | 1 | -1/+1 |
| | |||||
* | Minor cmake grammar fix | Didier Raboud | 2012-12-18 | 1 | -1/+1 |
| | | | | It is redundant to have CMAKE_INSTALL_PREFIX in path definitions; drop them. | ||||
* | Install libCBot to a private directory | Didier Raboud | 2012-12-17 | 2 | -2/+3 |
| | | | | | | | | closes #90 - Make it configurable; - Move stanzas above the src directory inclusion, otherwise the value doesn't propagate. | ||||
* | Merge branch 'dev' into dev-use-installed-i18n | Didier Raboud | 2012-12-16 | 2 | -1/+3 |
|\ | | | | | | | | | Conflicts: src/common/config.h.cmake | ||||
| * | Set a default datadir, in sync with the data installation path. | Didier Raboud | 2012-12-16 | 2 | -2/+5 |
| | | |||||
* | | Use default installation paths for i18n. | Didier Raboud | 2012-12-16 | 2 | -4/+4 |
|/ | | | | | | 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 | 5 | -5/+6 |
| | | | | | | - 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 | 10 | -3936/+5721 |
|\ | |||||
| * | Merge pull request #85 from OdyX/cmake_find_ltdl | Michał Zieliński | 2012-12-14 | 3 | -3/+3 |
| |\ | | | | | | | Add FindLTDL cmake module | ||||
| | * | Add FindLTDL cmake module | Didier Raboud | 2012-12-14 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | As mentionned in FindLTDL.cmake, this is code that is hereby relicensed under GPLv3. closes #68 | ||||
| * | | Inherit translation setting from environment. | Didier Raboud | 2012-12-14 | 2 | -3/+10 |
| |/ | | | | | | | | | | | | | | | 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. | ||||
| * | Update translations with newer colobot.pot. | Didier Raboud | 2012-12-13 | 3 | -738/+753 |
| | | |||||
| * | Handle translations with CMakes. | Didier Raboud | 2012-12-13 | 3 | -0/+1762 |
| | | | | | | | | closes #81 | ||||
| * | Sort translation files. | Didier Raboud | 2012-12-13 | 3 | -3936/+3937 |
| | | | | | | | | This will ease future updates. | ||||
| * | Fixed stupid coding mistake in CBotString.cpp | adiblol | 2012-10-07 | 1 | -1/+1 |
| | | |||||
* | | Restext rewrite to runtime initialized arrays | Piotr Dziwinski | 2012-10-17 | 13 | -1840/+1739 |
| | | |||||
* | | Doxygen/comment fixes and some #include refactoring | Piotr Dziwinski | 2012-10-17 | 69 | -306/+333 |
| | | |||||
* | | Removed unnecessary dynamic_casts | Piotr Dziwinski | 2012-10-17 | 3 | -21/+19 |
| | | |||||
* | | Saving scripts on game save should work. Added stub for particle. | Zaba999 | 2012-10-11 | 2 | -1/+292 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/colobot/colobot into dev | Zaba999 | 2012-10-11 | 32 | -781/+6997 |
|\ \ | |||||
| * | | Removed Gfx:: from license notice (introduced in 8ad15c0e) | Michał Zieliński | 2012-10-08 | 1 | -2/+1 |
| | | | |||||
| * | | Changing and saving input bindings | Piotr Dziwinski | 2012-10-07 | 13 | -305/+268 |
| | | | |||||
| * | | Fixed stupid coding mistake in CBotString.cpp | adiblol | 2012-10-07 | 1 | -1/+1 |
| | | | |||||
| * | | Setting speed now works. Added ability to set 4x and 8x using "speed4" and ↵ | adiblol | 2012-10-06 | 2 | -5/+24 |
| |/ | | | | | | | "speed8" cheat codes respectively. | ||||
| * | Merge branch 'dev' of github.com:colobot/colobot into dev | Piotr Dziwinski | 2012-10-05 | 1 | -3/+3 |
| |\ | |||||
| | * | Commented out profile_test | Michał Zieliński | 2012-10-05 | 1 | -3/+3 |
| | | | |||||
| * | | Merge branch 'dev-graphics' into dev | Piotr Dziwinski | 2012-10-05 | 14 | -455/+6686 |
| |\ \ | | |/ | |/| | |||||
| | * | Merge remote-tracking branch 'origin/dev' into dev-graphics | adiblol | 2012-10-05 | 1 | -9/+9 |
| | |\ | |||||
| | * | | CParticle rewrite | Piotr Dziwinski | 2012-10-05 | 5 | -287/+3944 |
| | | | | |||||
| | * | | Some CPyro docs | Piotr Dziwinski | 2012-10-05 | 1 | -3/+31 |
| | | | | |||||
| | * | | CLightning rewrite | Piotr Dziwinski | 2012-10-05 | 3 | -50/+387 |
| | | | | |||||
| | * | | CPyro rewrite | Piotr Dziwinski | 2012-10-03 | 2 | -109/+2319 |
| | | | | |||||
| | * | | Spot light angle fix | Piotr Dziwinski | 2012-10-03 | 5 | -8/+7 |
| | | | | |||||
| * | | | Disabled window resize | Piotr Dziwinski | 2012-10-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | Added "make install" target. | Michał Zieliński | 2012-10-05 | 2 | -0/+4 |
| | |/ | |/| | |||||
| * | | Refactoring: changed UNIT to g_unit in CRobotMain class | adiblol | 2012-10-05 | 1 | -9/+9 |
| |/ | |||||
* / | Added saving user scripts on game save. Fixed bug in writing script to file. | Zaba999 | 2012-10-11 | 18 | -34/+293 |
|/ |