Commit Graph

1207 Commits (4bdfa0aa4ee3ad00429e8d68823532bdb2d72a97)

Author SHA1 Message Date
Piotr Dziwinski aab79c6b5d Changed ASM_TRAP() to assert(0) 2013-11-25 20:03:06 +01:00
Piotr Dziwinski 405db2d70c Updated INSTALL-MXE instructions 2013-11-23 00:51:06 +01:00
Piotr Dziwinski 29b1f9e4c6 Fix for error with multiple definitions in MXE build 2013-11-23 00:50:06 +01:00
Piotr Dziwiński 8ed542a881 Merge pull request #250 from OdyX/dev-platform-enhancements-and-installers
MacOSX and Windows platform enhancements and installers
2013-11-22 15:16:12 -08:00
Didier 'OdyX' Raboud 89e2855f95 Consolidate SYSTEM_CPP_MODULE in the main CMakeLists.txt 2013-11-20 10:39:06 +01:00
Piotr Dziwiński b3b80b5fbb Merge pull request #251 from OdyX/dev-fix-tests
Fix build tests as well as other useful tests
2013-11-19 10:09:10 -08:00
Piotr Dziwiński 5514c950b9 Merge pull request #252 from OdyX/dev-fix-tooltip-color
Fix tooltip to display as white and not transparent
2013-11-19 10:08:32 -08:00
Didier Raboud 3bcf80a82a Tweak tooltip margin and correct french jargon comment 2013-11-19 17:22:25 +01:00
Didier Raboud f4355b8b8e Fix tooltip to display as white and not transparent 2013-11-19 17:12:16 +01:00
Didier Raboud 86c0eb193d Run image_test 2013-11-18 16:24:41 +01:00
Didier Raboud ca82353e81 Re-enable profile_test test 2013-11-18 16:13:19 +01:00
Didier Raboud 6e31af3923 Initialise CSystemUtils' singleton in the three light, transform and model tests
Also fix README
2013-11-18 13:05:08 +01:00
Piotr Dziwinski 81b940cc25 Fix for crash when loading PNG in indexed mode
For example, some icons in SatCom
2013-11-15 10:22:49 +01:00
Piotr Dziwinski be3d92ba03 Updated data submodule 2013-11-14 20:54:18 +01:00
Didier Raboud 4e2ac61ee6 Enable OpenAL in CI build 2013-11-14 14:49:25 +01:00
Piotr Dziwinski 418f57f8be Buffer overflow fix 2013-11-13 18:51:52 +01:00
Didier 'OdyX' Raboud d7af8204ce On MacOSX, assume we do have CFLocaleCopyCurrent to detect the actual locale by hard-coding the fact in config.h.cmake
This circumvents the fact that we are using localename.c directly instead of relying on the autotools-generated config.h
2013-11-13 17:41:41 +01:00
Didier 'OdyX' Raboud ba8dcc887f Add an INSTALL file for MacOSX 2013-11-13 16:53:49 +01:00
Didier 'OdyX' Raboud 642034eda9 Update the MXE install README to document the creation of the installer 2013-11-13 16:53:49 +01:00
Didier 'OdyX' Raboud fda831d991 Add MacOSX Bundle and Windows NSIS installer
- Add two images from screenshots or existing data textures to brand the NSIS installer
2013-11-13 16:53:49 +01:00
Didier 'OdyX' Raboud 6b3e6694e3 On MacOSX, install files to Bundle-specific directories 2013-11-13 09:35:32 +01:00
Didier 'OdyX' Raboud bea84f0af4 Don't set rpath if libCBot is compiled statically 2013-11-13 09:35:32 +01:00
Didier 'OdyX' Raboud ffdba25411 Add MacOSX bundle-specific installation paths 2013-11-13 09:35:32 +01:00
Didier 'OdyX' Raboud aeefdbd1be On MacOSX, define the LangPath as being i18n in the Resources path of the bundle 2013-11-13 09:35:32 +01:00
Didier 'OdyX' Raboud b32f87bac7 Abstract the definition of LangPath to CSystemUtils 2013-11-13 09:35:32 +01:00
Didier 'OdyX' Raboud 93727a3fdf On MacOSX, don't cache the Data, Sound and Music paths
As users can potentially move the bundle around, it doesn't make sense to cache these

