immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,231 Commits
19 Branches
15 Tags
59 MiB
Commit Graph

2231 Commits (4b10358df767aa28a49a4b17b84da4ac98694604)

Author SHA1 Message Date
krzys-h 9485e1a95f Improved log levels 2013-04-01 12:58:55 +02:00
Piotr Dziwinski ff97de5477 Fixed graphics objects after reset 
Should fix  and perhaps some other bugs as well
 2013-03-31 13:06:38 +02:00
krzys-h 0d70b6e2f8 More parameters to destroy() 
Also, removed some warnings in script.cpp
 2013-03-31 12:04:12 +02:00
krzys-h 2f7ff844d3 Small fix to CObject::ExploObject 2013-03-31 11:15:45 +02:00
krzys-h 47b7236a17 Tests AGAIN! 2013-03-31 10:35:23 +02:00
krzys-h a6d68d58e5 And it compiled and worked? o.O 2013-03-31 10:26:37 +02:00
krzys-h 0625f064a7 Merge branch 'dev' of github.com:colobot/colobot into dev 2013-03-31 10:22:08 +02:00
krzys-h 90301e24c0 Added field "item" to class "object" in CBot 2013-03-31 10:21:22 +02:00
erihel 5a60a7a219 Merge branch 'dev' of github:colobot/colobot into dev 2013-03-30 16:04:58 +01:00
erihel b7b5f002a6 * Removed warning while compiling brain.cpp 
* Fix for issue 
* Fix for issue  with wrong sound pitch
 2013-03-30 16:03:25 +01:00
krzys-h 845c8e9437 Merge branch 'dev' of github.com:colobot/colobot into dev 2013-03-30 15:43:39 +01:00
krzys-h 040a7e8f24 Added function destroy(rank) 2013-03-30 15:43:09 +01:00
Piotr Dziwinski e218dcfdf2 Merge branch 'dev' 
Merging content from dev
 2013-03-30 15:23:05 +01:00
Piotr Dziwinski e607fed265 Fixed power cell bug () 2013-03-30 14:45:55 +01:00
erihel 3569adb103 * Fixed and turned on edit_test 2013-03-29 16:13:37 +01:00
krzys-h 06742cab16 OK, I give up. 2013-03-29 10:56:36 +01:00
krzys-h 8fd0f25e69 Nope, now fixed edit_test! 2013-03-29 10:51:48 +01:00
krzys-h 7fe1655c5c Fixed edit_test 2013-03-29 10:48:25 +01:00
krzys-h 530344724c Tests are broken again 2013-03-29 10:22:00 +01:00
krzys-h effdac1d50 Updated data submodule 2013-03-29 10:14:39 +01:00
krzys-h 8777c126de Added SatCom translations 2013-03-29 10:03:35 +01:00
krzys-h 85dcc51434 Merge branch 'dev' of github.com:colobot/colobot into dev 2013-03-28 16:00:09 +01:00
krzys-h b284fd74f3 Changes to fix multilanguage on Windows 
Issue
2013-03-28 15:59:13 +01:00
Piotr Dziwinski 212f2e41f8 Fixed edit_test 2013-03-27 23:48:49 +01:00
krzys-h 8659fb984f Added option to lock SatCom 2013-03-27 22:20:50 +01:00
krzys-h c6d89f6210 Revert "Fix for #30" 
This reverts commit bfdd52ade0.
That wasn't working. :(
 2013-03-27 21:58:34 +01:00
krzys-h bfdd52ade0 Fix for 2013-03-27 21:37:37 +01:00
Piotr Dziwinski 8301a3639b Moved boost flags to CMakeLists 2013-03-27 20:54:04 +01:00
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 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
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 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 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