Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into dev-physfs | krzys-h | 2014-07-11 | 1 | -10/+12 |
|\ | | | | | | | | | | | | | | | | | Conflicts: data src/app/gamedata.cpp src/ui/control.cpp src/ui/edit.cpp src/ui/maindialog.cpp | ||||
| * | Fixed negative parameter in fire() (issue #305) | krzys-h | 2014-06-26 | 1 | -10/+12 |
| | | | | | | | | Also fixed checking parameter count and type for ants, spiders and shooters | ||||
* | | More work on levels | Krzysztof Dermont | 2014-06-22 | 1 | -12/+12 |
| | | |||||
* | | Big part of PhysFS support | Krzysztof Dermont | 2014-06-20 | 1 | -27/+4 |
|/ | | | | | | | | | | | * 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 | -3/+4 |
| | |||||
* | Whitespace | Oleg Kosmakov | 2014-03-21 | 1 | -3/+3 |
| | |||||
* | Issue #295 - continue | Oleg Kosmakov | 2014-03-21 | 2 | -4/+4 |
| | | | | Renamed the method, fixed typo in comments | ||||
* | 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 | ||||
* | Added special mode in scene for bots to build more buildings than they ↵ | krzys-h | 2014-03-03 | 1 | -7/+10 |
| | | | | | | usualy can Will be used in "Leaving Earth" missions for making decorative bots building base | ||||
* | Fixed warnings about unknown commands in scene files | Piotr Dziwinski | 2014-01-18 | 2 | -0/+11 |
| | |||||
* | Removed some unused objects | krzys-h | 2014-01-11 | 1 | -72/+0 |
| | |||||
* | Fixed a bug from 59935b470674ae26342fd4145f9cba85a1cd9443 | krzys-h | 2014-01-11 | 1 | -41/+48 |
| | | | | Cmd() now checks if length of token we're looking for is equal to token we've found | ||||
* | Changed comments in ObjectType to be object categories; removed unused SEAWEED | krzys-h | 2014-01-01 | 1 | -10/+10 |
| | |||||
* | Fixed two bugs in dc81cda4b1f27af6fe8abcd566ffac03255f2642 | krzys-h | 2014-01-01 | 1 | -0/+1 |
| | | | | | * win/end scene animations * produce() was producing empty cells | ||||
* | Added camerafocus() for changing camera | krzys-h | 2013-12-31 | 3 | -1/+49 |
| | |||||
* | CPauseManager | krzys-h | 2013-12-31 | 2 | -5/+9 |
| | |||||
* | Added nullptr shecks to object.factory() | krzys-h | 2013-12-29 | 1 | -1/+14 |
| | | | | Trying to fix #275 | ||||
* | Added tool= i drive= | krzys-h | 2013-12-29 | 2 | -3/+83 |
| | |||||
* | Cleaned up creating objects | krzys-h | 2013-12-29 | 1 | -158/+7 |
| | |||||
* | .takeoff() for SpaceShip (#265) | krzys-h | 2013-12-26 | 3 | -3/+56 |
| | |||||
* | Fixed bug #240 - CAuto in produce() | krzys-h | 2013-12-25 | 1 | -1/+8 |
| | |||||
* | Changed char[] to std::string in restext | Piotr Dziwinski | 2013-12-04 | 2 | -14/+17 |
| | | | | Experimental changes | ||||
* | Fixed some CBot-related memory leaks | Piotr Dziwinski | 2013-10-12 | 1 | -4/+6 |
| | | | | | | * fixed leaks in CScript::CheckToken() * fixed leaks in CInterface * commented out unused function in robotmain.cpp | ||||
* | Some Ui refactoring | erihel | 2013-06-24 | 2 | -7/+4 |
| | |||||
* | Fixed code formatting | Piotr Dziwinski | 2013-05-27 | 6 | -97/+114 |
| | | | | | | * moved braces to new lines * fixed some function/variable names * fixed whitespace issues | ||||
* | Fixed some compilation warnings | Piotr Dziwinski | 2013-05-27 | 1 | -4/+4 |
| | | | | * fixed warnings about hiding virtual functions and several others | ||||
* | Added object.research(type) | krzys-h | 2013-05-19 | 3 | -2/+95 |
| | |||||
* | Translated <erreur> and <sans nom> | krzys-h | 2013-05-19 | 1 | -2/+2 |
| | |||||
* | Added progfunc( funcname ); | krzys-h | 2013-05-19 | 3 | -0/+41 |
| | | | | | | | | | | | | | | | | For simple creating of programs executing public functions :) Example: public void object::SecondBot() { message("It works!"); } extern void object::FirstBot() { object item = radar(BotFactory); item.factory(WheeledGrabber, progfunc("SecondBot")); } | ||||
* | Running program in robots created using object.factory() | krzys-h | 2013-05-19 | 3 | -15/+54 |
| | |||||
* | Changed "Inappropariate bot"->"Inappropariate object" in newly added functions | krzys-h | 2013-05-18 | 1 | -3/+3 |
| | |||||
* | Fix for build() not being able to build Detroyer | krzys-h | 2013-05-18 | 1 | -6/+8 |
| | |||||
* | Added object.destroy() | krzys-h | 2013-05-18 | 3 | -1/+56 |
| | |||||
* | Renamed destroy() -> delete() | krzys-h | 2013-05-18 | 2 | -7/+7 |
| | |||||
* | Added object.busy() | krzys-h | 2013-05-18 | 3 | -0/+45 |
| | |||||
* | Added object.factory(cat) | krzys-h | 2013-05-18 | 3 | -1/+173 |
| | |||||
* | Backwards combatibility for retobject() (#209) | krzys-h | 2013-05-12 | 3 | -2/+27 |
| | |||||
* | Fixed bug with std::bad_alloc when using produce() | krzys-h | 2013-05-12 | 1 | -2/+4 |
| | | | | I'm not sure why it wasn't happening before, but it's fixed :) | ||||
* | Added [set/get][build/research[done/enable]] ( ); function fo CBot | krzys-h | 2013-05-05 | 3 | -40/+112 |
| | | | | | | | | | * setbuild ( ); * setresearchdone ( ); * setresearchenable ( ); * getbuild ( ); * getresearchdone ( ); * getresearchenable ( ); | ||||
* | Functions playmusic(filename, repeat) and stopmusic() | krzys-h | 2013-05-01 | 2 | -2/+51 |
| | | | | | for MissionController Parameter repeat can be 0 or 1 | ||||
* | Removed some warnings | krzys-h | 2013-05-01 | 1 | -2/+4 |
| | | | | + fix for previous commit | ||||
* | Added function endmission() | krzys-h | 2013-04-30 | 2 | -0/+33 |
| | | | | | | | | | | | Works only with MissionFile version=3 Created for MissionController, but works on any bot - 1st parameter: * ResultWin - win mission * ResultLost - lost mission * ResultLostQuick - lost mission (Me died) - 2nd parameter: win/lost delay, like in mission file. Doesn't work for ResultLostQuick. Please don't use for cheating =) | ||||
* | MissionController improved | krzys-h | 2013-04-29 | 2 | -1/+3 |
| | |||||
* | Added functions "canbuild(category)" and "buildinfo(category)" | XienDev | 2013-04-28 | 3 | -43/+107 |
| | | | | Also fixed issue with undefined behaviour of build(category) function | ||||
* | Added build | XienDev | 2013-04-27 | 3 | -1/+90 |
| | | | | Third patch | ||||
* | * Patch for issue #167 | erihel | 2013-04-27 | 1 | -1/+4 |
| | |||||
* | Removed find() & repeat() functions | krzys-h | 2013-04-12 | 2 | -147/+0 |
| | | | | Issue #168 | ||||
* | More parameters to destroy() | krzys-h | 2013-03-31 | 1 | -7/+29 |
| | | | | Also, removed some warnings in script.cpp | ||||
* | Added field "item" to class "object" in CBot | krzys-h | 2013-03-31 | 1 | -6/+3 |
| | |||||
* | Added function destroy(rank) | krzys-h | 2013-03-30 | 2 | -0/+40 |
| |