4680137ca4
On MacOSX, use SDL_Main
2013-10-29 14:54:11 +01:00
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
ee90f02bc4
Add an icon and executable information to the colobot.exe when build in MXE
2013-10-29 14:40:58 +01:00
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
75871cc9ca
Merge pull request #243 from OdyX/dev-fix-textures-loading
...
Fix the detection of alpha-channel in textures as created by IMG_Load
2013-10-28 10:11:54 -07:00
c2a717d5c9
Let mouse.png's format be detected
...
Fixes the mouse cursor on Mac OS X
2013-10-28 15:25:14 +01:00
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
19a7196b61
Merge pull request #242 from OdyX/dev-macosx
...
Mac OSX (Darwin) build support
2013-10-26 09:21:03 -07:00
9ddb034bfa
Add libintl library to the unit tests on Mac OSX
2013-10-26 13:19:23 +02:00
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
7fb83068ed
Fix for CMakeLists error
2013-10-24 21:48:14 +02:00
8d62da0c99
Added option to force to use bundled gmock/gtest
...
* resolves problem when version of gmock/gtest found installed in system
disagrees with the bundled one
* removed -DGTEST_HAVE_PTHREAD=0, seems that pthread is needed after all
2013-10-24 21:37:07 +02:00
97baf7242e
Fix system_other implementation by adding an Init() and fixing the wrong const
2013-10-24 21:12:52 +02:00
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
b3b6a40d9e
MacOSX: Add initial support in CMake build infra
2013-10-24 21:12:52 +02:00
485d0baf67
Updated data submodule
2013-10-24 18:37:24 +02:00
9017dbbbdb
Fixed CTerrain-related memory leaks
2013-10-13 14:44:12 +02:00
ccb63bd29e
Fixed memory leaks in CText
2013-10-12 21:14:33 +02:00
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
141f73866e
Updated data submodule
2013-10-12 13:50:34 +02:00
d70d31acc1
Fix for #232 - Images in SatCom
...
Only images, icons still don't work
2013-09-28 11:13:45 +02:00
ec38c14ee8
Do not change master branch unless you REALLY know what U R doing!
...
Revert "Added '-game' launch option"
This reverts commit 2891c2ea4c
2013-09-23 05:31:13 +02:00
39866db502
Fixed @Emxx52 's fail :P
...
Merge branch 'master' into dev
Conflicts:
src/app/app.cpp
2013-09-08 17:55:48 +02:00
2891c2ea4c
Added '-game' launch option
2013-09-08 17:05:11 +02:00
b5e87aa91f
Datadir in command line didn't work with config.
...
Values from config file overwrote datadir
2013-07-16 16:00:06 +02:00
3e8568bda4
Fixed test binaries location
2013-06-29 00:31:30 +02:00
a4b3b7d0af
Typo fix
2013-06-27 19:43:06 +02:00
f8a6c6750a
Fix for #228
...
* "empty" objects were wrongly handled in CPyro
2013-06-26 20:44:17 +02:00
26870551d7
Forgotten compile flag
2013-06-26 20:44:17 +02:00
41fa8458c2
Some Ui refactoring
2013-06-24 22:09:39 +02:00
5c15855009
Post-alpha phase
2013-06-24 21:40:51 +02:00
7c2e955e15
Colobot Gold 0.1.0-alpha
2013-06-24 21:37:15 +02:00
b376486fd7
Colobot Gold 0.1.0-alpha
2013-06-24 21:32:14 +02:00
8d82fd61bc
Fix for tests compilation
2013-06-24 14:46:13 +02:00
a26ee5a78f
Fix for travis CI build
2013-06-24 14:34:17 +02:00
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
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
78c167064b
Fix for MSYS/MXE build
2013-06-22 23:15:56 +02:00
112d6843be
Updated INSTALL files
2013-06-22 22:44:10 +02:00
9f819088a6
gitignore update
...
* git should now ignore all generated files when building without
separate build directory
2013-06-22 22:44:03 +02:00
8cb2e54de8
Futher changes to CMake options
...
* OpenAL sound is now enabled by default
* Boost is linked dynamically by default
2013-06-22 22:33:06 +02:00
a224ae4408
Fix man build target dependencies
...
* could cause fails when make is run with many threads
2013-06-22 21:32:30 +02:00
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
1377e48910
Reverted enum values to fix UT regression
2013-06-22 01:17:19 +02:00
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
4c33172e17
Fixed string formats in light debug prints
2013-06-17 20:52:56 +02:00
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
868b592706
Added -proto to options[]
2013-06-17 16:26:25 +02:00
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
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
Didier 'OdyX' Raboud