| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|/ / |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| | |
- 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
|
| | |
| | |
| | |
| | |
| | |
| | | |
- 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
|
| | |
| | |
| | |
| | |
| | | |
- rewritten CRobotMain
- won't compile yet because of dependencies to CMainDialog
|
| | |
| | |
| | |
| | | |
The remaining part will be revised and rewritten after merge with dev and dev-ui branches
|
| | | |
|
| | | |
|
| | | |
|
| |\ \ |
|
| | | | |
|
| | | | |
|
| |/ / |
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |\ \
| | | |
| | | | |
Changes from dev-ui in erihel's fork
|
| | | |
| | | |
| | | |
| | | |
| | | | |
* all files except studio, map and maindialog should compile
* did some code cleanup
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/common/restext.cpp
src/common/restext.h
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* changed Ret to Get function names
* minor changes
|
| | |\ \ \ |
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
src/ui/button.h
src/ui/color.h
src/ui/compass.h
src/ui/control.h
src/ui/displayinfo.h
src/ui/displaytext.h
src/ui/edit.h
src/ui/editvalue.h
src/ui/gauge.h
src/ui/group.h
src/ui/image.h
src/ui/slider.h
|
| | | | | | | |
|
| | | | | | | |
|
| | | |/ / /
| | |/| | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* wrong event function used
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* 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
|