Commit Graph

140 Commits (8b5b2eeaa152129dd23a9c127bd59ec260956c42)

Author SHA1 Message Date
krzys-h 16842b5e83 Changed default loglevel on dev builds to Debug 2013-12-26 21:09:19 +01:00
krzys-h 3eec21895e Renamed "New player" to "Change player" (#220) 2013-12-26 19:48:44 +01:00
krzys-h a79bd6c5c7 Fixed build of stringutils.cpp
/var/www/colobot_compiled/colobot/dev/colobot/src/common/stringutils.cpp:33:51: error: 'vsnprintf' was not declared in this scope
2013-12-25 23:41:50 +01:00
Piotr Dziwinski 8deb130572 Changed char[] to std::string in restext
Experimental changes
2013-12-04 00:15:39 +01:00
Didier Raboud 343fa8f0cb Add a PLATFORM_GNU global variable matching all GNU systems such as Debian's Linux, kFreeBSD and Hurd 2013-11-27 18:53:28 +01:00
Piotr Dziwiński 8ed542a881 Merge pull request #250 from OdyX/dev-platform-enhancements-and-installers
MacOSX and Windows platform enhancements and installers
2013-11-22 15:16:12 -08:00
Piotr Dziwinski 81b940cc25 Fix for crash when loading PNG in indexed mode
For example, some icons in SatCom
2013-11-15 10:22:49 +01:00
Didier 'OdyX' Raboud d7af8204ce On MacOSX, assume we do have CFLocaleCopyCurrent to detect the actual locale 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
2013-11-13 17:41:41 +01:00
Didier 'OdyX' Raboud 8b65e9b56f Add russian language support 2013-11-07 14:44:12 +01:00
Didier 'OdyX' Raboud b3b6a40d9e MacOSX: Add initial support in CMake build infra 2013-10-24 21:12:52 +02:00
Piotr Dziwinski 9f819088a6 gitignore update
* git should now ignore all generated files when building without
   separate build directory
2013-06-22 22:44:03 +02:00
Piotr Dziwinski bfcce26f89 Changes in build organization
* targets are now created in top-level build directory
 * more things are now configured through CMake options
 * changed debug build detection from NDEBUG to DEV_BUILD
 * moved po and desktop directories
 * moved last unit test out of src directory
2013-06-22 01:17:19 +02:00
Piotr Dziwinski 7874aca10c Enhanced logging, option to auto-start mission
* added logging of application events
 * changed debug mode flag to independent debug modes
 * added option to auto-start mission (load a mission immediately
   after startup)
 * removed "enum value out of range" prints
 * some refactoring
2013-06-16 21:54:36 +02:00
Piotr Dziwinski b22d852b4c Fixed variable shadowing warnings
* fixed -Wshadow warnings
 * refactored some constructors
2013-05-27 22:29:42 +02:00
Piotr Dziwinski 950a3474d5 Refactored sound code
* fixed formatting and naming to be uniform with rest of code
 * moved default implementation of CSound to cpp module
2013-05-27 10:19:16 +02:00
Piotr Dziwinski 8765d58b02 Fixed code formatting
* moved braces to new lines
 * fixed some function/variable names
 * fixed whitespace issues
2013-05-27 10:19:16 +02:00
krzys-h b9d0ee034e Running program in robots created using object.factory() 2013-05-19 16:27:33 +02:00
krzys-h 7662f312b3 Changed "Inappropariate bot"->"Inappropariate object" in newly added functions 2013-05-18 18:29:07 +02:00
krzys-h 796cb92ffc Added object.destroy() 2013-05-18 18:04:48 +02:00
Piotr Dziwinski cec406ea31 Non-power-of-2 padding for background images
* added padding options
 * removed old hardcoded image sizes
2013-05-11 23:12:13 +02:00
krzys-h 6333d2d38e Removed most of "No such node" messages 2013-05-04 11:56:03 +02:00
erihel 5a31a93610 Changed log level in profile.cpp to error 2013-05-03 21:33:19 +02:00
krzys-h 8a1e4b1e5f Added button for Destroyer
Issue #142
2013-05-02 17:55:53 +02:00
krzys-h d815fbf09e Saving information to profile (#154) 2013-05-01 21:02:43 +02:00
krzys-h 23e3e552f3 Made colobot.ini & savegame dir location depended on build type
For Debug, it's current dir
For Release it's like it was before
Made on @CoLoRaptor's request :)
2013-05-01 19:44:55 +02:00
XienDev 41fb814e99 Added build
Third patch
2013-04-27 18:11:26 +03:00
Piotr Dziwinski 8301a3639b Moved boost flags to CMakeLists 2013-03-27 20:54:04 +01:00
erihel e93ed747c2 * Another define to fix linker problems 2013-03-27 15:13:51 +01:00
Didier Raboud 991dbd1e37 Add profile and savegame fetchers in SystemUtils
This breaks the tests compilation. :/
2013-03-27 10:20:06 +01:00
krzys-h df5edc703c Added interface button for AlienSpider explosion
Issue #142
2013-03-26 15:33:54 +01:00
Piotr Dziwinski 4a30800cf1 Fixes for compiling on MSYS
* fixed SDL_main() and putenv() issues
 * disabled desktop subdir for MSYS
 * disabled building CBot_console for now
2013-03-22 19:17:08 +01:00
erihel d6bbc99c90 * Changed file loading to fix issue #73
* Moved few functions from misc.cpp to profile.cpp (used to set/get user dir)
* Removed some warnings
* More work to change const char* to std::string
* Some work on file path to fix issue #60 with bad slashes on POSIX platform
2013-03-17 19:01:32 +01:00
Piotr Dziwinski bc859c4c59 VBO override option; argv parsing using getopt
* added -vbo option to override autodetection of OpenGL VBO extension
 * refactored argument parsing to use getopt()
 * fixed failing UTs
2013-03-10 15:44:21 +01:00
Piotr Dziwiński 001d37b257 CInstanceManager refactoring
* removed classes managed by CInstanceManager
   except for CObject, CPyro, CBrain and CPhysics
   because of dependencies
 * refactored instance searching to use existing singleton instances of
   CApplication, CEngine and CRobotMain and calling their getter
   functions
2013-02-17 12:11:56 +01:00
krzys-h 8658d6da80 Added Destroyer from Ceebot-Teen.
We need a new icon for it.
2013-02-13 16:58:19 +01:00
Piotr Dziwinski 209c6412ae Refactoring in tests infrastructure
* all tests are now in /test/ subdirectory
 * unit tests concatenated to one executable (TODO: ui, common)
 * preparation for test environments (OpenGL and others)
 * removed old TestCBot
2013-02-03 20:03:36 +01:00
Piotr Dziwinski b50f9ae8b7 Fixed some clang warnings 2013-01-17 20:54:35 +01:00
Piotr Dziwinski 5a6b3f005a Merge dev and dev-graphics 2013-01-07 19:43:04 +01:00
Marcin Zawadzki ff5c890854 Small fix in detecting language. Fixes needed to compile code using clang 2013-01-05 23:03:26 +01:00
Piotr Dziwinski 8818a8e5db Corrected OpenGL extension detection
- corrected multitexture and VBO detection
- GLEW is now a required library
- minor CMakeLists refactoring
2013-01-05 23:03:06 +01:00
Piotr Dziwinski 89a3f586a2 Merge branch 'dev' into dev-graphics 2013-01-04 00:05:28 +01:00
Piotr Dziwiński e625665f02 Merge pull request #108 from OdyX/dev-central-cmake-version
Create a central version
2012-12-29 02:44:03 -08:00
Piotr Dziwinski 3e4c1a1ad8 Replaced malloc/free with new/delete
- now new/delete used everywhere except for CBotStack, which
   has to be fixed in other way
 - some segfaults should be fixed with this
2012-12-28 13:37:08 +01:00
Didier Raboud e62996858b Create a central version
Make it 0.1.0~pre-alpha for now.

- Add it to runtime program
- Add it to -help option
- Add it to manpage
- Update translations
2012-12-27 17:12:42 +01:00
erihel 6d607e3ae8 latest changes 2012-12-21 17:31:55 +01:00
Piotr Dziwinski f77734e01c Installation path fixes and CMakeLists refactoring
make && make install should now give a working installation.
2012-12-20 00:23:12 +01:00
Didier Raboud 7e9ef0c042 Put common CXX flags in common variables
CMAKE_CXX_FLAGS is taken into account in all builds; build-type-specific
flags are appended to it.
2012-12-19 16:55:00 +01:00
Didier Raboud 3c976c040b Don't enforce CMake build type on users.
Only set CMAKE_BUILD_TYPE to Debug when no value is provided.
2012-12-19 16:52:17 +01:00
Didier Raboud 4827440e73 Merge branch 'dev' into dev-use-installed-i18n
Conflicts:
	src/common/config.h.cmake
2012-12-16 22:26:29 +01:00
Didier Raboud a266692615 Use default installation paths for i18n.
This finishes the work started in
19b75e1743 by actually using the
translation where they are installed.
2012-12-16 21:56:55 +01:00