| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
- 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
|
| | |
|
| |
| |
| |
| |
| | |
- fixed cursor drawing in CEngine
- changed event loop to generate more events
|
| |
| |
| |
| |
| | |
- borrowed implementation of ComputeSphereVisibility from libwine
- added -lrt to Linux libs
|
| |
| |
| |
| |
| |
| | |
- added other texture formats: BGR and BGRA
- fixed texture loading in model viewer
- moved code from texture.cpp module to texture.h
|
| |
| |
| |
| |
| |
| | |
- written new implementation of CModelFile (old CModFile)
- added stringutils and ioutils in src/common
- removed old CModel (model viewer)
|
| |
| |
| |
| |
| |
| | |
- moved texture-related structs to texture.h & code to texture.cpp
- cleaned up texture test code
- added Math:: namespace qualifiers to math modules for clarity
|
| |
| |
| |
| | |
Resolved conflicts & added fixes.
|
|/
|
|
|
|
|
|
| |
- 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
|
|
|
|
|
|
|
| |
- removed directory with old target
- changed CMakeLists.txt to new target only and temporarily commented
out reference to CBot
- updated README
|
|
|
|
|
|
|
|
| |
- 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
|
| |
|
|
|
|
|
|
|
|
| |
- added CApplication and Gfx::CEngine interfaces
- added Gfx::Material struct
- added Math::IntPoint struct
- added template for Gfx::CDevice class
- added templates for Gfx::CGLDevice and Gfx::CGLEngine classes
|
|
|
|
|
|
| |
- added template of classes/structs for new implementation
- changed #include paths
- updated README files
|
|
|
|
|
|
|
|
| |
- changed structs from D3DVECTOR to Math::Vector
and from D3DMATRIX to Math::Matrix
- changed functions to new Math namespace functions
- moved mainmovie module from graphics to object
- added Get and Set to Math::Matrix
|
|
|
|
|
|
|
|
|
| |
- changed FPOINT to Math::Point and some functions
from math module to the new implementation
- moved old function and FPOINT struct declarations to math3d.cpp
- removed some unused functions in math module
- fixed some #include dependencies
- moved #define STRICT and #define D3D_OVERLOADS to compile options
|
|
|
|
| |
Additionally, changed #ifndef to #pragma once everywhere
|
|
|