Commit Graph

801 Commits (672abbbbca5bd12441a2e3ebca0d04bfa529e84f)

Author SHA1 Message Date
krzys-h 672abbbbca Removed "X" button 2013-03-27 20:38:36 +01:00
krzys-h 3402219438 Changed savegame & profile dir on Windows 2013-03-27 20:24:05 +01:00
krzys-h 8f379e5cf1 Changes to Scribbler interface 2013-03-27 19:55:27 +01:00
krzys-h 0691460682 Added button for grab()/drop() for AlienWasp 2013-03-27 15:30:34 +01:00
erihel e93ed747c2 * Another define to fix linker problems 2013-03-27 15:13:51 +01:00
krzys-h cef858bb47 Merge pull request #151 from OdyX/dev-use-xdg-homedirs
Use XDG paths and directories for both savegame and colobot.ini.
2013-03-27 03:38:16 -07:00
Didier Raboud 0d537c7fb5 BROWN-PAPER COMMIT: Drop the tests to have the thing build
Someone understanding GMock / GTest needs to replace that commit (and the two parents) with a working setup
2013-03-27 10:31:06 +01:00
Didier Raboud 4c1a7057bb Add Linux-specific savegame and profile settings according to the XDG Base Directory Specification
http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
2013-03-27 10:29:58 +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
krzys-h 43c39f60cd Added option "zoom=x;y;z" to CreateObject in mission files 2013-03-25 16:12:18 +01:00
Piotr Dziwinski 0d5a9358fc Revert "Travis change from #148"
This reverts commit 5f1c202a6b.

Reverting change because we still need to check GCC 4.6 compatibility.
2013-03-25 10:18:08 +01:00
Piotr Dziwinski 5f1c202a6b Travis change from #148 2013-03-25 09:59:50 +01:00
Piotr Dziwinski 00a2abd21f Fixed GCC 4.6 compilation 2013-03-25 09:49:42 +01:00
Piotr Dziwinski af60e6a695 Useful script for showing status of data submodule 2013-03-25 00:47:38 +01:00
Piotr Dziwiński cd60d921ec Merge pull request #147 from OdyX/bugfix-desktop-option-creation
Bugfix DESKTOP option initialisation
2013-03-24 14:39:30 -07:00
Didier Raboud 8aba2424bb Bugfix DESKTOP option initialisation 2013-03-24 22:25:39 +01:00
Piotr Dziwinski 8f6fbdde64 Updated data submodule 2013-03-24 21:37:19 +01:00
krzys-h 5810fdd717 In Retro mode, robot's lights always blink. 2013-03-24 21:31:31 +01:00
krzys-h f4e222248f Retro mode now disables possibility of writing and running programs 2013-03-24 19:05:20 +01:00
krzys-h 5deb68e698 Small fix in mission files code 2013-03-24 16:35:00 +01:00
krzys-h 5eb4e10c2b Reverted "Fix for issue #149"
because it was broken again after commit 7ebba6abaa
2013-03-24 16:05:21 +01:00
Piotr Dziwinski 195d6cded0 Fixed timer functions on win32
* changed win32 implementation to QueryPerformaceTimer system function
 * refactored system utils code
 * proper tests for time utils and update event creation in application
 * should fix issue #134
2013-03-24 12:00:12 +01:00
erihel c211b001d2 * Updated submodule data 2013-03-23 21:31:09 +01:00
erihel 7ebba6abaa * Changed ending screen (issue #129) 2013-03-23 21:22:44 +01:00
erihel 956efb1feb * Blocked cheat input in SatCom, intro movie and while editing cbot (issue #130) 2013-03-23 20:33:14 +01:00
krzys-h 25c3ba0d3b Basic detection of syntax errors in mission levels
+ option to enable Retro mode (for now doesn't do enything)
2013-03-23 19:06:49 +01:00
Piotr Dziwinski 87bc927d87 Updated README files, optional libsndfile
* updated readme files
 * moved sndfile to optional
 * changed install paths on Windows
2013-03-22 22:24:35 +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 1406464f0c * Changed Set/Get HilateCap to Set/Get HighlightCap
* Changes ReadText in CEdit to fix problem with SatCom links
* Filenames when loading/saving scripts should be fixed on mxe
2013-03-20 21:50:44 +01:00
erihel 64be7a5df6 * Fix for mxe with boost path 2013-03-20 20:27:19 +01:00
Piotr Dziwinski 3bb83e5595 Changed Linux time function
With CLOCK_MONOTONIC_RAW, the timer should never go back in time.
2013-03-19 23:08:39 +01:00
Piotr Dziwinski 025bedecfb Refactored platform-specific code
Moved functions from .h to .cpp files
2013-03-19 23:07:39 +01:00
erihel 4abcaae0f7 * Changes std::stoi to atoi as gcc does not support it on windows platform 2013-03-17 23:16:26 +01:00
erihel 21de71f871 * Fixed app stub in edit test 2013-03-17 20:40:54 +01:00
erihel 0cd64113aa * Implemented CStudio::UpdateDialogList() function for listing saved files 2013-03-17 20:23:57 +01:00
erihel e5aadfdaac Merge branch 'dev' of github:colobot/colobot into dev 2013-03-17 19:05:29 +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
krzys-h f88e74f887 Fix for issue #129
Text on exit screen is improperly placed
2013-03-17 15:05:53 +01:00
erihel 9f5bef030d * Adjusted sound volume to game settings
* Added fabs to remove logs about pitch having negative values
2013-03-14 23:03:03 +01:00
erihel 6c783b9033 * Fix for issue #122 with sound not being played in menu after playing mission 2013-03-14 21:30:32 +01:00
erihel 47e7904bb7 * Fix for issue #140 (not compiling sound files while sound support is enabled) 2013-03-14 20:41:48 +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
krzys-h 1f565fdf38 "allmission" default value depends on build type 2013-03-09 15:28:36 +01:00
krzys-h 37a095b5b6 MORE improvements to produce() 2013-03-01 21:56:52 +01:00
krzys-h 0864e44c7b Fix for #135
jet() parameter > 1
2013-03-01 21:36:38 +01:00
Piotr Dziwinski f729686539 Fixed segfault in light manager
Also fixed minor memory leak
2013-02-28 22:56:44 +01:00
Piotr Dziwinski 08c646bb92 Fixed stupid error, tweaked ambient light colors
* fixed stupid error in light manager
 * tweaked ambient light colors to 0.1 of diffuse;
   colors should not be oversaturated now
2013-02-28 22:06:22 +01:00
Piotr Dziwinski b361d27d33 Removed unnecessary print 2013-02-28 20:29:16 +01:00
Piotr Dziwinski b0d86ebe5a Better light sorting
Should fix lighting issue (#62)
2013-02-25 21:58:01 +01:00