Commit Graph

1413 Commits (be0f4c2ffec46f64414e92bebcf9f3b022fc7534)

Author SHA1 Message Date
krzys-h 73d6d94511 Auto-update from Pootle 2014-08-05
This commit was automatically generated from http://translations.colobot.info/
2014-08-05 04:33:13 +02:00
krzys-h a74f601ec1 Auto-update from Pootle 2014-07-29
This commit was automatically generated from http://translations.colobot.info/
2014-07-29 04:32:53 +02:00
krzys-h f2f9bd3c9e Auto-update from Pootle 2014-07-28
This commit was automatically generated from http://translations.colobot.info/
2014-07-28 04:32:47 +02:00
krzys-h 5860684e78 Auto-update from Pootle 2014-07-26
This commit was automatically generated from http://translations.colobot.info/
2014-07-26 04:33:05 +02:00
krzys-h d5859fc70e Auto-update from Pootle 2014-07-25
This commit was automatically generated from http://translations.colobot.info/
2014-07-25 04:32:56 +02:00
krzys-h 9a3cd67c3b Saving colobot.ini through physfs 2014-07-24 23:38:13 +02:00
krzys-h 17041e718b Added -mod commandline argument to add additional locations to physfs 2014-07-24 22:46:47 +02:00
krzys-h 7131abd385 Fixed SatCom image loading
Now LoadTexture/SetTexture functions require full path with "textures/" directory
2014-07-24 22:17:49 +02:00
krzys-h 86683c06ad Pootle broke stuff, I've fixed stuff 2014-07-24 11:44:51 +02:00
krzys-h f290b6c4e7 Auto-update from Pootle 2014-07-24
This commit was automatically generated from http://translations.colobot.info/
2014-07-24 04:32:39 +02:00
krzys-h 459f72fb58 Auto-update from Pootle 2014-07-23
This commit was automatically generated from http://translations.colobot.info/
2014-07-23 04:33:02 +02:00
krzys-h 7ad8925ac8 Merge pull request #311 from MohamedWaheed/dev
fixed issue #223 about disabling shadows/ground textures
2014-07-22 22:39:51 +02:00
krzys-h 20df3a91a2 Auto-update from Pootle 2014-07-20
This commit was automatically generated from http://translations.colobot.info/
2014-07-20 04:33:05 +02:00
krzys-h b03f15e0db Auto-update from Pootle 2014-07-17
This commit was automatically generated from http://translations.colobot.info/
2014-07-17 04:33:02 +02:00
krzys-h 6fd5caeee9 Auto-update from Pootle 2014-07-16
This commit was automatically generated from http://translations.colobot.info/
2014-07-16 04:33:09 +02:00
krzys-h 878d37a593 Auto-update from Pootle 2014-07-15
This commit was automatically generated from http://translations.colobot.info/
2014-07-15 04:33:12 +02:00
krzys-h 15f73d0cea Auto-update from Pootle 2014-07-13
This commit was automatically generated from http://translations.colobot.info/
2014-07-13 04:32:51 +02:00
Mohamed Waheed 117a5289ea fixed issue #223 about disabling shadows/ground textures 2014-07-12 19:37:34 +00:00
krzys-h 02ba358a89 Help file loading 2014-07-11 16:40:07 +02:00
krzys-h 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
krzys-h 8522232620 Auto-update from Pootle 2014-07-11
This commit was automatically generated from http://translations.colobot.info/
2014-07-11 11:25:57 +02:00
krzys-h 9ac578d5f2 Merge branch 'dev' of github.com:colobot/colobot into dev
Conflicts:
	po/de.po
	po/fr.po
	po/pl.po
	po/ru.po
2014-07-10 17:41:22 +02:00
krzys-h 9a6c06665c Removed some old stuff related to Ceebot-Teen 2014-07-10 17:39:45 +02:00
krzys-h d9b3c4b6a3 Auto-update from Pootle 2014-07-10
This commit was automatically generated from http://translations.colobot.info/
(actually, this is just a manual test commit with some Polish translations :p)
2014-07-10 17:26:03 +02:00
krzys-h 36e5019210 Initial Pootle<->Git integration commit
This commit was automatically generated from http://translations.colobot.info/
2014-07-10 17:17:23 +02:00
krzys-h 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
krzys-h 5223ef1fb1 Fixed mission description loading 2014-07-10 16:36:00 +02:00
krzys-h 106ec014b8 Fixed texture and script loading 2014-07-10 16:25:40 +02:00
krzys-h 7b04f67358 Fixed music loading 2014-07-10 15:38:37 +02:00
krzys-h 1ee0c0e8fe Fixed level list 2014-07-10 15:27:43 +02:00
Piotr Dziwinski 4c7ff90dcc Updated data submodule 2014-07-09 00:28:05 +02:00
krzys-h c5abf18a57 Post-release 0.1.3-alpha 2014-07-01 21:05:06 +02:00
krzys-h d9fee8b2ad Release 0.1.3-alpha 2014-07-01 12:16:32 +02:00
Krzysztof Dermont aa190bb59b Last changes 2014-06-30 17:40:40 +02:00
krzys-h 1835d2ae58 Removed old code based on #ifs (issue #55) 2014-06-27 19:52:09 +02:00
Krzysztof Dermont 400bcd60fe Updated submodule 2014-06-26 23:38:15 +02:00
Piotr Dziwinski 0fbc05b96c Fix test compilation 2014-06-26 22:36:57 +02:00
krzys-h 092e7cc68d Fixed tests 2014-06-26 22:14:30 +02:00
krzys-h fd8ea13cbb Fixed not destroying CGameData
This also fixed failing assertion in tests
2014-06-26 21:38:02 +02:00
krzys-h bc3b7ef283 Fixed negative parameter in fire() (issue #305)
Also fixed checking parameter count and type for ants, spiders and shooters
2014-06-26 21:06:53 +02:00
krzys-h 2b9abf2a48 Fixed CMake git branch detection with build dir outside of repository working dir 2014-06-25 22:49:16 +02:00
Piotr Dziwinski 76d01b44f7 Fix test compilation 2014-06-24 19:51:48 +02:00
Piotr Dziwiński ae13e0a621 Merge pull request #304 from MohamedWaheed/dev
Savefile screenshot implementation and screenshot loading bug fix
2014-06-24 19:42:25 +02:00
Mohamed Waheed f5ba2a27d4 fixed savefile screenshot loading bug 2014-06-24 20:31:17 +03:00
Mohamed Waheed b7125a5b24 formatting and enhancements for savefile screenshot feature 2014-06-24 20:27:31 +03:00
Piotr Dziwinski 52cf9e2815 Fix test compilation 2014-06-24 17:38:28 +02:00
Mohamed Waheed 613e1d74c4 implemented savefile screenshot feature 2014-06-24 01:35:05 +03:00
Krzysztof Dermont 68d41d3b21 More work on streams 2014-06-23 23:19:55 +02:00
Krzysztof Dermont 3aca1de731 More work on levels 2014-06-22 21:30:23 +02:00
Krzysztof Dermont 0556b5dfbc Added Exist() to resource manager, updated model 2014-06-22 16:29:26 +02:00