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

705 Commits (4444fde9d7dc8a4b060e97bac7235aba37de02dd)

Author SHA1 Message Date
Michał Zieliński 70cb629cc5 Merge pull request #104 from OdyX/dev-minor-cmake-grammaer-fix 
Minor cmake grammar fix
 2012-12-27 03:25:59 -08:00
Michał Zieliński a30b35b8fe Merge pull request #103 from OdyX/dev-desktop-file 
Add desktop and icon files
 2012-12-27 03:25:39 -08:00
Didier Raboud 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
Didier Raboud 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
Didier Raboud 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
Didier Raboud 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
Piotr Dziwinski 5574eccebd Engine optimization - rewritten model management 
- new class CModelManager
 - rewritten engine object structure in CEngine
 - created shared model data instead of separate objects per each
   model instance
 - minor refactoring
 2012-12-26 20:58:02 +01:00
erihel 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
erihel 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
erihel 6d607e3ae8 latest changes 2012-12-21 17:31:55 +01:00
erihel f0e76ad446 sound fix 2012-12-20 21:57:57 +01:00
erihel a6ff654ae3 removing plugins for gold version (for mxe cross compiling) 2012-12-20 20:59:11 +01:00
Piotr Dziwinski f77734e01c Installation path fixes and CMakeLists refactoring 
make && make install should now give a working installation.
 2012-12-20 00:23:12 +01:00
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