0d70b6e2f8
More parameters to destroy()
...
Also, removed some warnings in script.cpp
2013-03-31 12:04:12 +02:00
2f7ff844d3
Small fix to CObject::ExploObject
2013-03-31 11:15:45 +02:00
47b7236a17
Tests AGAIN!
2013-03-31 10:35:23 +02:00
a6d68d58e5
And it compiled and worked? o.O
2013-03-31 10:26:37 +02:00
0625f064a7
Merge branch 'dev' of github.com:colobot/colobot into dev
2013-03-31 10:22:08 +02:00
90301e24c0
Added field "item" to class "object" in CBot
2013-03-31 10:21:22 +02:00
5a60a7a219
Merge branch 'dev' of github:colobot/colobot into dev
2013-03-30 16:04:58 +01:00
b7b5f002a6
* Removed warning while compiling brain.cpp
...
* Fix for issue #130
* Fix for issue #128 with wrong sound pitch
2013-03-30 16:03:25 +01:00
845c8e9437
Merge branch 'dev' of github.com:colobot/colobot into dev
2013-03-30 15:43:39 +01:00
040a7e8f24
Added function destroy(rank)
2013-03-30 15:43:09 +01:00
e218dcfdf2
Merge branch 'dev'
...
Merging content from dev
2013-03-30 15:23:05 +01:00
e607fed265
Fixed power cell bug ( #120 )
2013-03-30 14:45:55 +01:00
3569adb103
* Fixed and turned on edit_test
2013-03-29 16:13:37 +01:00
06742cab16
OK, I give up.
2013-03-29 10:56:36 +01:00
8fd0f25e69
Nope, now fixed edit_test!
2013-03-29 10:51:48 +01:00
7fe1655c5c
Fixed edit_test
2013-03-29 10:48:25 +01:00
530344724c
Tests are broken again
2013-03-29 10:22:00 +01:00
effdac1d50
Updated data submodule
2013-03-29 10:14:39 +01:00
8777c126de
Added SatCom translations
2013-03-29 10:03:35 +01:00
85dcc51434
Merge branch 'dev' of github.com:colobot/colobot into dev
2013-03-28 16:00:09 +01:00
b284fd74f3
Changes to fix multilanguage on Windows
...
Issue #118
2013-03-28 15:59:13 +01:00
212f2e41f8
Fixed edit_test
2013-03-27 23:48:49 +01:00
8659fb984f
Added option to lock SatCom
2013-03-27 22:20:50 +01:00
c6d89f6210
Revert "Fix for #30"
...
This reverts commit bfdd52ade0
2013-03-27 21:58:34 +01:00
bfdd52ade0
Fix for #30
2013-03-27 21:37:37 +01:00
8301a3639b
Moved boost flags to CMakeLists
2013-03-27 20:54:04 +01:00
672abbbbca
Removed "X" button
2013-03-27 20:38:36 +01:00
3402219438
Changed savegame & profile dir on Windows
2013-03-27 20:24:05 +01:00
8f379e5cf1
Changes to Scribbler interface
2013-03-27 19:55:27 +01:00
0691460682
Added button for grab()/drop() for AlienWasp
2013-03-27 15:30:34 +01:00
e93ed747c2
* Another define to fix linker problems
2013-03-27 15:13:51 +01:00
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
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
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
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
43c39f60cd
Added option "zoom=x;y;z" to CreateObject in mission files
2013-03-25 16:12:18 +01:00
0d5a9358fc
Revert "Travis change from #148"
...
This reverts commit 5f1c202a6b
2013-03-25 10:18:08 +01:00
5f1c202a6b
Travis change from #148
2013-03-25 09:59:50 +01:00
00a2abd21f
Fixed GCC 4.6 compilation
2013-03-25 09:49:42 +01:00
af60e6a695
Useful script for showing status of data submodule
2013-03-25 00:47:38 +01:00
cd60d921ec
Merge pull request #147 from OdyX/bugfix-desktop-option-creation
...
Bugfix DESKTOP option initialisation
2013-03-24 14:39:30 -07:00
8aba2424bb
Bugfix DESKTOP option initialisation
2013-03-24 22:25:39 +01:00
8f6fbdde64
Updated data submodule
2013-03-24 21:37:19 +01:00
5810fdd717
In Retro mode, robot's lights always blink.
2013-03-24 21:31:31 +01:00
f4e222248f
Retro mode now disables possibility of writing and running programs
2013-03-24 19:05:20 +01:00
5deb68e698
Small fix in mission files code
2013-03-24 16:35:00 +01:00
5eb4e10c2b
Reverted "Fix for issue #149"
...
because it was broken again after commit 7ebba6abaa
2013-03-24 16:05:21 +01:00
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
c211b001d2
* Updated submodule data
2013-03-23 21:31:09 +01:00
krzys-h