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

888 Commits (f419293207fe27113fb16daebec959e94a30dbee)

Author SHA1 Message Date
Michał Zieliński 1d42c71645 Merge pull request #115 from OdyX/dev-add-categories-to-desktop-file 
Add categories to Desktop Entry file
 2013-01-02 10:09:41 -08:00
Didier Raboud ba0679a1d7 Add categories to Desktop Entry file 
As per the "Desktop Menu Specification" 1.0, especially Appendix A.
 2013-01-02 19:00:38 +01:00
Didier Raboud ffb4d9ff4f Let CMake rely on data's CMakeLists.txt if it exists 
- Also update data to latest 'dev', where the CMakeLists exists
 2013-01-02 14:35:46 +01:00
Didier Raboud 3fa5e9c9cc In levels' lists, fallback to english 
- Implemented in a naive way: Take the English version if found, but
  continue until the translated version is found. This has the drawback
  of letting the loop reach its end if the level has no translation.
 2013-01-02 12:24:51 +01:00
Didier Raboud 16d97f9121 Revert "Minor cmake grammar fix" 
It appears I was really wrong. Damn.

This reverts commit 277629f9fe.
 2012-12-30 12:16:43 +01:00
Piotr Dziwinski 28b9e83093 Merge branch 'master' into dev 2012-12-29 15:05:40 +01:00
Piotr Dziwinski a134cb75c5 Merge of master and dev 2012-12-29 15:01:57 +01:00
Piotr Dziwinski e1325dc364 Fix for TEST_VIRTUAL 2012-12-29 14:35:14 +01:00
erihel ea3e97b26d * Fixed problem with scrolling down text fields with mouse scroll 
* Fixed problem with scroll bar not updating position properly in text fields
 2012-12-29 13:32:11 +01:00
erihel 03f232f0f6 Merge branch 'dev' of github:colobot/colobot into dev 2012-12-29 13:00:59 +01:00
Piotr Dziwiński e625665f02 Merge pull request #108 from OdyX/dev-central-cmake-version 
Create a central version
 2012-12-29 02:44:03 -08:00
Piotr Dziwiński 89296b20bd Merge pull request #109 from OdyX/dev-more-language-fixes 
Some more language fixes
 2012-12-29 02:43:00 -08:00
Didier Raboud 1b4208cdc5 Implement language Char for level files 
This currently lacks fallback to an existing entry for non-translated entries
 2012-12-28 23:06:12 +01:00
Didier Raboud f4c6f49b2f Move language initialisation in SetLanguage 2012-12-28 22:31:47 +01:00
erihel c9ca8f2b62 * Fixed segault when could not set sound pitch (bad logger call) 
* All 81 audio files should be loaded instead of 69 high quality
* Changed volume ajustment formula to proper one
 2012-12-28 21:19:50 +01:00
Piotr Dziwinski 3e4c1a1ad8 Replaced malloc/free with new/delete 
- now new/delete used everywhere except for CBotStack, which
   has to be fixed in other way
 - some segfaults should be fixed with this
 2012-12-28 13:37:08 +01:00
Piotr Dziwinski 2ebe1fbcb6 Fixed spider and worm model loading 2012-12-28 13:23:49 +01:00
Piotr Dziwinski 4cbb63f5b7 Fixed path for loading sounds 2012-12-28 12:06:37 +01:00
Didier Raboud 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
Piotr Dziwiński b046c33206 Merge pull request #106 from OdyX/dev-fix-translations 
Fix translations
 2012-12-27 07:37:28 -08:00
Piotr Dziwiński 0a0e536d65 Merge pull request #105 from OdyX/dev-desktop-file-man 
Add manpage for colobot
 2012-12-27 07:36:58 -08:00
Piotr Dziwinski 45bee618f9 Fixed unicode rendering bug 2012-12-27 16:32:46 +01:00
Piotr Dziwiński 233f5a7c59 Merge pull request #107 from OdyX/dev-fix-locales 
Fix locale's loading
 2012-12-27 07:23:42 -08:00
Didier Raboud 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
Piotr Dziwinski 3582f107a5 Fixes and refactoring 2012-12-27 14:18:16 +01:00
Didier Raboud 85283a76be Update translations 
In particular, update french
 2012-12-27 14:09:19 +01:00
Didier Raboud 7a5e41e1ec Update colobot.pot using update-pot 2012-12-27 13:54:40 +01:00
Didier Raboud 877774a226 Update translation pot-file and build-target 2012-12-27 13:52:47 +01:00
Didier Raboud afea08d570 Always build manpages 
solves #105
 2012-12-27 13:13:16 +01:00
Didier Raboud 15efd65e72 Merge branch 'dev' into dev-desktop-file-man 2012-12-27 13:07:22 +01:00
Michał Zieliński cf65681f80 Revert "Merge branch 'dev-desktop-file-man' of https://github.com/OdyX/colobot" 
This reverts commit 9f3acdcdde, reversing
changes made to fb13c0f219.
 2012-12-27 12:55:59 +01:00
Michał Zieliński 9f3acdcdde Merge branch 'dev-desktop-file-man' of https://github.com/OdyX/colobot 2012-12-27 12:44:06 +01:00
Michał Zieliński fb13c0f219 Merge branch 'dev-desktop-file' of git://github.com/OdyX/colobot 2012-12-27 12:40:58 +01:00
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