Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Added "E" as a secondary action button | krzys-h | 2013-12-25 | 1 | -7/+8 | |
| | | | | As requested by @Emxx52 on IRC | |||||
* | Fixed "default controls" button (#263) | krzys-h | 2013-12-25 | 1 | -1/+1 | |
| | ||||||
* | Added WSAD as secondary controls (#231) | krzys-h | 2013-12-25 | 1 | -0/+4 | |
| | ||||||
* | Fixed bug #240 - CAuto in produce() | krzys-h | 2013-12-25 | 1 | -1/+8 | |
| | ||||||
* | Fixed AudioChange | krzys-h | 2013-12-25 | 1 | -8/+9 | |
| | ||||||
* | Merge branch 'dev-string-in-restext' into dev | Piotr Dziwinski | 2013-12-20 | 27 | -209/+254 | |
|\ | | | | | | | | | | | Merging branches after code review This should fix buffer overflow problems with translation strings | |||||
| * | Some further refactoring and test corrections | Piotr Dziwinski | 2013-12-20 | 2 | -15/+25 | |
| | | ||||||
| * | Changed char[] to std::string in restext | Piotr Dziwinski | 2013-12-04 | 27 | -197/+232 | |
| | | | | | | | | Experimental changes | |||||
* | | Sound support changes | erihel | 2013-12-19 | 8 | -249/+42 | |
| | | | | | | | | | | | | * removed 2d sound * fixed listener orientation (propably issue #235) * removed unused code and minor refactoring | |||||
* | | Never cache Data, Sound and Music paths | Didier 'OdyX' Raboud | 2013-12-09 | 1 | -16/+0 | |
|/ | | | | | Let them always be either auto-detected, defined on the command-line or written in the configuration file | |||||
* | Add a PLATFORM_GNU global variable matching all GNU systems such as Debian's ↵ | Didier Raboud | 2013-11-27 | 2 | -0/+3 | |
| | | | | Linux, kFreeBSD and Hurd | |||||
* | Updated README and INSTALL files | Piotr Dziwinski | 2013-11-26 | 1 | -1/+1 | |
| | ||||||
* | Changed ASM_TRAP() to assert(0) | Piotr Dziwinski | 2013-11-25 | 6 | -83/+88 | |
| | ||||||
* | Merge pull request #250 from OdyX/dev-platform-enhancements-and-installers | Piotr Dziwiński | 2013-11-22 | 7 | -13/+193 | |
|\ | | | | | MacOSX and Windows platform enhancements and installers | |||||
| * | Consolidate SYSTEM_CPP_MODULE in the main CMakeLists.txt | Didier 'OdyX' Raboud | 2013-11-20 | 1 | -12/+1 | |
| | | ||||||
| * | On MacOSX, assume we do have CFLocaleCopyCurrent to detect the actual locale ↵ | Didier 'OdyX' Raboud | 2013-11-13 | 1 | -0/+5 | |
| | | | | | | | | | | | | by hard-coding the fact in config.h.cmake This circumvents the fact that we are using localename.c directly instead of relying on the autotools-generated config.h | |||||
| * | Don't set rpath if libCBot is compiled statically | Didier 'OdyX' Raboud | 2013-11-13 | 1 | -2/+3 | |
| | | ||||||
| * | On MacOSX, define the LangPath as being i18n in the Resources path of the bundle | Didier 'OdyX' Raboud | 2013-11-13 | 2 | -8/+13 | |
| | | ||||||
| * | Abstract the definition of LangPath to CSystemUtils | Didier 'OdyX' Raboud | 2013-11-13 | 3 | -2/+10 | |
| | | ||||||
| * | On MacOSX, don't cache the Data, Sound and Music paths | Didier 'OdyX' Raboud | 2013-11-13 | 1 | -0/+7 | |
| | | | | | | | | | | | | As users can potentially move the bundle around, it doesn't make sense to cache these (It would probably make sense to drop this caching on all architectures, but it's only on MacOSX where it hurts most) | |||||
| * | On MacOSX, define the DataPath as being the Resources path in the bundle | Didier 'OdyX' Raboud | 2013-11-13 | 2 | -0/+54 | |
| | | ||||||
| * | Abstract the definition of DataPath to CSystemUtils | Didier 'OdyX' Raboud | 2013-11-13 | 3 | -1/+9 | |
| | | ||||||
| * | On Mac OS X, write colobot.ini and savegames to Application Support directories | Didier 'OdyX' Raboud | 2013-11-13 | 4 | -0/+103 | |
| | | ||||||
* | | Tweak tooltip margin and correct french jargon comment | Didier Raboud | 2013-11-19 | 1 | -2/+2 | |
| | | ||||||
* | | Fix tooltip to display as white and not transparent | Didier Raboud | 2013-11-19 | 1 | -2/+2 | |
| | | ||||||
* | | Fix for crash when loading PNG in indexed mode | Piotr Dziwinski | 2013-11-15 | 2 | -5/+31 | |
| | | | | | | | | For example, some icons in SatCom | |||||
* | | Buffer overflow fix | Piotr Dziwinski | 2013-11-13 | 1 | -1/+1 | |
|/ | ||||||
* | Add russian language support | Didier 'OdyX' Raboud | 2013-11-07 | 2 | -1/+19 | |
| | ||||||
* | Drop now-useless display of licenses.txt in PHASE_GENERIC | Didier Raboud | 2013-10-30 | 1 | -11/+0 | |
| | | | | | The content of licenses.txt in data has gotten useless as the restrictions got waived, displaying it is useless. | |||||
* | Merge pull request #245 from OdyX/dev-platform-fixes | Piotr Dziwiński | 2013-10-29 | 2 | -1/+7 | |
|\ | | | | | Platform fixes (Windows Icon and Mac OSX SDL_Main fix) | |||||
| * | Revert "Include SDL.h in main.cpp to make sure the main loop is SDL's main loop" | Didier 'OdyX' Raboud | 2013-10-29 | 1 | -1/+0 | |
| | | | | | | | | | | | | This was the wrong fix for the problem. This reverts commit f31a570d96e1a0ee28baecefa18b7e8c586c201c. | |||||
| * | Add an icon and executable information to the colobot.exe when build in MXE | Didier 'OdyX' Raboud | 2013-10-29 | 1 | -0/+7 | |
| | | ||||||
* | | Revert back "Merge pull request #243 from OdyX/dev-fix-textures-loading" | Piotr Dziwinski | 2013-10-29 | 2 | -3/+7 | |
|/ | | | | | False alarm, was caused probably by faulty build bot. This definately should work on all platforms. | |||||
* | Revert "Merge pull request #243 from OdyX/dev-fix-textures-loading" | Piotr Dziwinski | 2013-10-28 | 2 | -7/+3 | |
| | | | | Looks like it doesn't work on all platforms | |||||
* | Let mouse.png's format be detected | Didier Raboud | 2013-10-28 | 1 | -1/+1 | |
| | | | | Fixes the mouse cursor on Mac OS X | |||||
* | Fix the detection of alpha-channel in textures as created by IMG_Load | Didier 'OdyX' Raboud | 2013-10-28 | 1 | -2/+6 | |
| | | | | This fixes the textures loading under Mac OS X | |||||
* | Include SDL.h in main.cpp to make sure the main loop is SDL's main loop | Didier 'OdyX' Raboud | 2013-10-26 | 1 | -0/+1 | |
| | | | | This allows the MacOSX program to start. | |||||
* | Fix system_other implementation by adding an Init() and fixing the wrong const | Didier 'OdyX' Raboud | 2013-10-24 | 2 | -2/+3 | |
| | ||||||
* | Include the OpenAL headers using the "al.h" form, as recommended by its ↵ | Didier 'OdyX' Raboud | 2013-10-24 | 4 | -7/+7 | |
| | | | | CMake finder script | |||||
* | MacOSX: Add initial support in CMake build infra | Didier 'OdyX' Raboud | 2013-10-24 | 2 | -0/+4 | |
| | ||||||
* | Fixed CTerrain-related memory leaks | Piotr Dziwinski | 2013-10-13 | 4 | -3/+47 | |
| | ||||||
* | Fixed memory leaks in CText | Piotr Dziwinski | 2013-10-12 | 1 | -5/+18 | |
| | ||||||
* | Fixed some CBot-related memory leaks | Piotr Dziwinski | 2013-10-12 | 5 | -37/+37 | |
| | | | | | | * fixed leaks in CScript::CheckToken() * fixed leaks in CInterface * commented out unused function in robotmain.cpp | |||||
* | Fix for #232 - Images in SatCom | krzys-h | 2013-09-28 | 2 | -6/+6 | |
| | | | | Only images, icons still don't work | |||||
* | Fixed @Emxx52 's fail :P | krzys-h | 2013-09-08 | 1 | -1/+3 | |
|\ | | | | | | | | | | | Merge branch 'master' into dev Conflicts: src/app/app.cpp | |||||
| * | Added '-game' launch option | Emxx52 | 2013-09-08 | 1 | -1/+3 | |
| | | ||||||
* | | Datadir in command line didn't work with config. | erihel | 2013-07-16 | 2 | -3/+8 | |
| | | | | | | | | Values from config file overwrote datadir | |||||
* | | Fix for #228 | Piotr Dziwinski | 2013-06-26 | 1 | -9/+15 | |
| | | | | | | | | * "empty" objects were wrongly handled in CPyro | |||||
* | | Some Ui refactoring | erihel | 2013-06-24 | 30 | -83/+51 | |
|/ | ||||||
* | Some further changes in CMakeLists | Piotr Dziwinski | 2013-06-24 | 2 | -9/+9 | |
| | | | | | | * removed DEV_BUILD autodetection (could be confusing) * ignore desktop subdirectory on Windows * some refactoring |