Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | Updated data submodule | krzys-h | 2014-06-19 | 1 | -0/+0 | |
| | | | ||||||
| * | | Corrected markdown formatting in INSTALL | Piotr Dziwinski | 2013-11-26 | 2 | -29/+52 | |
| | | | ||||||
| * | | Colobot Gold 0.1.2-alpha | Piotr Dziwinski | 2013-11-26 | 41 | -301/+2616 | |
| |\ \ | ||||||
| * | | | Fixed version codename (-alpha) | Piotr Dziwinski | 2013-11-03 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Colobot Gold 0.1.1-alpha | Piotr Dziwinski | 2013-11-03 | 59 | -279/+370 | |
| |\ \ \ | ||||||
| * | | | | Do not change master branch unless you REALLY know what U R doing! | adiblol | 2013-09-23 | 1 | -3/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Added '-game' launch option" This reverts commit 2891c2ea4ce2e7c844d1e93db71dcfa8ad2ca100. | |||||
* | | | | | Fixed mission description loading | krzys-h | 2014-07-10 | 1 | -7/+8 | |
| | | | | | ||||||
* | | | | | Fixed texture and script loading | krzys-h | 2014-07-10 | 23 | -139/+143 | |
| | | | | | ||||||
* | | | | | Fixed music loading | krzys-h | 2014-07-10 | 3 | -18/+17 | |
| | | | | | ||||||
* | | | | | Fixed level list | krzys-h | 2014-07-10 | 1 | -21/+36 | |
| | | | | | ||||||
* | | | | | Last changes | Krzysztof Dermont | 2014-06-30 | 3 | -49/+39 | |
| | | | | | ||||||
* | | | | | More work on streams | Krzysztof Dermont | 2014-06-23 | 10 | -189/+321 | |
| | | | | | ||||||
* | | | | | More work on levels | Krzysztof Dermont | 2014-06-22 | 5 | -20/+26 | |
| | | | | | ||||||
* | | | | | Added Exist() to resource manager, updated model | Krzysztof Dermont | 2014-06-22 | 3 | -6/+15 | |
| | | | | | ||||||
* | | | | | More work on PhysFS support | Krzysztof Dermont | 2014-06-22 | 8 | -17/+103 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | * added output stream * fixed music loading | |||||
* | | | | | Implemented libsndfile loader in PhysFS | Krzysztof Dermont | 2014-06-21 | 8 | -61/+253 | |
| | | | | | ||||||
* | | | | | Big part of PhysFS support | Krzysztof Dermont | 2014-06-20 | 52 | -841/+715 | |
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | |||||
* | | | | Remove dead code | Piotr Dziwinski | 2014-06-01 | 1 | -6/+0 | |
| | | | | ||||||
* | | | | Better datadir mod support | krzys-h | 2014-05-18 | 19 | -193/+286 | |
| | | | | ||||||
* | | | | Random relief generator | krzys-h | 2014-04-10 | 3 | -1/+69 | |
| | | | | ||||||
* | | | | Updated data submodule | krzys-h | 2014-04-10 | 1 | -0/+0 | |
| | | | | ||||||
* | | | | Updated INSTALL file | krzys-h | 2014-04-02 | 2 | -1/+12 | |
| | | | | ||||||
* | | | | Merge pull request #297 from kosmakoff/dev | krzys-h | 2014-03-25 | 1 | -1/+7 | |
|\ \ \ \ | | | | | | | | | | | Fixes #271 | |||||
| * | | | | Fixes #271 | Oleg Kosmakov | 2014-03-25 | 1 | -1/+7 | |
| | | | | | ||||||
* | | | | | Merge pull request #296 from kosmakoff/dev | krzys-h | 2014-03-21 | 5 | -134/+179 | |
|\| | | | | | | | | | | | | | | Fixes for issue #295 | |||||
| * | | | | 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 | |||||
| * | | | | Whitespace | Oleg Kosmakov | 2014-03-21 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Fixes #295 | Oleg Kosmakov | 2014-03-21 | 5 | -4/+49 | |
| | | | | | | | | | | | | | | | | | | | | When cannon cannot turn at specified angle, it will still reach the edge angle, but return the error code | |||||
| * | | | | Added spaces to align values | Oleg Kosmakov | 2014-03-21 | 1 | -130/+130 | |
|/ / / / | ||||||
* | | | | 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 |