Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix for #294 | MrSimbax | 2014-03-16 | 1 | -1/+3 |
| | |||||
* | Fixed bug with fall damage | MrSimbax | 2014-03-12 | 1 | -2/+2 |
| | | | | If you change the height after overheat, you get damage like you didn't change it at all. For example: overheat when you are 10 meters above the ground, and you fall to place 20 meters deeper, but you get the damage like you fell from 10 meters instead of 30. This commit fix this. | ||||
* | Replaced an old icon with a new one | MrSimbax | 2014-03-09 | 2 | -188/+350 |
| | |||||
* | Made some improvements to fall damage from a61da740 | MrSimbax | 2014-03-09 | 2 | -13/+52 |
| | | | | | | | | Fall damage on: - no energy - overheat Fall damage off: - underwater | ||||
* | Fixed bug from a61da7404bf8430132864d493c7e75a6b4c3d978 | MrSimbax | 2014-03-08 | 1 | -7/+7 |
| | | | | Moved ExploObject to CPhysics::EventFrame, it shouldn't crash anymore. | ||||
* | Added fall damage | MrSimbax | 2014-03-08 | 3 | -1/+20 |
| | | | | + changed window title | ||||
* | Added special mode in scene for bots to build more buildings than they ↵ | krzys-h | 2014-03-03 | 5 | -9/+36 |
| | | | | | | 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 |
| | |||||
* | Merge pull request #287 from andreymal/dev-fix-sound | krzys-h | 2014-03-02 | 1 | -7/+9 |
|\ | | | | | fixed m_oldMusic.push_back(nullptr) and segfault | ||||
| * | fixed m_oldMusic.push_back(nullptr) and segfault | andreymal | 2014-03-02 | 1 | -7/+9 |
|/ | |||||
* | Merge pull request #284 from andreymal/dev | krzys-h | 2014-03-02 | 1 | -2/+2 |
|\ | | | | | GetStringWidth fix | ||||
| * | GetStringWidth fix | andreymal | 2014-03-02 | 1 | -2/+2 |
|/ | |||||
* | Fixed compile warning | krzys-h | 2014-02-21 | 1 | -1/+1 |
| | |||||
* | Updated data submodule | krzys-h | 2014-02-21 | 1 | -0/+0 |
| | |||||
* | Added option to set pause audio in Scene | krzys-h | 2014-02-21 | 8 | -37/+58 |
| | |||||
* | Fixed dev wiki link in README | krzys-h | 2014-02-21 | 1 | -2/+2 |
| | |||||
* | Added a check when trying to play a music file | erihel | 2014-02-21 | 1 | -6/+8 |
| | |||||
* | Changed max channels to fix compilation error | erihel | 2014-02-02 | 1 | -2/+1 |
| | |||||
* | Merge branch 'dev' of github:colobot/colobot into dev | erihel | 2014-02-02 | 6 | -7/+27 |
|\ | |||||
| * | Move engine frame update after game state update | Piotr Dziwinski | 2014-01-18 | 1 | -4/+4 |
| | | | | | | | | This should finally fix #225 | ||||
| * | Updated data submodule | Piotr Dziwinski | 2014-01-18 | 1 | -0/+0 |
| | | |||||
| * | Fixed tests compilation | Piotr Dziwinski | 2014-01-18 | 1 | -0/+1 |
| | | |||||
| * | Fixed warnings about unknown commands in scene files | Piotr Dziwinski | 2014-01-18 | 3 | -3/+22 |
| | | |||||
* | | Changed max number of sound channels | erihel | 2014-02-02 | 1 | -1/+3 |
| | | |||||
* | | Minor changes to sound support. | erihel | 2014-01-18 | 5 | -48/+135 |
|/ | | | | | | * changed channel limit from 64 to 2048 that will decrease if error is found while trying to play sound * added id to each channel to avoid collisions when more than 1 object tries to modify a sound * minor formatting changes | ||||
* | Removed some unused objects | krzys-h | 2014-01-11 | 6 | -144/+16 |
| | |||||
* | 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 | ||||
* | Updated data submodule | krzys-h | 2014-01-02 | 1 | -0/+0 |
| | |||||
* | Updated data submodule | krzys-h | 2014-01-01 | 1 | -0/+0 |
| | |||||
* | Changed main menu title to "COLOBOT: Gold Edition" | krzys-h | 2014-01-01 | 6 | -2/+18 |
| | |||||
* | Updated data submodule | krzys-h | 2014-01-01 | 1 | -0/+0 |
| | |||||
* | Changed comments in ObjectType to be object categories; removed unused SEAWEED | krzys-h | 2014-01-01 | 2 | -221/+211 |
| | |||||
* | Updated data submodule | krzys-h | 2014-01-01 | 1 | -0/+0 |
| | |||||
* | Fixed log level in 8d30791595cf981b08310472faa2066a99aa9595 | krzys-h | 2014-01-01 | 1 | -1/+1 |
| | |||||
* | Fixed two bugs in dc81cda4b1f27af6fe8abcd566ffac03255f2642 | krzys-h | 2014-01-01 | 2 | -0/+8 |
| | | | | | * win/end scene animations * produce() was producing empty cells | ||||
* | Added camerafocus() for changing camera | krzys-h | 2013-12-31 | 3 | -1/+49 |
| | |||||
* | Ability to set language via ini file | krzys-h | 2013-12-31 | 2 | -8/+18 |
| | | | | If language autodetection doesn't work, someone might want to manually force the game to use correct language without using -language parameter every time | ||||
* | Code for changing music in pause mode | krzys-h | 2013-12-31 | 9 | -21/+153 |
| | | | | 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 | 15 | -85/+239 |
| | |||||
* | Added CObjectManager::Flush() | krzys-h | 2013-12-30 | 3 | -5/+21 |
| | | | | Possible fix for #275 | ||||
* | 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 | 6 | -33/+221 |
| | |||||
* | Cleaned up creating objects | krzys-h | 2013-12-29 | 5 | -507/+20 |
| | |||||
* | Updated data submodule | krzys-h | 2013-12-28 | 1 | -0/+0 |
| | |||||
* | Don't stop music when SatCom or pause menu is opened | krzys-h | 2013-12-28 | 1 | -11/+1 |
| | |||||
* | Added smooth transition in music - issue #205 | krzys-h | 2013-12-28 | 5 | -30/+87 |
| | |||||
* | Fix for #177 - save list sorting | krzys-h | 2013-12-27 | 3 | -7/+28 |
| | |||||
* | Temporary fix for #232 - don't try to show the buttons | krzys-h | 2013-12-27 | 1 | -0/+2 |
| | | | | This makes SatCom usable for now | ||||
* | Removed prototypes support | krzys-h | 2013-12-27 | 13 | -116/+14 |
| | |||||
* | Updated data submodule | krzys-h | 2013-12-27 | 1 | -0/+0 |
| |