| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| | |
Conflicts:
src/common/restext.cpp
src/ui/maindialog.cpp
|
| | |
|
| | |
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
src/app/app.cpp
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
data
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
This requires too much refactoring and we want to release 0.1.5 soon.
We'll need to rewrite saving/loading code to fully implement new level parser anyway.
|
| | | | |
|
| | | | |
|
| | |/
| |/| |
|
| |/
|/| |
|
|/ |
|
| |
|
|
|
|
|
|
| |
* moved braces to new lines
* fixed some function/variable names
* fixed whitespace issues
|
|
|
|
|
|
|
| |
using , as comma separator). Issue #137
* Changed way of saving files. Now it's not based on slot (from 000 to 999) but it uses save name as a base.
* Changed way of displaying saved games. Listing directory instead of checking from 000 to 999. Issue #138
|
|
|
|
|
|
|
| |
* Moved few functions from misc.cpp to profile.cpp (used to set/get user dir)
* Removed some warnings
* More work to change const char* to std::string
* Some work on file path to fix issue #60 with bad slashes on POSIX platform
|
|
|
|
|
|
|
|
|
| |
* removed classes managed by CInstanceManager
except for CObject, CPyro, CBrain and CPhysics
because of dependencies
* refactored instance searching to use existing singleton instances of
CApplication, CEngine and CRobotMain and calling their getter
functions
|
| |
|
|
|
|
|
| |
Fixed includes
profile changed from SimpleIni to boost::ptree -> not finished yet
|
| |
|
|
|
|
| |
- 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
|
|/
|
|
|
| |
* all files except studio, map and maindialog should compile
* did some code cleanup
|
| |
|
|
|
|
|
|
|
| |
- changed tabs to spaces and DOS line endings to Unix
(except in CBot and metafile)
- changed language to English
- fixed #include <d3d.h> in d3dengine.h
|
|
|
|
|
|
| |
- added template of classes/structs for new implementation
- changed #include paths
- updated README files
|
|
|
|
|
|
|
|
|
| |
- 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
|
|
|