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
991dbd1e37
Add profile and savegame fetchers in SystemUtils
...
This breaks the tests compilation. :/
2013-03-27 10:20:06 +01:00
df5edc703c
Added interface button for AlienSpider explosion
...
Issue #142
2013-03-26 15:33:54 +01:00
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
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
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
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
8658d6da80
Added Destroyer from Ceebot-Teen.
...
We need a new icon for it.
2013-02-13 16:58:19 +01:00
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
b50f9ae8b7
Fixed some clang warnings
2013-01-17 20:54:35 +01:00
5a6b3f005a
Merge dev and dev-graphics
2013-01-07 19:43:04 +01:00
ff5c890854
Small fix in detecting language. Fixes needed to compile code using clang
2013-01-05 23:03:26 +01:00
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
89a3f586a2
Merge branch 'dev' into dev-graphics
2013-01-04 00:05:28 +01:00
e625665f02
Merge pull request #108 from OdyX/dev-central-cmake-version
...
Create a central version
2012-12-29 02:44:03 -08:00
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
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
6d607e3ae8
latest changes
2012-12-21 17:31:55 +01:00
f77734e01c
Installation path fixes and CMakeLists refactoring
...
make && make install should now give a working installation.
2012-12-20 00:23:12 +01:00
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
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
4827440e73
Merge branch 'dev' into dev-use-installed-i18n
...
Conflicts:
src/common/config.h.cmake
2012-12-16 22:26:29 +01:00
a266692615
Use default installation paths for i18n.
...
This finishes the work started in
19b75e1743
2012-12-16 21:56:55 +01:00
c190c3efae
Set a default datadir, in sync with the data installation path.
2012-12-16 21:53:48 +01:00
56a170391f
Split gtest and gmock, fixed using system packages
...
- split the bundled gtest and gmock libraries
- allowed the use of system gmock
- refactoring in CMakeLists
2012-12-16 13:22:58 +01:00
72ce040054
Merge branch 'master' into dev
2012-12-15 20:23:58 +01:00
6946155a56
Inherit translation setting from environment.
...
This ensures that users with a correctly-defined locale don't need to
explicitely set the locale.
- By dropping the setlocale content, it fixes the loading of translations.
- Add a Debug log message to check what is put in the environment.
2012-12-14 15:17:23 +01:00
40e065aea9
Ground spot texture drawing
2012-10-20 16:34:22 +02:00
0305e0ba17
Restext rewrite to runtime initialized arrays
2012-10-17 23:16:19 +02:00
f6e27099b2
Doxygen/comment fixes and some #include refactoring
2012-10-17 21:55:45 +02:00
97f44035f1
Changing and saving input bindings
2012-10-07 00:46:46 +02:00
ec32b1df35
Commented out profile_test
2012-10-05 23:26:13 +02:00
3f7f013168
Merge branch 'dev' into dev-graphics
2012-10-02 22:17:30 +02:00
4b7ca3f262
Further work on saving profile and directory listing.
2012-10-02 21:44:14 +02:00
85d253b094
Fixed bugs in texture coloring
2012-09-30 11:26:59 +02:00
b46dc3850f
Map texture painting
2012-09-30 00:23:26 +02:00
e7e8954384
MXE support and CMake files refactoring
...
- added support for cross-compiling with MXE (http://mxe.cc/ )
- refactored CMake files, adding some options and moving definitions
to more suitable places
2012-09-29 17:19:23 +02:00
e9660c47c6
Merge branch 'dev' into dev-graphics
2012-09-29 12:19:00 +02:00
df4e3dfb6e
Small fix in profile + profile_test rewritten to gtest.
2012-09-28 21:03:28 +02:00
a394c9efec
Updated docs and some Doxygen fixes
2012-09-27 20:43:20 +02:00
cc9a507054
Profile rewritten to boost. Read/write to ini should work.
...
Load/Save should work.
2012-09-27 00:30:47 +02:00
f6638a173e
Work in progress on opening files, and listing dirs
...
Fixed includes
profile changed from SimpleIni to boost::ptree -> not finished yet
2012-09-26 22:57:43 +02:00
2fa4d7b0db
Refactored resource and relief loading
...
- now loading can be from any image format
- added IntColor struct for precise pixel operations
2012-09-26 19:18:33 +02:00
6cce7ec6fd
Removed metafile editor and loader
2012-09-22 21:07:23 +02:00
b1edcc822f
Various fixes
...
- 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
2012-09-22 17:36:10 +02:00
fd09071c29
Data dir paths
...
- changed access to paths in data directory in CApplication
- models now load from data directory
2012-09-22 14:40:13 +02:00
0ff419560d
Event fixes & refactoring
...
- added new state tracking to Event
- removed old fields from Event
- fixed some issues with Events and fps counter
2012-09-22 00:38:17 +02:00
15ff1d512b
* Fixed audio problems
...
* Added colobot.ini to CApp in Create function
* Fixes to plugin manager
* Fixed CProfile segfault
2012-09-22 00:11:16 +02:00
60c37aac3a
robotmain, restext and engine fixes
2012-09-21 00:01:03 +02:00
10c9d92cd2
Mouse wheel events, motion vectors
...
- added mouse wheel events
- added motion vectors to CRobotMain
- other minor changes in event.h
2012-09-19 21:23:42 +02:00
51884cef8e
Input bindings rewrite
...
- moved input bindings to CRobotMain
- added virtual keymod and joystick button key presses
- fixed putenv error; other minor fixes
2012-09-19 18:32:18 +02:00
36ae984ac7
Warnings cleaned, left only those connected to commented out code.
2012-09-18 22:33:28 +02:00
a397922e8d
warnings fight in progress.
2012-09-18 00:01:00 +02:00
6a0d150539
Interface works
...
- removed mock of CInterface and fixed event passing to CRobotMain
- changed texture names from tga and bmp to png
- UI now works but interaction is still broken
2012-09-16 10:38:08 +02:00
af9af56bb0
Successful compilation & running
...
- temporarily mocked CSoundInterface and CPluginInterface
- added CRobotMain to application
- successfully compiles & runs, but doesn't display correctly at the
moment
2012-09-15 22:19:32 +02:00
8ad15c0ef7
CMainDialog rewrite
...
- rewritten CMainDialog and updated CRobotMain
2012-09-15 21:47:19 +02:00
ad6bc13dc2
Merge dev-common and various fixes to achieve compilation
...
- merged changes from dev-common
- fixed many compilation errors (CBrain, UI, ...)
- temporarily commented out some problematic code (e.g. input bindings)
- (partially) fixed #include styling
- everything compiles except for CRobotMain, CMainDialog and CStudio
2012-09-15 18:50:51 +02:00
d439f4fa93
Merge branch 'dev-ui' into dev
...
Conflicts:
src/CMakeLists.txt
src/common/misc.cpp
src/common/misc.h
src/object/robotmain.cpp
src/object/robotmain.h
src/script/cbottoken.cpp
src/script/cbottoken.h
src/ui/button.cpp
src/ui/button.h
src/ui/check.cpp
src/ui/check.h
src/ui/color.cpp
src/ui/color.h
src/ui/compass.cpp
src/ui/compass.h
src/ui/control.cpp
src/ui/control.h
src/ui/displayinfo.cpp
src/ui/displayinfo.h
src/ui/displaytext.cpp
src/ui/displaytext.h
src/ui/edit.cpp
src/ui/edit.h
src/ui/gauge.cpp
src/ui/gauge.h
src/ui/interface.cpp
src/ui/interface.h
src/ui/key.cpp
src/ui/map.h
src/ui/shortcut.h
src/ui/slider.h
src/ui/target.cpp
src/ui/target.h
src/ui/window.cpp
src/ui/window.h
2012-09-15 16:35:48 +02:00
94e7fd9203
Locale settings and translation fixes
...
- added locale setting
- removed unused translations
- updated .po files
2012-09-13 23:28:06 +02:00
87c87c2c06
Image pixel read/write
2012-09-13 20:40:07 +02:00
34d7dcf3be
Simulation timestamps and input bindings
...
- added new simulation time calculations in CApplication
- added simulation frame updates
- rewritten old input binding code and input state tracking
2012-09-12 23:43:04 +02:00
479a67a731
Merge with changes from Zaba999 fork.
2012-09-10 23:29:38 +02:00
efe4f0badd
Refactoring in src/common
...
- refactored CInstanceManager and some headers
- removed old headers
2012-09-09 17:51:10 +02:00
b3d5491af4
Merge branch 'dev' into dev-graphics
2012-09-09 13:05:41 +02:00
5903e400d4
Merge branch 'dev' of https://github.com/adiblol/colobot into dev-ui
...
Conflicts:
src/common/restext.cpp
src/common/restext.h
2012-09-03 18:26:51 +02:00
Oleg Kosmakov