summaryrefslogtreecommitdiffstats
path: root/src/object
Commit message (Collapse)AuthorAgeFilesLines
* Merge with devPiotr Dziwinski2014-10-074-350/+84
|\
| * Fixed issue #324krzys-h2014-10-072-2/+15
| |
| * CProfile refactoringPiotr Dziwinski2014-08-121-32/+32
| |
| * Fix task stopping checks in CBrainPiotr Dziwinski2014-08-102-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 codekrzys-h2014-08-062-194/+0
| |
* | Added %chap% for current chapter directorykrzys-h2014-09-292-1/+3
| |
* | Replaced std::to_string with boost::lexical_cast<std::string>krzys-h2014-09-284-13/+16
| | | | | | | | MXE has problems with std::to_string
* | Made proxyDistance optionalkrzys-h2014-09-271-2/+1
| |
* | Moved effect??.png textures and made pos= in GroundSpot optionalkrzys-h2014-09-271-3/+3
| |
* | Fixed TerrainLevel bugkrzys-h2014-09-271-0/+1
| |
* | Removed more unused variableskrzys-h2014-09-272-20/+0
| |
* | Fixed some warningskrzys-h2014-09-271-7/+7
| | | | | | | | Removed unused variables and fixed signed/unsigned comparation warnings
* | Userlevel listingkrzys-h2014-09-265-26/+41
| |
* | New level parserkrzys-h2014-09-249-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 loadingkrzys-h2014-07-242-18/+18
| | | | | | | | Now LoadTexture/SetTexture functions require full path with "textures/" directory
* | Help file loadingkrzys-h2014-07-112-10/+49
| |
* | Merge branch 'dev' into dev-physfskrzys-h2014-07-115-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-Teenkrzys-h2014-07-101-1/+0
| |
| * Removed some unused code related to Quit buttonkrzys-h2014-07-101-40/+0
| | | | | | | | The button itself has been removed a long time ago
| * Removed old code based on #ifs (issue #55)krzys-h2014-06-274-76/+0
| |
* | Fixed texture and script loadingkrzys-h2014-07-101-7/+8
| |
* | More work on levelsKrzysztof Dermont2014-06-221-4/+9
| |
* | Big part of PhysFS supportKrzysztof Dermont2014-06-201-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 supportkrzys-h2014-05-181-5/+6
|
* Random relief generatorkrzys-h2014-04-101-0/+6
|
* Fixes #295Oleg Kosmakov2014-03-212-2/+24
| | | | When cannon cannot turn at specified angle, it will still reach the edge angle, but return the error code
* Fix for #294MrSimbax2014-03-161-1/+3
|
* Added special mode in scene for bots to build more buildings than they ↵krzys-h2014-03-034-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 itkrzys-h2014-03-021-2/+4
|
* Fixed compile warningkrzys-h2014-02-211-1/+1
|
* Added option to set pause audio in Scenekrzys-h2014-02-212-5/+50
|
* Fixed warnings about unknown commands in scene filesPiotr Dziwinski2014-01-181-3/+11
|
* Removed some unused objectskrzys-h2014-01-114-68/+12
|
* Changed comments in ObjectType to be object categories; removed unused SEAWEEDkrzys-h2014-01-011-211/+201
|
* Fixed two bugs in dc81cda4b1f27af6fe8abcd566ffac03255f2642krzys-h2014-01-011-0/+7
| | | | | * win/end scene animations * produce() was producing empty cells
* Code for changing music in pause modekrzys-h2013-12-311-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)
* CPauseManagerkrzys-h2013-12-312-23/+27
|
* Added CObjectManager::Flush()krzys-h2013-12-303-5/+21
| | | | Possible fix for #275
* Added tool= i drive=krzys-h2013-12-294-30/+138
|
* Cleaned up creating objectskrzys-h2013-12-294-349/+13
|
* Added smooth transition in music - issue #205krzys-h2013-12-281-5/+3
|
* Removed prototypes supportkrzys-h2013-12-271-1/+0
|
* Disable immediat SatCom when scene test is enabledkrzys-h2013-12-261-0/+1
|
* Added scene test modekrzys-h2013-12-261-1/+4
| | | | ... and fixed a "small" bug in previous commit ;)
* Exit the game after finishing the mission while using -runscenekrzys-h2013-12-262-0/+10
|
* Indentation fixeskrzys-h2013-12-262-3/+3
|
* Added error message when unable to load script from file specified in ↵krzys-h2013-12-261-8/+3
| | | | CreateObject
* .takeoff() for SpaceShip (#265)krzys-h2013-12-263-45/+57
|
* Added "E" as a secondary action buttonkrzys-h2013-12-251-7/+8
| | | | As requested by @Emxx52 on IRC
* Added WSAD as secondary controls (#231)krzys-h2013-12-251-0/+4
|