immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
992 Commits
19 Branches
15 Tags
59 MiB
Commit Graph

992 Commits (b3b6a40d9ebe0ceeb1ce34f4de8acf57dc07fca0)

Author SHA1 Message Date
Piotr Dziwinski e3db0b0c19 Switched data submodule to dev branch 2012-12-19 21:27:21 +01:00
Piotr Dziwinski 3559100db9 Added colobot-data as git submodule 2012-12-19 21:25:40 +01:00
Piotr Dziwiński 842f4a15d8 Merge pull request #102 from OdyX/dev-fix_cmake_flags 
Fix CMake flags handling
 2012-12-19 12:25:15 -08:00
Piotr Dziwiński bba08ee200 Merge pull request #101 from OdyX/dev-reduce-dependencies-overload 
Reduce dependencies installation in travis
 2012-12-19 12:16:08 -08:00
Didier Raboud 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
Didier Raboud 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
Didier Raboud 0a82f8a842 Reduce dependencies installation in travis 
Use apt-get's --no-install-recommends.
 2012-12-19 15:18:18 +01:00
krzys-h fec2c1028a Merge pull request #100 from OdyX/dev-fix-rpath 
Fix RPath in installed colobot
 2012-12-19 02:38:19 -08:00
Didier Raboud c6c57c0e99 Fix RPath in installed colobot 2012-12-19 08:50:46 +01:00
Piotr Dziwiński 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
Didier Raboud 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
krzys-h a044ec16a9 Merge pull request #97 from OdyX/dev-minor-cmake-grammar-fix 
Minor cmake grammar fix
 2012-12-18 03:45:06 -08:00
krzys-h 1c473c3a82 Merge pull request #96 from OdyX/dev-build-doc 
Allow building and installation of documentation
 2012-12-18 03:44:26 -08:00
Didier Raboud 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
Didier Raboud 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
Erihel 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
Erihel 4e2982d4dd Merge pull request #93 from OdyX/master-markdown 
Move README to Markdown format
 2012-12-17 12:26:29 -08:00
Didier Raboud 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
Didier Raboud a9bc2cc70f Move README to Markdown format 2012-12-17 08:24:25 +01:00
Erihel 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
Didier Raboud 4827440e73 Merge branch 'dev' into dev-use-installed-i18n 
Conflicts:
	src/common/config.h.cmake
 2012-12-16 22:26:29 +01:00
Erihel 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
Didier Raboud a266692615 Use default installation paths for i18n. 
This finishes the work started in
19b75e1743 by actually using the
translation where they are installed.
 2012-12-16 21:56:55 +01:00
Didier Raboud c190c3efae Set a default datadir, in sync with the data installation path. 2012-12-16 21:53:48 +01:00
Erihel 0b78ebd0f7 Merge pull request #89 from OdyX/dev-fix-gmock 
Fix Google Mock system library building
 2012-12-16 10:17:32 -08:00
Piotr Dziwinski 86c356a6f5 GMock: fixed using system package 2012-12-16 17:20:34 +01:00
Didier Raboud 4808eefd7d Fix Google Mock system library building 2012-12-16 16:09:58 +01:00
Piotr Dziwinski f9f15a2f3f Revert "Merge pull request #88 from OdyX/dev-graphics-system-gtools" 
This reverts commit f5b4705cad, reversing
changes made to 4811defca2.
 2012-12-16 13:33:05 +01:00
Piotr Dziwinski 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
Piotr Dziwiński f5b4705cad Merge pull request #88 from OdyX/dev-graphics-system-gtools 
Use system-provided Google tools in dev-graphics
 2012-12-16 03:25:57 -08:00
Didier Raboud e127f5b631 Use system GMock and GTest if they are available 
- Drop library addition to upstream GTest.
- Fallback to convenience copy if the system libraries are not installed.
 2012-12-16 12:06:36 +01:00
Didier Raboud 1703319159 Emit info message for GTest source. 2012-12-16 11:53:35 +01:00
Piotr Dziwinski 72ce040054 Merge branch 'master' into dev 2012-12-15 20:23:58 +01:00
Piotr Dziwinski a4cf777fb8 Reverted lib/, fixed gtest path in CMakeLists.txt 
Some gtest system packages use name gtest-all.cc.
lib/ directory should be left in repository.
 2012-12-14 21:42:43 +01:00
Piotr Dziwinski 4811defca2 Static objects using OpenGL VBOs and display lists 2012-12-14 21:30:35 +01:00
Michał Zieliński 3f79167323 Merge pull request #85 from OdyX/cmake_find_ltdl 
Add FindLTDL cmake module
 2012-12-14 10:10:07 -08:00
Michał Zieliński 3b89637004 Merge pull request #83 from OdyX/fix_i18n_from_env 
Inherit translation setting from environment.
 2012-12-14 10:09:38 -08:00
Michał Zieliński 830fc19b8c Merge pull request #86 from OdyX/cmake_find_gtest 
Use system-provided Google test library.
 2012-12-14 10:08:50 -08:00
Didier Raboud e504fe1bb5 Use system-provided Google test library. 
This avoids library duplication, in favour of a shared (source) library:
libgtest-dev is available at least on Debian, Ubuntu, Gentoo, Fedora, at
the time of committing.

If the library is not found in system paths, a copy of it in lib/gtest
can work too.
 2012-12-14 16:36:07 +01:00
Didier Raboud 9b127fc0a3 Add FindLTDL cmake module 
As mentionned in FindLTDL.cmake, this is code that is hereby relicensed
under GPLv3.

closes #68
 2012-12-14 15:50:11 +01:00
Didier Raboud 6946155a56 Inherit translation setting from environment. 
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.
 2012-12-14 15:17:23 +01:00
Michał Zieliński 2173e86025 Merge pull request #82 from OdyX/i81_fix_translations 
Sorted translations alphabetically and created CMake rules for generating pot files.
 2012-12-13 14:10:04 -08:00
Didier Raboud 4f9bd4bd77 Update translations with newer colobot.pot. 2012-12-13 22:14:54 +01:00
Didier Raboud 19b75e1743 Handle translations with CMakes. 
closes #81
 2012-12-13 22:10:49 +01:00
Didier Raboud 41cacbc654 Sort translation files. 
This will ease future updates.
 2012-12-13 21:05:49 +01:00
Piotr Dziwinski 4a075edfec Updated info in README files 2012-11-26 21:01:32 +01:00
Piotr Dziwinski a30330e4d1 Updated info in README files 2012-11-26 21:00:03 +01:00
Piotr Dziwinski 39ac36efda Fixed syntax error in Blender script 2012-11-01 22:08:18 +01:00
Piotr Dziwinski 3ce488307f Performance counters 2012-10-25 23:29:49 +02:00
Piotr Dziwinski 3845efbbff Main loop enhancement 
Frame updates were posted one frame behind in event queue
 2012-10-25 20:27:40 +02:00