| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
* 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
|
|
|
|
|
|
| |
* Sound support should now compile fine with MXE
* Added cache for 3 music files to speedup loading
* Updated howto
|
|
|
|
|
| |
* Using libsndfile to load sounds and music
* Added support for playing music files
|
|
|
|
|
|
|
| |
- compiler detection (clang and gcc version check)
- compile flags only for src/ subdir
- system and local include paths
- fix for clang compilation
|
|
|
|
|
|
| |
- corrected multitexture and VBO detection
- GLEW is now a required library
- minor CMakeLists refactoring
|
|\ |
|
| |
| |
| |
| |
| |
| | |
- Add po4a as build-dependency for travis
(but it fallsback to english-only if not found)
- Add (easy) french translation
|
| | |
|
| | |
|
| |
| |
| |
| | |
make && make install should now give a working installation.
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
closes #90
- Make it configurable;
- Move stanzas above the src directory inclusion, otherwise the value
doesn't propagate.
|
| |
| |
| |
| |
| |
| | |
- split the bundled gtest and gmock libraries
- allowed the use of system gmock
- refactoring in CMakeLists
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
As mentionned in FindLTDL.cmake, this is code that is hereby relicensed
under GPLv3.
closes #68
|
| | |
| | |
| | |
| | | |
closes #81
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
- new class CModelManager
- rewritten engine object structure in CEngine
- created shared model data instead of separate objects per each
model instance
- minor refactoring
|
| | |
|
|\| |
|
| | |
|
|/ |
|
|
|
|
|
|
| |
- added support for cross-compiling with MXE (http://mxe.cc/)
- refactored CMake files, adding some options and moving definitions
to more suitable places
|
| |
|
| |
|
|
|
|
|
|
| |
* Added colobot.ini to CApp in Create function
* Fixes to plugin manager
* Fixed CProfile segfault
|
|\
| |
| |
| | |
with latest trunk
|
| | |
|
|/ |
|
| |
|
|
|
|
|
|
|
| |
- temporarily mocked CSoundInterface and CPluginInterface
- added CRobotMain to application
- successfully compiles & runs, but doesn't display correctly at the
moment
|
|
|
|
| |
- rewritten CMainDialog and updated CRobotMain
|
|\
| |
| |
| |
| |
| |
| |
| | |
- merged changes from dev-common
- fixed many compilation errors (CBrain, UI, ...)
- temporarily commented out some problematic code (e.g. input bindings)
- (partially) fixed #include styling
- everything compiles except for CRobotMain, CMainDialog and CStudio
|
| |
| |
| |
| |
| |
| | |
- rewritten tests to use new framework
- updated/reformatted Doxygen
- removed legacy conversions
|
| |
| |
| |
| |
| | |
- refactored CInstanceManager and some headers
- removed old headers
|
|\ \
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/object/robotmain.cpp
src/object/robotmain.h
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/CMakeLists.txt
src/common/misc.cpp
src/common/misc.h
src/object/robotmain.cpp
src/object/robotmain.h
src/script/cbottoken.cpp
src/script/cbottoken.h
src/ui/button.cpp
src/ui/button.h
src/ui/check.cpp
src/ui/check.h
src/ui/color.cpp
src/ui/color.h
src/ui/compass.cpp
src/ui/compass.h
src/ui/control.cpp
src/ui/control.h
src/ui/displayinfo.cpp
src/ui/displayinfo.h
src/ui/displaytext.cpp
src/ui/displaytext.h
src/ui/edit.cpp
src/ui/edit.h
src/ui/gauge.cpp
src/ui/gauge.h
src/ui/interface.cpp
src/ui/interface.h
src/ui/key.cpp
src/ui/map.h
src/ui/shortcut.h
src/ui/slider.h
src/ui/target.cpp
src/ui/target.h
src/ui/window.cpp
src/ui/window.h
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/common/restext.cpp
src/common/restext.h
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
* wrong event function used
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
commited later after implementation is finished in dev-object branch.
|
| | | | |
|
| | | | |
|
| |_|/
|/| | |
|
|\ \ \
| | |/
| |/| |
|