Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed edit_test linking issue | Piotr Dziwinski | 2013-01-17 | 1 | -1/+1 |
| | |||||
* | * Cleaning player list before getting new one (entering user menu several ↵ | erihel | 2013-01-15 | 1 | -0/+1 |
| | | | | times appended user to existing list) | ||||
* | * Removed alut | erihel | 2013-01-14 | 1 | -3/+1 |
| | | | | | * Using libsndfile to load sounds and music * Added support for playing music files | ||||
* | Merge pull request #112 from OdyX/dev-levels-fallback | krzys-h | 2013-01-09 | 1 | -10/+41 |
|\ | | | | | In levels' lists, fallback to english | ||||
| * | In levels' lists, fallback to english | Didier Raboud | 2013-01-02 | 1 | -10/+41 |
| | | | | | | | | | | | | - Implemented in a naive way: Take the English version if found, but continue until the translated version is found. This has the drawback of letting the loop reach its end if the level has no translation. | ||||
* | | Small fix in detecting language. Fixes needed to compile code using clang | Marcin Zawadzki | 2013-01-05 | 1 | -1/+0 |
|/ | |||||
* | * Fixed problem with scrolling down text fields with mouse scroll | erihel | 2012-12-29 | 2 | -27/+35 |
| | | | | * Fixed problem with scroll bar not updating position properly in text fields | ||||
* | Implement language Char for level files | Didier Raboud | 2012-12-28 | 1 | -10/+10 |
| | | | | This currently lacks fallback to an existing entry for non-translated entries | ||||
* | * Changed Ret to Get methods in sound module | erihel | 2012-12-25 | 1 | -76/+56 |
| | | | | | * Added video settings to profile * Resolution change is now posibble but restart is required | ||||
* | Put common CXX flags in common variables | Didier Raboud | 2012-12-19 | 1 | -1/+2 |
| | | | | | CMAKE_CXX_FLAGS is taken into account in all builds; build-type-specific flags are appended to it. | ||||
* | Don't enforce CMake build type on users. | Didier Raboud | 2012-12-19 | 1 | -1/+3 |
| | | | | Only set CMAKE_BUILD_TYPE to Debug when no value is provided. | ||||
* | Split gtest and gmock, fixed using system packages | Piotr Dziwinski | 2012-12-16 | 1 | -1/+2 |
| | | | | | | - split the bundled gtest and gmock libraries - allowed the use of system gmock - refactoring in CMakeLists | ||||
* | Removed unnecessary dynamic_casts | Piotr Dziwinski | 2012-10-17 | 1 | -2/+2 |
| | |||||
* | Saving scripts on game save should work. Added stub for particle. | Zaba999 | 2012-10-11 | 2 | -1/+292 |
| | |||||
* | Merge branch 'dev' of https://github.com/colobot/colobot into dev | Zaba999 | 2012-10-11 | 7 | -192/+151 |
|\ | |||||
| * | Removed Gfx:: from license notice (introduced in 8ad15c0e) | Michał Zieliński | 2012-10-08 | 1 | -2/+1 |
| | | |||||
| * | Changing and saving input bindings | Piotr Dziwinski | 2012-10-07 | 7 | -190/+150 |
| | | |||||
* | | Added saving user scripts on game save. Fixed bug in writing script to file. | Zaba999 | 2012-10-11 | 11 | -9/+266 |
|/ | |||||
* | Merge branch 'dev' into dev-graphics | Piotr Dziwinski | 2012-10-02 | 2 | -288/+157 |
|\ | |||||
| * | Further work on saving profile and directory listing. | Zaba999 | 2012-10-02 | 2 | -288/+157 |
| | | |||||
* | | Merge remote-tracking branch 'origin/dev' into dev-graphics | adiblol | 2012-09-30 | 1 | -543/+536 |
|\| | |||||
| * | Merge branch 'dev' of github.com:colobot/colobot into dev | adiblol | 2012-09-30 | 1 | -543/+536 |
| |\ | |||||
| | * | Merge branch 'dev' of https://github.com/colobot/colobot into dev | Zaba999 | 2012-09-29 | 2 | -16/+16 |
| | |\ | |||||
| | * | | #48 Adding new users works. | Zaba999 | 2012-09-29 | 1 | -543/+536 |
| | | | | |||||
* | | | | Dirty hack to allow window resizing or even full screen. | adiblol | 2012-09-30 | 1 | -0/+5 |
|/ / / | | | | | | | | | | | | | Currently makes text buggy! (full screen must be initiated by window manager, for example Alt+F11 in Fluxbox) | ||||
* | | | Fixed invradar cheat code. | adiblol | 2012-09-30 | 1 | -7/+2 |
| | | | | | | | | | | | | | | | Replaced CRobotMain::GetCheatRadar with CRobotMain::GetRadar. Changed logger level of "invalid m_motion" messages. | ||||
* | | | Map texture painting | Piotr Dziwinski | 2012-09-30 | 1 | -29/+28 |
| |/ |/| | |||||
* | | Fixed CEdit delete[] issues | Piotr Dziwinski | 2012-09-29 | 1 | -6/+6 |
| | | |||||
* | | Fixed CEdit cursor | Piotr Dziwinski | 2012-09-29 | 1 | -8/+8 |
| | | |||||
* | | Merge branch 'dev' into dev-graphics | Piotr Dziwinski | 2012-09-29 | 2 | -99/+133 |
|\| | |||||
| * | Merge branch 'master' of https://github.com/colobot/colobot into dev | unknown | 2012-09-28 | 2 | -99/+133 |
| |\ | |||||
| | * | Merge branch 'master' of git://github.com/colobot/colobot | Zaba999 | 2012-09-26 | 1 | -4/+4 |
| | |\ | |||||
| | * | | Work in progress on opening files, and listing dirs | Zaba999 | 2012-09-26 | 2 | -99/+133 |
| | | | | | | | | | | | | | | | | | | | | Fixed includes profile changed from SimpleIni to boost::ptree -> not finished yet | ||||
* | | | | Merge remote-tracking branch 'origin/dev' into dev-graphics | adiblol | 2012-09-27 | 2 | -47/+49 |
|\| | | | |||||
| * | | | * Ingame help should now display correctly | erihel | 2012-09-27 | 2 | -47/+49 |
| | | | | |||||
* | | | | Updated docs and some Doxygen fixes | Piotr Dziwinski | 2012-09-27 | 1 | -2/+2 |
|/ / / | |||||
* | / | Fixed CEdit text input and drawing issues | Piotr Dziwinski | 2012-09-26 | 1 | -12/+12 |
| |/ |/| | |||||
* | | Fog color fix; refactoring | Piotr Dziwinski | 2012-09-26 | 1 | -4/+4 |
|/ | | | | | | - fixed fog color setting - removed unused glSecondaryColor and altered struct VertexCol - minor refactoring in CText | ||||
* | Various fixes | Piotr Dziwinski | 2012-09-22 | 2 | -4/+2 |
| | | | | | | | | - disabled UserDir() in path lookup - fixed crashes on loading missions in CObject - fixed texture bug in CTerrain - changed mouse move event handling to avoid flooding event queue - enabled all missions for testing | ||||
* | Data dir paths | Piotr Dziwinski | 2012-09-22 | 1 | -3/+5 |
| | | | | | - changed access to paths in data directory in CApplication - models now load from data directory | ||||
* | * Removed some warnings | erihel | 2012-09-22 | 1 | -1/+1 |
| | |||||
* | Event fixes & refactoring | Piotr Dziwinski | 2012-09-22 | 20 | -118/+120 |
| | | | | | | - added new state tracking to Event - removed old fields from Event - fixed some issues with Events and fps counter | ||||
* | robotmain, restext and engine fixes | Piotr Dziwinski | 2012-09-21 | 1 | -35/+43 |
| | |||||
* | changed paths for models and levels. Now it's possible to load level. Merged ↵ | Zaba999 | 2012-09-20 | 5 | -107/+32 |
|\ | | | | | | | with latest trunk | ||||
| * | Checkbox fix; main dialog buttons | Piotr Dziwinski | 2012-09-20 | 2 | -89/+10 |
| | | |||||
| * | Whitespace fix | Piotr Dziwinski | 2012-09-20 | 3 | -4/+4 |
| | | |||||
| * | Mouse pos setting, low cpu mode, stats display | Piotr Dziwinski | 2012-09-20 | 1 | -15/+19 |
| | | |||||
* | | changed paths for models and levels. Now it's possible to load level. | Zaba999 | 2012-09-20 | 1 | -30/+43 |
|/ | |||||
* | Changes in Ui, solves part of #47 | Michał Konopacki | 2012-09-19 | 17 | -77/+77 |
| | |||||
* | Mouse wheel fixes | Piotr Dziwinski | 2012-09-19 | 5 | -28/+28 |
| |