96d49d84aa
Merge branch 'dev' into dev-physfs
...
Conflicts:
data
src/app/gamedata.cpp
src/ui/control.cpp
src/ui/edit.cpp
src/ui/maindialog.cpp
2014-07-11 15:24:44 +02:00
9a6c06665c
Removed some old stuff related to Ceebot-Teen
2014-07-10 17:39:45 +02:00
c22e55b99a
Removed some unused code related to Quit button
...
The button itself has been removed a long time ago
2014-07-10 16:52:29 +02:00
106ec014b8
Fixed texture and script loading
2014-07-10 16:25:40 +02:00
1835d2ae58
Removed old code based on #ifs (issue #55 )
2014-06-27 19:52:09 +02:00
b7125a5b24
formatting and enhancements for savefile screenshot feature
2014-06-24 20:27:31 +03:00
613e1d74c4
implemented savefile screenshot feature
2014-06-24 01:35:05 +03:00
68d41d3b21
More work on streams
2014-06-23 23:19:55 +02:00
3aca1de731
More work on levels
2014-06-22 21:30:23 +02:00
0556b5dfbc
Added Exist() to resource manager, updated model
2014-06-22 16:29:26 +02:00
754154341d
More work on PhysFS support
...
* added output stream
* fixed music loading
2014-06-22 15:01:06 +02:00
1630cf0ed2
Implemented libsndfile loader in PhysFS
2014-06-21 02:59:26 +02:00
2260f6bf4f
Big part of PhysFS support
...
* 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
2014-06-20 23:51:28 +02:00
f0d97bfdb9
Better datadir mod support
2014-05-18 12:12:47 +02:00
4491f51839
Whitespace
2014-03-21 13:15:15 +02:00
7485ed790c
Fixes #295
...
When cannon cannot turn at specified angle, it will still reach the edge angle, but return the error code
2014-03-21 13:08:36 +02:00
2cf84ad214
Added spaces to align values
2014-03-21 09:34:52 +02:00
082989a413
Changed main menu title to "COLOBOT: Gold Edition"
2014-01-01 19:49:29 +01:00
8d30791595
Ability to set language via ini file
...
If language autodetection doesn't work, someone might want to manually force the game to use correct language without using -language parameter every time
2013-12-31 17:20:03 +01:00
0ff7e55b33
Fix for #177 - save list sorting
2013-12-27 22:28:25 +01:00
246b7e107e
Removed prototypes support
2013-12-27 20:36:11 +01:00
9a741a66a4
Changed version display in bottom-right corner to be actually version number instead of date
2013-12-27 11:15:36 +01:00
16842b5e83
Changed default loglevel on dev builds to Debug
2013-12-26 21:09:19 +01:00
3eec21895e
Renamed "New player" to "Change player" ( #220 )
2013-12-26 19:48:44 +01:00
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
8deb130572
Changed char[] to std::string in restext
...
Experimental changes
2013-12-04 00:15:39 +01:00
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
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
81b940cc25
Fix for crash when loading PNG in indexed mode
...
For example, some icons in SatCom
2013-11-15 10:22:49 +01:00
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
8b65e9b56f
Add russian language support
2013-11-07 14:44:12 +01:00
b3b6a40d9e
MacOSX: Add initial support in CMake build infra
2013-10-24 21:12:52 +02:00
9f819088a6
gitignore update
...
* git should now ignore all generated files when building without
separate build directory
2013-06-22 22:44:03 +02:00
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
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
b22d852b4c
Fixed variable shadowing warnings
...
* fixed -Wshadow warnings
* refactored some constructors
2013-05-27 22:29:42 +02:00
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
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
b9d0ee034e
Running program in robots created using object.factory()
2013-05-19 16:27:33 +02:00
7662f312b3
Changed "Inappropariate bot"->"Inappropariate object" in newly added functions
2013-05-18 18:29:07 +02:00
796cb92ffc
Added object.destroy()
2013-05-18 18:04:48 +02:00
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
6333d2d38e
Removed most of "No such node" messages
2013-05-04 11:56:03 +02:00
5a31a93610
Changed log level in profile.cpp to error
2013-05-03 21:33:19 +02:00
8a1e4b1e5f
Added button for Destroyer
...
Issue #142
2013-05-02 17:55:53 +02:00
d815fbf09e
Saving information to profile ( #154 )
2013-05-01 21:02:43 +02:00
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
41fb814e99
Added build
...
Third patch
2013-04-27 18:11:26 +03:00
8301a3639b
Moved boost flags to CMakeLists
2013-03-27 20:54:04 +01:00
e93ed747c2
* Another define to fix linker problems
2013-03-27 15:13:51 +01:00
krzys-h