e62996858b
Create a central version
...
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
2012-12-27 17:12:42 +01:00
b046c33206
Merge pull request #106 from OdyX/dev-fix-translations
...
Fix translations
2012-12-27 07:37:28 -08:00
0a0e536d65
Merge pull request #105 from OdyX/dev-desktop-file-man
...
Add manpage for colobot
2012-12-27 07:36:58 -08:00
45bee618f9
Fixed unicode rendering bug
2012-12-27 16:32:46 +01:00
233f5a7c59
Merge pull request #107 from OdyX/dev-fix-locales
...
Fix locale's loading
2012-12-27 07:23:42 -08:00
0d825ed613
Fix locale's loading
...
- Always inherit LC_ALL from environment;
- Enforce environment only if the runtime options require it;
2012-12-27 16:13:26 +01:00
85283a76be
Update translations
...
In particular, update french
2012-12-27 14:09:19 +01:00
7a5e41e1ec
Update colobot.pot using update-pot
2012-12-27 13:54:40 +01:00
877774a226
Update translation pot-file and build-target
2012-12-27 13:52:47 +01:00
afea08d570
Always build manpages
...
solves #105
2012-12-27 13:13:16 +01:00
15efd65e72
Merge branch 'dev' into dev-desktop-file-man
2012-12-27 13:07:22 +01:00
70cb629cc5
Merge pull request #104 from OdyX/dev-minor-cmake-grammaer-fix
...
Minor cmake grammar fix
2012-12-27 03:25:59 -08:00
a30b35b8fe
Merge pull request #103 from OdyX/dev-desktop-file
...
Add desktop and icon files
2012-12-27 03:25:39 -08:00
778ae32c12
Add manpage for colobot
...
- Translate it with po4a
- Use POD-format as source, and pod2man for building
2012-12-27 11:05:02 +01:00
277629f9fe
Minor cmake grammar fix
...
It is redundant to have CMAKE_INSTALL_PREFIX in path definitions; drop them.
Re-do a7d837460f
2012-12-27 10:35:04 +01:00
c2ebd5551f
Add SVG colobot icon
...
- Refer to the icon in the desktop file
- Use rsvg-convert to get scaled PNG versions
- Add librsvg2-bin to travis
2012-12-27 10:02:18 +01:00
a75f02089c
Add translated freedesktop 'Desktop Entry' file
...
- Add po4a as build-dependency for travis
(but it fallsback to english-only if not found)
- Add (easy) french translation
2012-12-27 09:56:38 +01:00
c793d2d4c6
* Changed Ret to Get methods in sound module
...
* Added video settings to profile
* Resolution change is now posibble but restart is required
2012-12-25 21:36:50 +01:00
1fa5f7a96f
* Changed log level in sound module
...
* Fixed warnings in sound module
* Fixed problem with map loading when locale with different number separator
2012-12-25 17:46:48 +01:00
6d607e3ae8
latest changes
2012-12-21 17:31:55 +01:00
f0e76ad446
sound fix
2012-12-20 21:57:57 +01:00
a6ff654ae3
removing plugins for gold version (for mxe cross compiling)
2012-12-20 20:59:11 +01:00
f77734e01c
Installation path fixes and CMakeLists refactoring
...
make && make install should now give a working installation.
2012-12-20 00:23:12 +01:00
e3db0b0c19
Switched data submodule to dev branch
2012-12-19 21:27:21 +01:00
3559100db9
Added colobot-data as git submodule
2012-12-19 21:25:40 +01:00
842f4a15d8
Merge pull request #102 from OdyX/dev-fix_cmake_flags
...
Fix CMake flags handling
2012-12-19 12:25:15 -08:00
bba08ee200
Merge pull request #101 from OdyX/dev-reduce-dependencies-overload
...
Reduce dependencies installation in travis
2012-12-19 12:16:08 -08:00
7e9ef0c042
Put common CXX flags in common variables
...
CMAKE_CXX_FLAGS is taken into account in all builds; build-type-specific
flags are appended to it.
2012-12-19 16:55:00 +01:00
3c976c040b
Don't enforce CMake build type on users.
...
Only set CMAKE_BUILD_TYPE to Debug when no value is provided.
2012-12-19 16:52:17 +01:00
0a82f8a842
Reduce dependencies installation in travis
...
Use apt-get's --no-install-recommends.
2012-12-19 15:18:18 +01:00
fec2c1028a
Merge pull request #100 from OdyX/dev-fix-rpath
...
Fix RPath in installed colobot
2012-12-19 02:38:19 -08:00
c6c57c0e99
Fix RPath in installed colobot
2012-12-19 08:50:46 +01:00
22ac35cd88
Merge pull request #98 from OdyX/dev-travis-ci
...
Configure https://travis-ci.org and add travis YAML configuration file.
2012-12-18 11:18:37 -08:00
f34d4fbdc3
Add travis YAML configuration file.
...
This is intended to be used with http://travis-ci.org , which is neatly
integrated with Github (and free).
2012-12-18 16:52:44 +01:00
a044ec16a9
Merge pull request #97 from OdyX/dev-minor-cmake-grammar-fix
...
Minor cmake grammar fix
2012-12-18 03:45:06 -08:00
1c473c3a82
Merge pull request #96 from OdyX/dev-build-doc
...
Allow building and installation of documentation
2012-12-18 03:44:26 -08:00
a7d837460f
Minor cmake grammar fix
...
It is redundant to have CMAKE_INSTALL_PREFIX in path definitions; drop them.
2012-12-18 09:11:57 +01:00
a1e9c4b880
Allow building and installation of documentation
...
Run `make doc` for the building. Then `make install` will install the
generated documentation.
- Move Doxyfile to Doxyfile.in, put CMAKE_CURRENT_SOURCE_DIR into it.
2012-12-17 22:16:07 +01:00
7db96b4536
Merge pull request #95 from OdyX/dev-move-cbot-to-private-lib
...
Install libCBot to a private directory
2012-12-17 12:38:36 -08:00
e062b74a3a
Install libCBot to a private directory
...
closes #90
- Make it configurable;
- Move stanzas above the src directory inclusion, otherwise the value
doesn't propagate.
2012-12-17 10:15:14 +01:00
5a78b26f75
Merge pull request #91 from OdyX/dev-use-installed-i18n
...
Use default installation paths for i18n.
2012-12-16 13:28:15 -08:00
4827440e73
Merge branch 'dev' into dev-use-installed-i18n
...
Conflicts:
src/common/config.h.cmake
2012-12-16 22:26:29 +01:00
6bd37341df
Merge pull request #92 from OdyX/dev-default-datadir
...
Set a default datadir, in sync with the data installation path.
2012-12-16 13:15:31 -08:00
a266692615
Use default installation paths for i18n.
...
This finishes the work started in
19b75e1743
2012-12-16 21:56:55 +01:00
c190c3efae
Set a default datadir, in sync with the data installation path.
2012-12-16 21:53:48 +01:00
0b78ebd0f7
Merge pull request #89 from OdyX/dev-fix-gmock
...
Fix Google Mock system library building
2012-12-16 10:17:32 -08:00
86c356a6f5
GMock: fixed using system package
2012-12-16 17:20:34 +01:00
4808eefd7d
Fix Google Mock system library building
2012-12-16 16:09:58 +01:00
56a170391f
Split gtest and gmock, fixed using system packages
...
- split the bundled gtest and gmock libraries
- allowed the use of system gmock
- refactoring in CMakeLists
2012-12-16 13:22:58 +01:00
72ce040054
Merge branch 'master' into dev
2012-12-15 20:23:58 +01:00
Didier Raboud