summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* Added "E" as a secondary action buttonkrzys-h2013-12-251-7/+8
| | | | As requested by @Emxx52 on IRC
* Fixed "default controls" button (#263)krzys-h2013-12-251-1/+1
|
* Added WSAD as secondary controls (#231)krzys-h2013-12-251-0/+4
|
* Fixed bug #240 - CAuto in produce()krzys-h2013-12-251-1/+8
|
* Fixed AudioChangekrzys-h2013-12-251-8/+9
|
* Merge branch 'dev-string-in-restext' into devPiotr Dziwinski2013-12-2027-209/+254
|\ | | | | | | | | | | Merging branches after code review This should fix buffer overflow problems with translation strings
| * Some further refactoring and test correctionsPiotr Dziwinski2013-12-202-15/+25
| |
| * Changed char[] to std::string in restextPiotr Dziwinski2013-12-0427-197/+232
| | | | | | | | Experimental changes
* | Sound support changeserihel2013-12-198-249/+42
| | | | | | | | | | | | * removed 2d sound * fixed listener orientation (propably issue #235) * removed unused code and minor refactoring
* | Never cache Data, Sound and Music pathsDidier 'OdyX' Raboud2013-12-091-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 Raboud2013-11-272-0/+3
| | | | Linux, kFreeBSD and Hurd
* Updated README and INSTALL filesPiotr Dziwinski2013-11-261-1/+1
|
* Changed ASM_TRAP() to assert(0)Piotr Dziwinski2013-11-256-83/+88
|
* Merge pull request #250 from OdyX/dev-platform-enhancements-and-installersPiotr Dziwiński2013-11-227-13/+193
|\ | | | | MacOSX and Windows platform enhancements and installers
| * Consolidate SYSTEM_CPP_MODULE in the main CMakeLists.txtDidier 'OdyX' Raboud2013-11-201-12/+1
| |
| * On MacOSX, assume we do have CFLocaleCopyCurrent to detect the actual locale ↵Didier 'OdyX' Raboud2013-11-131-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 staticallyDidier 'OdyX' Raboud2013-11-131-2/+3
| |
| * On MacOSX, define the LangPath as being i18n in the Resources path of the bundleDidier 'OdyX' Raboud2013-11-132-8/+13
| |
| * Abstract the definition of LangPath to CSystemUtilsDidier 'OdyX' Raboud2013-11-133-2/+10
| |
| * On MacOSX, don't cache the Data, Sound and Music pathsDidier 'OdyX' Raboud2013-11-131-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 bundleDidier 'OdyX' Raboud2013-11-132-0/+54
| |
| * Abstract the definition of DataPath to CSystemUtilsDidier 'OdyX' Raboud2013-11-133-1/+9
| |
| * On Mac OS X, write colobot.ini and savegames to Application Support directoriesDidier 'OdyX' Raboud2013-11-134-0/+103
| |
* | Tweak tooltip margin and correct french jargon commentDidier Raboud2013-11-191-2/+2
| |
* | Fix tooltip to display as white and not transparentDidier Raboud2013-11-191-2/+2
| |
* | Fix for crash when loading PNG in indexed modePiotr Dziwinski2013-11-152-5/+31
| | | | | | | | For example, some icons in SatCom
* | Buffer overflow fixPiotr Dziwinski2013-11-131-1/+1
|/
* Add russian language supportDidier 'OdyX' Raboud2013-11-072-1/+19
|
* Drop now-useless display of licenses.txt in PHASE_GENERICDidier Raboud2013-10-301-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-fixesPiotr Dziwiński2013-10-292-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' Raboud2013-10-291-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 MXEDidier 'OdyX' Raboud2013-10-291-0/+7
| |
* | Revert back "Merge pull request #243 from OdyX/dev-fix-textures-loading"Piotr Dziwinski2013-10-292-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 Dziwinski2013-10-282-7/+3
| | | | Looks like it doesn't work on all platforms
* Let mouse.png's format be detectedDidier Raboud2013-10-281-1/+1
| | | | Fixes the mouse cursor on Mac OS X
* Fix the detection of alpha-channel in textures as created by IMG_LoadDidier 'OdyX' Raboud2013-10-281-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 loopDidier 'OdyX' Raboud2013-10-261-0/+1
| | | | This allows the MacOSX program to start.
* Fix system_other implementation by adding an Init() and fixing the wrong constDidier 'OdyX' Raboud2013-10-242-2/+3
|
* Include the OpenAL headers using the "al.h" form, as recommended by its ↵Didier 'OdyX' Raboud2013-10-244-7/+7
| | | | CMake finder script
* MacOSX: Add initial support in CMake build infraDidier 'OdyX' Raboud2013-10-242-0/+4
|
* Fixed CTerrain-related memory leaksPiotr Dziwinski2013-10-134-3/+47
|
* Fixed memory leaks in CTextPiotr Dziwinski2013-10-121-5/+18
|
* Fixed some CBot-related memory leaksPiotr Dziwinski2013-10-125-37/+37
| | | | | | * fixed leaks in CScript::CheckToken() * fixed leaks in CInterface * commented out unused function in robotmain.cpp
* Fix for #232 - Images in SatComkrzys-h2013-09-282-6/+6
| | | | Only images, icons still don't work
* Fixed @Emxx52 's fail :Pkrzys-h2013-09-081-1/+3
|\ | | | | | | | | | | Merge branch 'master' into dev Conflicts: src/app/app.cpp
| * Added '-game' launch optionEmxx522013-09-081-1/+3
| |
* | Datadir in command line didn't work with config.erihel2013-07-162-3/+8
| | | | | | | | Values from config file overwrote datadir
* | Fix for #228Piotr Dziwinski2013-06-261-9/+15
| | | | | | | | * "empty" objects were wrongly handled in CPyro
* | Some Ui refactoringerihel2013-06-2430-83/+51
|/
* Some further changes in CMakeListsPiotr Dziwinski2013-06-242-9/+9
| | | | | | * removed DEV_BUILD autodetection (could be confusing) * ignore desktop subdirectory on Windows * some refactoring