Commit Graph

605 Commits (c190c3efaec57dcb550a57a56538010ff5e2b532)

Author SHA1 Message Date
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 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 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
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 0305e0ba17 Restext rewrite to runtime initialized arrays 2012-10-17 23:16:19 +02:00
Piotr Dziwinski f6e27099b2 Doxygen/comment fixes and some #include refactoring 2012-10-17 21:55:45 +02:00
Piotr Dziwinski 9738631e5e Removed unnecessary dynamic_casts 2012-10-17 21:48:40 +02:00
Zaba999 0ca089f4d0 Saving scripts on game save should work. Added stub for particle. 2012-10-11 23:30:37 +02:00
Zaba999 7575ffd49b Merge branch 'dev' of https://github.com/colobot/colobot into dev 2012-10-11 23:10:07 +02:00
Zaba999 8a932fed3e Added saving user scripts on game save. Fixed bug in writing script to file. 2012-10-11 23:09:29 +02:00
Michał Zieliński dfe21c5a9c Removed Gfx:: from license notice (introduced in 8ad15c0e) 2012-10-08 21:50:38 +02:00
Piotr Dziwinski 97f44035f1 Changing and saving input bindings 2012-10-07 00:46:46 +02:00
adiblol f608828761 Fixed stupid coding mistake in CBotString.cpp 2012-10-07 00:10:20 +02:00
adiblol 70dae8796e Fixed stupid coding mistake in CBotString.cpp 2012-10-07 00:09:50 +02:00
adiblol 7818d5d096 Setting speed now works. Added ability to set 4x and 8x using "speed4" and "speed8" cheat codes respectively. 2012-10-06 23:35:27 +02:00
Piotr Dziwinski 2414861175 Merge branch 'dev' of github.com:colobot/colobot into dev 2012-10-05 23:36:07 +02:00
Piotr Dziwinski fbe19c49c5 Merge branch 'dev-graphics' into dev 2012-10-05 23:27:26 +02:00
Michał Zieliński ec32b1df35 Commented out profile_test 2012-10-05 23:26:13 +02:00
Piotr Dziwinski b68c903747 Disabled window resize 2012-10-05 22:34:22 +02:00
Michał Zieliński b7667cef35 Added "make install" target. 2012-10-05 22:07:58 +02:00
Michał Zieliński 602273e04a Modified .gitignore file to make git status output clearer 2012-10-05 22:06:26 +02:00
adiblol 0c6b6fccd9 Merge remote-tracking branch 'origin/dev' into dev-graphics 2012-10-05 20:39:23 +02:00
adiblol b5a7708f99 Refactoring: changed UNIT to g_unit in CRobotMain class 2012-10-05 20:37:20 +02:00
Piotr Dziwinski 6fdaf5de46 CParticle rewrite 2012-10-05 18:59:49 +02:00
Piotr Dziwinski ff99b74b25 Some CPyro docs 2012-10-05 18:59:03 +02:00
Piotr Dziwinski 37302a2504 CLightning rewrite 2012-10-05 15:26:24 +02:00
Piotr Dziwinski 703f03f316 CPyro rewrite 2012-10-03 00:30:17 +02:00
Piotr Dziwinski 858b1e35ae Spot light angle fix 2012-10-03 00:29:59 +02:00
Piotr Dziwinski 3f7f013168 Merge branch 'dev' into dev-graphics 2012-10-02 22:17:30 +02:00
Zaba999 4b7ca3f262 Further work on saving profile and directory listing. 2012-10-02 21:44:14 +02:00
adiblol ba3dce3aed Merge remote-tracking branch 'origin/dev' into dev-graphics 2012-09-30 17:10:40 +02:00
adiblol ac1472621a Fixed not working message(...) CBot function 2012-09-30 17:09:49 +02:00
adiblol 8f99efd861 Merge remote-tracking branch 'origin/dev' into dev-graphics 2012-09-30 16:01:39 +02:00
adiblol cb634db2ec Fixed segfault when using empty strings with CBotString::operator+ 2012-09-30 16:00:34 +02:00
Piotr Dziwinski 85d253b094 Fixed bugs in texture coloring 2012-09-30 11:26:59 +02:00