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
8aba2424bb
Bugfix DESKTOP option initialisation
2013-03-24 22:25:39 +01:00
195d6cded0
Fixed timer functions on win32
...
* changed win32 implementation to QueryPerformaceTimer system function
* refactored system utils code
* proper tests for time utils and update event creation in application
* should fix issue #134
2013-03-24 12:00:12 +01:00
87bc927d87
Updated README files, optional libsndfile
...
* updated readme files
* moved sndfile to optional
* changed install paths on Windows
2013-03-22 22:24:35 +01:00
4a30800cf1
Fixes for compiling on MSYS
...
* fixed SDL_main() and putenv() issues
* disabled desktop subdir for MSYS
* disabled building CBot_console for now
2013-03-22 19:17:08 +01:00
001d37b257
CInstanceManager refactoring
...
* removed classes managed by CInstanceManager
except for CObject, CPyro, CBrain and CPhysics
because of dependencies
* refactored instance searching to use existing singleton instances of
CApplication, CEngine and CRobotMain and calling their getter
functions
2013-02-17 12:11:56 +01:00
209c6412ae
Refactoring in tests infrastructure
...
* all tests are now in /test/ subdirectory
* unit tests concatenated to one executable (TODO: ui, common)
* preparation for test environments (OpenGL and others)
* removed old TestCBot
2013-02-03 20:03:36 +01:00
9f75a29e88
* Fixed sound pitch causing segfault
...
* Sound support should now compile fine with MXE
* Added cache for 3 music files to speedup loading
* Updated howto
2013-01-16 01:45:38 +01:00
58f35e44ae
* Removed alut
...
* Using libsndfile to load sounds and music
* Added support for playing music files
2013-01-14 22:55:16 +01:00
4444fde9d7
Use correct C++11/C++0x flags depending on the used compiler
...
See http://gcc.gnu.org/projects/cxx0x.html for details.
2013-01-10 10:13:21 +01:00
871542abf5
Merge pull request #114 from OdyX/dev-update-cmake-with-data
...
Let CMake rely on data's CMakeLists.txt if it exists
2013-01-09 04:36:06 -08:00
1285712aa2
CMakeLists enhancements
...
- compiler detection (clang and gcc version check)
- compile flags only for src/ subdir
- system and local include paths
- fix for clang compilation
2013-01-08 22:12:09 +01:00
5a6b3f005a
Merge dev and dev-graphics
2013-01-07 19:43:04 +01:00
ff5c890854
Small fix in detecting language. Fixes needed to compile code using clang
2013-01-05 23:03:26 +01:00
8818a8e5db
Corrected OpenGL extension detection
...
- corrected multitexture and VBO detection
- GLEW is now a required library
- minor CMakeLists refactoring
2013-01-05 23:03:06 +01:00
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
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
e1325dc364
Fix for TEST_VIRTUAL
2012-12-29 14:35:14 +01:00
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
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
f0e76ad446
sound fix
2012-12-20 21:57:57 +01:00
a6ff654ae3
removing plugins for gold version (for mxe cross compiling)
2012-12-20 20:59:11 +01:00
f77734e01c
Installation path fixes and CMakeLists refactoring
...
make && make install should now give a working installation.
2012-12-20 00:23:12 +01:00
7e9ef0c042
Put common CXX flags in common variables
...
CMAKE_CXX_FLAGS is taken into account in all builds; build-type-specific
flags are appended to it.
2012-12-19 16:55:00 +01:00
3c976c040b
Don't enforce CMake build type on users.
...
Only set CMAKE_BUILD_TYPE to Debug when no value is provided.
2012-12-19 16:52:17 +01:00
a044ec16a9
Merge pull request #97 from OdyX/dev-minor-cmake-grammar-fix
...
Minor cmake grammar fix
2012-12-18 03:45:06 -08:00
a7d837460f
Minor cmake grammar fix
...
It is redundant to have CMAKE_INSTALL_PREFIX in path definitions; drop them.
2012-12-18 09:11:57 +01:00
a1e9c4b880
Allow building and installation of documentation
...
Run `make doc` for the building. Then `make install` will install the
generated documentation.
- Move Doxyfile to Doxyfile.in, put CMAKE_CURRENT_SOURCE_DIR into it.
2012-12-17 22:16:07 +01:00
e062b74a3a
Install libCBot to a private directory
...
closes #90
- Make it configurable;
- Move stanzas above the src directory inclusion, otherwise the value
doesn't propagate.
2012-12-17 10:15:14 +01:00
c190c3efae
Set a default datadir, in sync with the data installation path.
2012-12-16 21:53:48 +01:00
86c356a6f5
GMock: fixed using system package
2012-12-16 17:20:34 +01:00
56a170391f
Split gtest and gmock, fixed using system packages
...
- split the bundled gtest and gmock libraries
- allowed the use of system gmock
- refactoring in CMakeLists
2012-12-16 13:22:58 +01:00
72ce040054
Merge branch 'master' into dev
2012-12-15 20:23:58 +01:00
a4cf777fb8
Reverted lib/, fixed gtest path in CMakeLists.txt
...
Some gtest system packages use name gtest-all.cc.
lib/ directory should be left in repository.
2012-12-14 21:42:43 +01:00
3f79167323
Merge pull request #85 from OdyX/cmake_find_ltdl
...
Add FindLTDL cmake module
2012-12-14 10:10:07 -08:00
e504fe1bb5
Use system-provided Google test library.
...
This avoids library duplication, in favour of a shared (source) library:
libgtest-dev is available at least on Debian, Ubuntu, Gentoo, Fedora, at
the time of committing.
If the library is not found in system paths, a copy of it in lib/gtest
can work too.
2012-12-14 16:36:07 +01:00
9b127fc0a3
Add FindLTDL cmake module
...
As mentionned in FindLTDL.cmake, this is code that is hereby relicensed
under GPLv3.
closes #68
2012-12-14 15:50:11 +01:00
7575ffd49b
Merge branch 'dev' of https://github.com/colobot/colobot into dev
2012-10-11 23:10:07 +02:00
8a932fed3e
Added saving user scripts on game save. Fixed bug in writing script to file.
2012-10-11 23:09:29 +02:00
b7667cef35
Added "make install" target.
2012-10-05 22:07:58 +02:00
e7e8954384
MXE support and CMake files refactoring
...
- added support for cross-compiling with MXE (http://mxe.cc/ )
- refactored CMake files, adding some options and moving definitions
to more suitable places
2012-09-29 17:19:23 +02:00
cc9a507054
Profile rewritten to boost. Read/write to ini should work.
...
Load/Save should work.
2012-09-27 00:30:47 +02:00
34a11021da
changed paths for models and levels. Now it's possible to load level. Merged with latest trunk
2012-09-20 23:04:37 +02:00
31c29ea482
CModelFile fixes; test framework
...
- fixes in CModelFile IO
- added Google Test framework for automatic testing
- rewrote modelfile_test in the new framework
2012-09-08 03:05:12 +02:00
6ab1746ec9
Compile fix
2012-08-12 19:22:43 +02:00
f01296690e
Merge branch 'dev-opengl' into dev
2012-08-12 17:09:11 +02:00
9946459c0c
* changed 0, NULL to nullptr
...
* changed profile.cpp to use SimpleIni to load config files
* added new CProfile singleton class for loading config
* added SimpleIni to lib/ dir
* added config loading tests
2012-08-09 23:04:29 +02:00
61bfb22f27
Basic font rendering
...
- added basic font rendering
- minor refactoring & fixes
2012-08-03 23:23:13 +02:00
5e637ca028
Switched to new style casts
...
- rewrote old C-style casts to new ..._cast<>
- corrected some dangerous casts
- added -Wold-style-cast to compile flags
2012-07-30 22:59:18 +02:00
72c0188ec3
GLEW
...
Added GLEW for loading OpenGL extensions
2012-07-28 23:36:12 +02:00
ab8e55a651
Merge branch 'dev' into dev-opengl
...
Pulled changes & resolved conflicts
2012-07-27 18:09:50 +02:00
1910219518
Dependency on WINAPI completely removed.
2012-07-10 22:58:52 +02:00
dbd62c96aa
Fixed code compilation without fpermissive flag.
...
Removed Winapi, but now library don't work - work in progress.
Some translations.
2012-07-04 22:14:28 +02:00
f95df35dc5
Multitexturing support
...
- added CImage class for loading/saving images and a simple test for it
- added libpng library to build
- added Gfx::Texture struct
- updated the Gfx::CDevice interface to include new features
- implemented the new features in Gfx::CGLDevice
2012-07-04 00:04:53 +02:00
9bd4ec03b2
CDevice interface and stub of implementation
...
- added CDevice abstract interface
- began implementation of CGLDevice
- added stub for Texture struct
- created CGLDeviceConfig
- changed particule -> particle & other minor changes
2012-07-01 01:37:30 +02:00
9a268f5538
Switched back to old standard; addded -Wall
...
- removed -std=c++11
- added -Wall and removed most reported warnings
2012-06-30 10:16:52 +02:00
e37019943c
Event handling, CApplication and switch to c++-11
...
- added/changed event structs and event queue in common/event.h
- added event handling and some minor functions in CApplication
- switched to --std=c++11 because of union in Event struct
2012-06-30 00:12:04 +02:00
e738c55b73
Removed old code and build target
...
- removed directory with old target
- changed CMakeLists.txt to new target only and temporarily commented
out reference to CBot
- updated README
2012-06-26 23:39:31 +02:00
b08a63790c
SDL project
...
- added (very basic) SDL template in CApplication and CEngine
- split project into two targets: colobot_old (dependent on DirectX and WinAPI)
and colobot_new (dependent on SDL and OpenGL)
- moved sound.h/cpp to old/ and created new template in Snd namespace
- added platform-independent dialog boxes in app/system.h/cpp
2012-06-25 19:59:17 +02:00
45b75ee37b
Adding new MinGW branch
2012-04-15 01:02:51 +02:00
Piotr Dziwinski