ccaac2c544
Rewrite unit tests to use HippoMocks
2015-05-13 00:52:18 +02:00
6c87144ae8
Merge branch 'ManuelBlanc-dev-osx' into dev
2015-04-28 15:18:37 -07:00
81096fd2ae
Fix Clang and GCC 4.6 compilation
2015-04-28 19:29:32 +02:00
bca9a019ae
Suppress some MSVC warnings
2015-04-27 20:02:22 +02:00
dec12fb977
Use wingetopt library on MSVC
2015-04-27 18:17:03 +02:00
3dce58c0fa
Replace override and noexcept with macros
2015-04-27 18:07:42 +02:00
f52650edb5
Add MSVC compiler detection
2015-04-27 18:03:06 +02:00
7bb12511d9
Implemented the OSX clipboard using the AppKit API
...
The X11 dependency is no longer needed on OSX, and has been removed
2014-12-11 23:31:41 +01:00
28389e1f41
Post-release alpha-0.1.4
2014-11-02 13:38:10 +01:00
e2be034ec3
Release alpha-0.1.4
2014-11-02 13:36:48 +01:00
0245fdc6c3
Merge branch 'dev-physfs' into dev
...
Conflicts:
src/app/app.cpp
2014-10-19 16:18:36 +02:00
7af92cc4ce
Added portable build flag
2014-10-18 20:00:30 +02:00
5274acd624
Merge with dev
2014-10-07 22:15:40 +02:00
74312b0405
Better CMake organization and unit test cleanups
...
* created a static library containing most source modules
to avoid compiling source modules twice in code and unit tests
* moved profile_test to main unit tests executable
* removed image_test and edit_test as not really useful
2014-08-12 20:58:55 +02:00
96d49d84aa
Merge branch 'dev' into dev-physfs
...
Conflicts:
data
src/app/gamedata.cpp
src/ui/control.cpp
src/ui/edit.cpp
src/ui/maindialog.cpp
2014-07-11 15:24:44 +02:00
c5abf18a57
Post-release 0.1.3-alpha
2014-07-01 21:05:06 +02:00
d9fee8b2ad
Release 0.1.3-alpha
2014-07-01 12:16:32 +02:00
2b9abf2a48
Fixed CMake git branch detection with build dir outside of repository working dir
2014-06-25 22:49:16 +02:00
2260f6bf4f
Big part of PhysFS support
...
* removed -mod argument
* removed -datadir argument
* removed -lang argument
* removed some dead ui code
* added resource manager and file loaders (stream and SDL)
* changed interface textures location to match new directory structure
* removed CGameData for mod support
* added PhysFS support
2014-06-20 23:51:28 +02:00
9a741a66a4
Changed version display in bottom-right corner to be actually version number instead of date
2013-12-27 11:15:36 +01:00
d9283e2afa
Fix problem with gtest and pthread on some systems
2013-12-20 20:19:21 +01:00
343fa8f0cb
Add a PLATFORM_GNU global variable matching all GNU systems such as Debian's Linux, kFreeBSD and Hurd
2013-11-27 18:53:28 +01:00
d6eb095f27
Colobot Gold 0.1.2-alpha
2013-11-26 00:42:46 +01:00
8c25650ad5
Version bump (0.1.2)
2013-11-26 00:39:44 +01:00
89e2855f95
Consolidate SYSTEM_CPP_MODULE in the main CMakeLists.txt
2013-11-20 10:39:06 +01:00
6b3e6694e3
On MacOSX, install files to Bundle-specific directories
2013-11-13 09:35:32 +01:00
ffdba25411
Add MacOSX bundle-specific installation paths
2013-11-13 09:35:32 +01:00
881802b050
Fixed version codename (-alpha)
2013-11-03 23:30:25 +01:00
d8e50e4eeb
Version bump (0.1.1)
2013-11-03 13:02:25 +01:00
4680137ca4
On MacOSX, use SDL_Main
2013-10-29 14:54:11 +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
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
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
a4b3b7d0af
Typo fix
2013-06-27 19:43:06 +02:00
26870551d7
Forgotten compile flag
2013-06-26 20:44:17 +02:00
5c15855009
Post-alpha phase
2013-06-24 21:40:51 +02:00
b376486fd7
Colobot Gold 0.1.0-alpha
2013-06-24 21:32:14 +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
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
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
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
c3e95d40a2
Added relative install paths for MXE build
2013-05-03 22:23:36 +02:00
f1873a52d5
* Minor changes to cmake files
2013-04-12 12:07:57 +02:00
bc760e3513
* Added X11 to libs in CMakefiles for linux build
2013-04-11 21:55:49 +02:00
01309c8bd0
* Added clipboard support (issue #60 )
...
* Fixed keyboard shortcuts while code editing in game
2013-04-11 13:37:15 +02:00
8301a3639b
Moved boost flags to CMakeLists
2013-03-27 20:54:04 +01:00
00a2abd21f
Fixed GCC 4.6 compilation
2013-03-25 09:49:42 +01:00
Piotr Dziwinski