| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| | |
Conflicts:
src/common/config.h.cmake
|
| | |
|
|/
|
|
|
|
| |
This finishes the work started in
19b75e174338f8e7be7486a7445d1e90e9795077 by actually using the
translation where they are installed.
|
|
|
|
|
|
| |
- split the bundled gtest and gmock libraries
- allowed the use of system gmock
- refactoring in CMakeLists
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| | |
This ensures that users with a correctly-defined locale don't need to
explicitely set the locale.
- By dropping the setlocale content, it fixes the loading of translations.
- Add a Debug log message to check what is put in the environment.
|
| | |
|
| | |
|
|/ |
|
| |
|
|\ |
|
| | |
|
|/ |
|
| |
|
|
|
|
|
|
| |
- added support for cross-compiling with MXE (http://mxe.cc/)
- refactored CMake files, adding some options and moving definitions
to more suitable places
|
|\ |
|
| | |
|
| |
| |
| |
| | |
Load/Save should work.
|
| |
| |
| |
| |
| | |
Fixed includes
profile changed from SimpleIni to boost::ptree -> not finished yet
|
| | |
|
|/
|
|
|
| |
- now loading can be from any image format
- added IntColor struct for precise pixel operations
|
| |
|
|
|
|
|
|
|
|
| |
- disabled UserDir() in path lookup
- fixed crashes on loading missions in CObject
- fixed texture bug in CTerrain
- changed mouse move event handling to avoid flooding event queue
- enabled all missions for testing
|
|
|
|
|
| |
- changed access to paths in data directory in CApplication
- models now load from data directory
|
|
|
|
|
|
| |
- added new state tracking to Event
- removed old fields from Event
- fixed some issues with Events and fps counter
|
|
|
|
|
|
| |
* Added colobot.ini to CApp in Create function
* Fixes to plugin manager
* Fixed CProfile segfault
|
| |
|
|
|
|
|
|
| |
- added mouse wheel events
- added motion vectors to CRobotMain
- other minor changes in event.h
|
|
|
|
|
|
| |
- moved input bindings to CRobotMain
- added virtual keymod and joystick button key presses
- fixed putenv error; other minor fixes
|
| |
|
| |
|
|
|
|
|
|
| |
- removed mock of CInterface and fixed event passing to CRobotMain
- changed texture names from tga and bmp to png
- UI now works but interaction is still broken
|
|
|
|
|
|
|
| |
- 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
|
| |
| |
| |
| |
| |
| | |
- added locale setting
- removed unused translations
- updated .po files
|
| | |
|
| |
| |
| |
| |
| |
| | |
- added new simulation time calculations in CApplication
- added simulation frame updates
- rewritten old input binding code and input state tracking
|
| |
| |
| |
| |
| | |
- refactored CInstanceManager and some headers
- removed old headers
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
* csoundinterface to ccontrol
|
| | | |
| | | |
| | | |
| | | |
| | | | |
- changes in src/ui ; be CAREFUL, not every file is changed in a proper way -> bugs
- necessary changes in object/robotmain.h and common/misc.h/.cpp in order to compile
|
| |_|/
|/| | |
|
|\ \ \
| | |/
| |/| |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|