Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with dev | Piotr Dziwinski | 2014-10-07 | 4 | -350/+84 |
|\ | |||||
| * | Fixed issue #324 | krzys-h | 2014-10-07 | 2 | -2/+15 |
| | | |||||
| * | CProfile refactoring | Piotr Dziwinski | 2014-08-12 | 1 | -32/+32 |
| | | |||||
| * | Fix task stopping checks in CBrain | Piotr Dziwinski | 2014-08-10 | 2 | -124/+39 |
| | | | | | | | | | | | | This possibly fixes some issues resulting from improperly stopping tasks (CTask::Abort() not called before deleting the task). Found while looking for instances of #318. | ||||
| * | Removed some unused code | krzys-h | 2014-08-06 | 2 | -194/+0 |
| | | |||||
* | | Added %chap% for current chapter directory | krzys-h | 2014-09-29 | 2 | -1/+3 |
| | | |||||
* | | Replaced std::to_string with boost::lexical_cast<std::string> | krzys-h | 2014-09-28 | 4 | -13/+16 |
| | | | | | | | | MXE has problems with std::to_string | ||||
* | | Made proxyDistance optional | krzys-h | 2014-09-27 | 1 | -2/+1 |
| | | |||||
* | | Moved effect??.png textures and made pos= in GroundSpot optional | krzys-h | 2014-09-27 | 1 | -3/+3 |
| | | |||||
* | | Fixed TerrainLevel bug | krzys-h | 2014-09-27 | 1 | -0/+1 |
| | | |||||
* | | Removed more unused variables | krzys-h | 2014-09-27 | 2 | -20/+0 |
| | | |||||
* | | Fixed some warnings | krzys-h | 2014-09-27 | 1 | -7/+7 |
| | | | | | | | | Removed unused variables and fixed signed/unsigned comparation warnings | ||||
* | | Userlevel listing | krzys-h | 2014-09-26 | 5 | -26/+41 |
| | | |||||
* | | New level parser | krzys-h | 2014-09-24 | 9 | -708/+2173 |
| | | | | | | | | | | | | Known issues: * TerrainLevel for some reason doesn't work * %lvl% is not yet implemented everywhere because of hardcoded directories in functions | ||||
* | | Fixed SatCom image loading | krzys-h | 2014-07-24 | 2 | -18/+18 |
| | | | | | | | | Now LoadTexture/SetTexture functions require full path with "textures/" directory | ||||
* | | Help file loading | krzys-h | 2014-07-11 | 2 | -10/+49 |
| | | |||||
* | | Merge branch 'dev' into dev-physfs | krzys-h | 2014-07-11 | 5 | -117/+0 |
|\| | | | | | | | | | | | | | | | | | Conflicts: data src/app/gamedata.cpp src/ui/control.cpp src/ui/edit.cpp src/ui/maindialog.cpp | ||||
| * | Removed some old stuff related to Ceebot-Teen | krzys-h | 2014-07-10 | 1 | -1/+0 |
| | | |||||
| * | Removed some unused code related to Quit button | krzys-h | 2014-07-10 | 1 | -40/+0 |
| | | | | | | | | The button itself has been removed a long time ago | ||||
| * | Removed old code based on #ifs (issue #55) | krzys-h | 2014-06-27 | 4 | -76/+0 |
| | | |||||
* | | Fixed texture and script loading | krzys-h | 2014-07-10 | 1 | -7/+8 |
| | | |||||
* | | More work on levels | Krzysztof Dermont | 2014-06-22 | 1 | -4/+9 |
| | | |||||
* | | Big part of PhysFS support | Krzysztof Dermont | 2014-06-20 | 1 | -13/+7 |
|/ | | | | | | | | | | | * removed -mod argument * removed -datadir argument * removed -lang argument * removed some dead ui code * added resource manager and file loaders (stream and SDL) * changed interface textures location to match new directory structure * removed CGameData for mod support * added PhysFS support | ||||
* | Better datadir mod support | krzys-h | 2014-05-18 | 1 | -5/+6 |
| | |||||
* | Random relief generator | krzys-h | 2014-04-10 | 1 | -0/+6 |
| | |||||
* | Fixes #295 | Oleg Kosmakov | 2014-03-21 | 2 | -2/+24 |
| | | | | When cannon cannot turn at specified angle, it will still reach the edge angle, but return the error code | ||||
* | Fix for #294 | MrSimbax | 2014-03-16 | 1 | -1/+3 |
| | |||||
* | Added special mode in scene for bots to build more buildings than they ↵ | krzys-h | 2014-03-03 | 4 | -2/+26 |
| | | | | | | usualy can Will be used in "Leaving Earth" missions for making decorative bots building base | ||||
* | Check if pause music is defined in scene before trying to play it | krzys-h | 2014-03-02 | 1 | -2/+4 |
| | |||||
* | Fixed compile warning | krzys-h | 2014-02-21 | 1 | -1/+1 |
| | |||||
* | Added option to set pause audio in Scene | krzys-h | 2014-02-21 | 2 | -5/+50 |
| | |||||
* | Fixed warnings about unknown commands in scene files | Piotr Dziwinski | 2014-01-18 | 1 | -3/+11 |
| | |||||
* | Removed some unused objects | krzys-h | 2014-01-11 | 4 | -68/+12 |
| | |||||
* | Changed comments in ObjectType to be object categories; removed unused SEAWEED | krzys-h | 2014-01-01 | 1 | -211/+201 |
| | |||||
* | Fixed two bugs in dc81cda4b1f27af6fe8abcd566ffac03255f2642 | krzys-h | 2014-01-01 | 1 | -0/+7 |
| | | | | | * win/end scene animations * produce() was producing empty cells | ||||
* | Code for changing music in pause mode | krzys-h | 2013-12-31 | 1 | -1/+1 |
| | | | | As requested by @Emxx52. Only code for now, we don't have the music yet. Temporairly in developements builds music will change to Prototype (in CBot editor) and Constructive Destruction (in SatCom) | ||||
* | CPauseManager | krzys-h | 2013-12-31 | 2 | -23/+27 |
| | |||||
* | Added CObjectManager::Flush() | krzys-h | 2013-12-30 | 3 | -5/+21 |
| | | | | Possible fix for #275 | ||||
* | Added tool= i drive= | krzys-h | 2013-12-29 | 4 | -30/+138 |
| | |||||
* | Cleaned up creating objects | krzys-h | 2013-12-29 | 4 | -349/+13 |
| | |||||
* | Added smooth transition in music - issue #205 | krzys-h | 2013-12-28 | 1 | -5/+3 |
| | |||||
* | Removed prototypes support | krzys-h | 2013-12-27 | 1 | -1/+0 |
| | |||||
* | Disable immediat SatCom when scene test is enabled | krzys-h | 2013-12-26 | 1 | -0/+1 |
| | |||||
* | Added scene test mode | krzys-h | 2013-12-26 | 1 | -1/+4 |
| | | | | ... and fixed a "small" bug in previous commit ;) | ||||
* | Exit the game after finishing the mission while using -runscene | krzys-h | 2013-12-26 | 2 | -0/+10 |
| | |||||
* | Indentation fixes | krzys-h | 2013-12-26 | 2 | -3/+3 |
| | |||||
* | Added error message when unable to load script from file specified in ↵ | krzys-h | 2013-12-26 | 1 | -8/+3 |
| | | | | CreateObject | ||||
* | .takeoff() for SpaceShip (#265) | krzys-h | 2013-12-26 | 3 | -45/+57 |
| | |||||
* | Added "E" as a secondary action button | krzys-h | 2013-12-25 | 1 | -7/+8 |
| | | | | As requested by @Emxx52 on IRC | ||||
* | Added WSAD as secondary controls (#231) | krzys-h | 2013-12-25 | 1 | -0/+4 |
| |