| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
- 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
|
| | |
|
|\| |
|
| | |
|
|/ |
|
|
|
|
|
|
| |
- 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.
|
| | | | |
|
| | | | |
|
| |_|/
|/| | |
|
|\ \ \
| | |/
| |/| |
|
| |/ |
|
| |
| |
| |
| |
| |
| | |
- fixes in CModelFile IO
- added Google Test framework for automatic testing
- rewrote modelfile_test in the new framework
|
|/
|
|
|
|
|
| |
- added new binary and text formats for models
- fixes and improvements in CModelFile
- tool for converting model files
- minor additions and fixes
|
|
|
|
|
|
|
| |
- added stubs for functions in CLightning, CParticle and CPyro
- cleaned object.h and physics.h headers
- created temporary stubs to compile CCamera
- other necessary changes to compile successfully
|
|
|
|
|
| |
- added basic font rendering
- minor refactoring & fixes
|
|
|
|
|
| |
Rewritten old code; doesn't compile yet because changes in other
modules are needed.
|
|
|
|
| |
Added GLEW for loading OpenGL extensions
|
|\
| |
| |
| | |
Pulled changes & resolved conflicts
|
| |\
| | |
| | | |
Changes in CBot
|
| | |
| | |
| | |
| | |
| | | |
Removed Winapi, but now library don't work - work in progress.
Some translations.
|
| |/
| |
| |
| |
| |
| | |
- added logger to main()
- removed reference to Snd namespace and renamed back to sound.h
- fixed minor issues
|
| |
| |
| |
| |
| | |
- moved abstract core to src/graphics/core
- moved proper graphics engine to src/graphics/engine
|
| | |
|