Piotr Dziwinski
aab79c6b5d
Changed ASM_TRAP() to assert(0)
2013-11-25 20:03: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
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
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
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
bea84f0af4
Don't set rpath if libCBot is compiled statically
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
8b65e9b56f
Add russian language support
2013-11-07 14:44:12 +01: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
Didier 'OdyX' Raboud
9e9a9937ba
Revert "Include SDL.h in main.cpp to make sure the main loop is SDL's main loop"
...
This was the wrong fix for the problem.
This reverts commit f31a570d96
.
2013-10-29 14:43:29 +01:00
Didier 'OdyX' Raboud
ee90f02bc4
Add an icon and executable information to the colobot.exe when build in MXE
2013-10-29 14:40:58 +01:00
Piotr Dziwinski
70af33e45d
Revert "Merge pull request #243 from OdyX/dev-fix-textures-loading"
...
Looks like it doesn't work on all platforms
2013-10-28 19:36:43 +01:00
Didier Raboud
c2a717d5c9
Let mouse.png's format be detected
...
Fixes the mouse cursor on Mac OS X
2013-10-28 15:25:14 +01:00
Didier 'OdyX' Raboud
9e439d88bf
Fix the detection of alpha-channel in textures as created by IMG_Load
...
This fixes the textures loading under Mac OS X
2013-10-28 15:23:56 +01:00
Didier 'OdyX' Raboud
f31a570d96
Include SDL.h in main.cpp to make sure the main loop is SDL's main loop
...
This allows the MacOSX program to start.
2013-10-26 13:19:13 +02:00
Didier 'OdyX' Raboud
97baf7242e
Fix system_other implementation by adding an Init() and fixing the wrong const
2013-10-24 21:12:52 +02:00
Didier 'OdyX' Raboud
591ba30a00
Include the OpenAL headers using the "al.h" form, as recommended by its CMake finder script
2013-10-24 21:12:52 +02:00
Didier 'OdyX' Raboud
b3b6a40d9e
MacOSX: Add initial support in CMake build infra
2013-10-24 21:12:52 +02:00
Piotr Dziwinski
9017dbbbdb
Fixed CTerrain-related memory leaks
2013-10-13 14:44:12 +02:00
Piotr Dziwinski
ccb63bd29e
Fixed memory leaks in CText
2013-10-12 21:14:33 +02:00
Piotr Dziwinski
5d0d9b5aa5
Fixed some CBot-related memory leaks
...
* fixed leaks in CScript::CheckToken()
* fixed leaks in CInterface
* commented out unused function in robotmain.cpp
2013-10-12 18:50:30 +02:00
krzys-h
d70d31acc1
Fix for #232 - Images in SatCom
...
Only images, icons still don't work
2013-09-28 11:13:45 +02:00
krzys-h
39866db502
Fixed @Emxx52 's fail :P
...
Merge branch 'master' into dev
Conflicts:
src/app/app.cpp
2013-09-08 17:55:48 +02:00
Emxx52
2891c2ea4c
Added '-game' launch option
2013-09-08 17:05:11 +02:00
erihel
b5e87aa91f
Datadir in command line didn't work with config.
...
Values from config file overwrote datadir
2013-07-16 16:00:06 +02:00
Piotr Dziwinski
f8a6c6750a
Fix for #228
...
* "empty" objects were wrongly handled in CPyro
2013-06-26 20:44:17 +02:00
erihel
41fa8458c2
Some Ui refactoring
2013-06-24 22:09:39 +02:00
Piotr Dziwinski
81a6de41a5
Some further changes in CMakeLists
...
* removed DEV_BUILD autodetection (could be confusing)
* ignore desktop subdirectory on Windows
* some refactoring
2013-06-24 14:17:28 +02:00
Piotr Dziwinski
3e989c96df
Fixed auto-detecting locale on Windows
...
* localename library is now used to determine the actual locale used
* added patched version of FindGettext.cmake to fix
installation path of translation files
2013-06-24 14:16:39 +02:00
Piotr Dziwinski
9f819088a6
gitignore update
...
* git should now ignore all generated files when building without
separate build directory
2013-06-22 22:44:03 +02:00
Piotr Dziwinski
bfcce26f89
Changes in build organization
...
* targets are now created in top-level build directory
* more things are now configured through CMake options
* changed debug build detection from NDEBUG to DEV_BUILD
* moved po and desktop directories
* moved last unit test out of src directory
2013-06-22 01:17:19 +02:00
Piotr Dziwinski
1377e48910
Reverted enum values to fix UT regression
2013-06-22 01:17:19 +02:00
Piotr Dziwinski
28b4e9a634
Fixed terrain light priorities (fix for #139 )
...
* lights illuminating the terrain specified in scene file are now
always moved to front of light ordering
2013-06-20 23:14:37 +02:00
Piotr Dziwinski
4c33172e17
Fixed string formats in light debug prints
2013-06-17 20:52:56 +02:00
Piotr Dziwinski
366d3a551e
Added debug aids for lighting
...
* displaying positions of current lights (F11)
* dumping info to console (F10)
* added assert() in suspicious place in CPyro
2013-06-17 18:17:21 +02:00
krzys-h
868b592706
Added -proto to options[]
2013-06-17 16:26:25 +02:00
Piotr Dziwinski
b4700e3bed
Fix for #133
...
* objects are now copied and textures are updated correctly
* also added function to debug objects
2013-06-17 11:48:57 +02:00
Piotr Dziwinski
7874aca10c
Enhanced logging, option to auto-start mission
...
* added logging of application events
* changed debug mode flag to independent debug modes
* added option to auto-start mission (load a mission immediately
after startup)
* removed "enum value out of range" prints
* some refactoring
2013-06-16 21:54:36 +02:00
Piotr Dziwinski
7cf8811888
Fix for #195
...
* loading time now is not counted in elapsed time
2013-06-13 17:25:58 +02:00
krzys-h
e8e220085a
Fixed bug with showing wrong filename in Level Checker errors after using CacheAudio
2013-06-10 15:44:25 +02:00