immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,041 Commits
19 Branches
15 Tags
59 MiB
Commit Graph

155 Commits (44083053ce13662e91415a7bdc676718fbf5984b)

Author SHA1 Message Date
Piotr Dziwiński 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
Piotr Dziwinski 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
erihel 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
erihel 58f35e44ae * Removed alut 
* Using libsndfile to load sounds and music
* Added support for playing music files
 2013-01-14 22:55:16 +01:00
Didier Raboud 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
krzys-h 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
Piotr Dziwinski 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
Piotr Dziwinski 5a6b3f005a Merge dev and dev-graphics 2013-01-07 19:43:04 +01:00
Marcin Zawadzki ff5c890854 Small fix in detecting language. Fixes needed to compile code using clang 2013-01-05 23:03:26 +01:00
Piotr Dziwinski 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
Didier Raboud 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
Didier Raboud 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
Piotr Dziwinski e1325dc364 Fix for TEST_VIRTUAL 2012-12-29 14:35:14 +01:00
Didier Raboud 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
Didier Raboud 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
erihel f0e76ad446 sound fix 2012-12-20 21:57:57 +01:00
erihel a6ff654ae3 removing plugins for gold version (for mxe cross compiling) 2012-12-20 20:59:11 +01:00
Piotr Dziwinski f77734e01c Installation path fixes and CMakeLists refactoring 
make && make install should now give a working installation.
 2012-12-20 00:23:12 +01:00
Didier Raboud 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
Didier Raboud 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
krzys-h a044ec16a9 Merge pull request #97 from OdyX/dev-minor-cmake-grammar-fix 
Minor cmake grammar fix
 2012-12-18 03:45:06 -08:00
Didier Raboud 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
Didier Raboud 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
Didier Raboud 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
Didier Raboud c190c3efae Set a default datadir, in sync with the data installation path. 2012-12-16 21:53:48 +01:00
Piotr Dziwinski 86c356a6f5 GMock: fixed using system package 2012-12-16 17:20:34 +01:00
Piotr Dziwinski 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
Piotr Dziwinski 72ce040054 Merge branch 'master' into dev 2012-12-15 20:23:58 +01:00
Piotr Dziwinski 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
Michał Zieliński 3f79167323 Merge pull request #85 from OdyX/cmake_find_ltdl 
Add FindLTDL cmake module
 2012-12-14 10:10:07 -08:00
Didier Raboud 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
Didier Raboud 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
Zaba999 7575ffd49b Merge branch 'dev' of https://github.com/colobot/colobot into dev 2012-10-11 23:10:07 +02:00
Zaba999 8a932fed3e Added saving user scripts on game save. Fixed bug in writing script to file. 2012-10-11 23:09:29 +02:00
Michał Zieliński b7667cef35 Added "make install" target. 2012-10-05 22:07:58 +02:00
Piotr Dziwinski 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
Zaba999 cc9a507054 Profile rewritten to boost. Read/write to ini should work. 
Load/Save should work.
 2012-09-27 00:30:47 +02:00
Zaba999 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
Piotr Dziwinski 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
Piotr Dziwinski 6ab1746ec9 Compile fix 2012-08-12 19:22:43 +02:00
erihel f01296690e Merge branch 'dev-opengl' into dev 2012-08-12 17:09:11 +02:00
erihel 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
Piotr Dziwinski 61bfb22f27 Basic font rendering 
- added basic font rendering
- minor refactoring & fixes
 2012-08-03 23:23:13 +02:00
Piotr Dziwinski 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
Piotr Dziwinski 72c0188ec3 GLEW 
Added GLEW for loading OpenGL extensions
 2012-07-28 23:36:12 +02:00
Piotr Dziwinski ab8e55a651 Merge branch 'dev' into dev-opengl 
Pulled changes & resolved conflicts
 2012-07-27 18:09:50 +02:00
Zaba999 1910219518 Dependency on WINAPI completely removed. 2012-07-10 22:58:52 +02:00
Zaba999 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
Piotr Dziwinski 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
Piotr Dziwinski 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
Piotr Dziwinski 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
Piotr Dziwinski 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
Piotr Dziwinski 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
Piotr Dziwinski 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
Piotr Dziwinski 45b75ee37b Adding new MinGW branch 2012-04-15 01:02:51 +02:00