(It would probably make sense to drop this caching on all architectures, but it's only on MacOSX where it hurts most)
2013-11-13 09:35:32 +01:00
Didier 'OdyX' Raboud e78d2cce18 On MacOSX, define the DataPath as being the Resources path in the bundle 2013-11-13 09:35:32 +01:00
Didier 'OdyX' Raboud 17ad3e5a90 Abstract the definition of DataPath to CSystemUtils 2013-11-13 09:35:31 +01:00
Didier 'OdyX' Raboud 8f7f56f1ea On Mac OS X, write colobot.ini and savegames to Application Support directories 2013-11-13 09:35:31 +01:00
Didier 'OdyX' Raboud 68d9a72357 Generate an icns icon on Mac OSX 2013-11-13 09:35:19 +01:00
Didier 'OdyX' Raboud 11dd911faf Under MacOSX, generate an Info.plist 2013-11-13 09:34:24 +01:00
Piotr Dziwinski 99b3ff78f8 Fixed missing "\n" in ru.po 2013-11-12 19:46:37 +01:00
Piotr Dziwinski 788800f570 Russian translation of interface (#249) 2013-11-12 19:02:28 +01:00
Piotr Dziwinski 7a1a388216 Updated data submodule 2013-11-11 14:16:28 +01:00
Piotr Dziwinski 512fa82df3 Updated data submodule 2013-11-10 23:08:38 +01:00
Didier 'OdyX' Raboud 9638327932 Drop redundant custom_target for po4a 2013-11-08 10:01:24 +01:00
Didier 'OdyX' Raboud d8762fdd8d Reorder desktop/CMakeLists.txt for more platform-specific clarity 2013-11-08 10:01:24 +01:00
Didier 'OdyX' Raboud bf0c0227ec Fix tab-vs-space in CMake configuration file 2013-11-08 10:01:24 +01:00
Erihel 103044649f Merge pull request #248 from OdyX/dev-add-russian
Add russian basic support
2013-11-07 06:45:03 -08:00
Didier 'OdyX' Raboud 8b65e9b56f Add russian language support 2013-11-07 14:44:12 +01:00
krzys-h 47bc95a47c Merge pull request #246 from OdyX/dev-fix-mxe-build
Only use PO4A on desktop file and manpages on non-Windows builds
2013-11-05 07:23:22 -08:00
Didier 'OdyX' Raboud 116d72a4b7 Only use PO4A on desktop file and manpages on non-Windows builds
Fixes the MXE-with-PO4A build
2013-11-05 15:00:02 +01:00
Piotr Dziwinski 881802b050 Fixed version codename (-alpha) 2013-11-03 23:30:25 +01:00
Piotr Dziwinski f1c5cd5f82 Colobot Gold 0.1.1-alpha 2013-11-03 13:04:57 +01:00
Piotr Dziwinski d8e50e4eeb Version bump (0.1.1) 2013-11-03 13:02:25 +01:00
Piotr Dziwinski 74b99781e8 Updated data submodule 2013-11-03 12:54:41 +01:00
Piotr Dziwiński f0ee721bec Merge pull request #241 from OdyX/dev-fix-licensing-problems
colobot-data: Files under unclear license
2013-11-03 02:34:50 -08:00
Didier Raboud 2acc338c3a Drop now-useless display of licenses.txt in PHASE_GENERIC
The content of licenses.txt in data has gotten useless as the
restrictions got waived, displaying it is useless.
2013-10-30 21:51:05 +01:00
Piotr Dziwiński 816f4e91b9 Merge pull request #245 from OdyX/dev-platform-fixes
Platform fixes (Windows Icon and Mac OSX SDL_Main fix)
2013-10-29 14:12:07 -07:00
Piotr Dziwinski cd97feabb0 Revert back "Merge pull request #243 from OdyX/dev-fix-textures-loading"
False alarm, was caused probably by faulty build bot.
This definately should work on all platforms.
2013-10-29 22:04:12 +01:00