Commit Graph

277 Commits (7099929783a41683b76204b98c0eae5a79abf143)

Author SHA1 Message Date
krzys-h 57478f17b8 Added script4Runnable=false in exercises, closes colobot/colobot#493 2015-07-09 23:08:39 +02:00
Piotr Dziwinski c1da1d3ca6 Fix nan normal values 2015-07-09 21:35:36 +02:00
Piotr Dziwinski a431d46202 Removed LOD levels from models 2015-07-09 21:35:36 +02:00
krzys-h 73bb8f9ac0 Don't download music files if they are already available in the source directory 2015-07-09 13:56:59 +02:00
krzys_h 4e03b3c435 Update music/README.md 2015-07-09 13:14:16 +02:00
krzys-h aef8b84c77 Moved music files to an external HTTP server (colobot/colobot#362) 2015-07-09 13:01:03 +02:00
Piotr Dziwinski 7696ffe209 Revert "Added GLSL 3.3 shaders"
This reverts commit b74f0fa7e5.

Shaders are moved now to main repository.
2015-05-20 23:29:06 +02:00
Tomasz Kapuściński b74f0fa7e5 Added GLSL 3.3 shaders 2015-05-19 14:25:36 +02:00
Piotr Dziwinski 2cbfc1baf2 Merge branch 'dev-import-german-files' into dev 2015-05-17 10:33:09 +02:00
Piotr Dziwinski 0cfb8d1e08 Imported German translations in level files 2015-05-17 10:31:58 +02:00
Piotr Dziwinski 97124a3250 Added German translations in help/object 2015-05-15 18:46:14 +02:00
Piotr Dziwinski b6438d401d Added German translations in help/generic 2015-05-14 23:44:56 +02:00
Piotr Dziwinski 5c0d12bfed Fix some English version typos 2015-05-14 23:08:03 +02:00
Piotr Dziwinski d098b629f4 Added German translations in help/cbot 2015-05-14 22:38:15 +02:00
Piotr Dziwinski a198ae83fb Added German translation in help/bots 2015-05-14 17:51:52 +02:00
Piotr Dziwinski f86c10bbd4 Fix for older CMake versions 2015-05-12 22:05:58 +02:00
Piotr Dziwinski 68fd619311 Require Python 2.7, not 2.6 2015-05-12 21:50:49 +02:00
Piotr Dziwinski f11f9c7bc7 Merge branch 'dev-i18n-python' into dev 2015-05-12 21:29:00 +02:00
Piotr Dziwinski b406e50a47 Update README 2015-05-12 21:28:25 +02:00
Piotr Dziwinski 33a308cc3d Fix line endings on Windows 2015-05-12 21:04:41 +02:00
Piotr Dziwinski 023d53b986 Fix mixed path separators on Windows 2015-05-12 21:04:41 +02:00
Piotr Dziwinski 802d2e31e7 Regenerated po files 2015-05-12 21:04:41 +02:00
Piotr Dziwinski 9c253a3510 New data file translation infrastructure using Python
* replaced po4a and bash scripts with Python scripts using polib
 * cleaned up CMake files
2015-05-12 21:04:41 +02:00
Cezary Parkowski 54a3a41d7d Updated splashscreens for 0.1.5 release and optimized compresion in some textures 2015-05-11 18:27:32 +02:00
krzys_h 85baaaf19d Merge pull request #21 from tomangelo2/dev
Replaced track= to filename=, fixing issue #463
2015-04-22 20:59:35 +02:00
tomangelo2 e4c83e0c03 Replaced track= to filename=, fixing issue #463 2015-04-22 01:26:44 +02:00
krzys-h 3195fa5d55 Updated .po/.pot files after d5ff8d51a3 2015-04-06 16:07:07 +02:00
krzys-h d5ff8d51a3 Removed mission file versioning 2015-03-29 21:18:56 +02:00
immibis cb904d403d Fixed a typo in a CBot help file. 2014-12-28 13:53:24 +13:00
krzys_h f2b8c3a66f Merge pull request #19 from VictorDenisov/dev
Change order of arguments of po4a
2014-12-26 23:54:11 +01:00
Victor Denisov c68c3b6574 Change order of arguments of po4a
po4a doesn't work on ubuntu 12.04 and ubuntu 14.04 because of incorrect
order of arduments. Config file should be the last argument.
2014-12-26 14:34:21 -08:00
krzys-h b29aa97512 Updated Polish translation, marked everything else as fuzzy 2014-11-13 17:31:00 +01:00
krzys-h aa973231fc Merge branch 'gergelypolonkai-dev' into dev 2014-11-13 17:25:58 +01:00
Gergely Polonkai c8b93bf8f9 Fix description of Spiders 2 level
I don’t speak Polish, but it seems to me that it will break the Polish
translation (or doesn’t mrówek mean ants?).
2014-11-13 00:53:57 +01:00
krzys-h 1aa40099ac Removed unused textures, closes colobot/colobot#328 2014-11-11 16:17:01 +01:00
krzys-h 44c56d29ee Moved object textures to objects/ subdirectory, closes colobot/colobot#381 2014-11-11 15:51:20 +01:00
krzys-h 2eaf58e772 Site -> Spot
Closes colobot#375
2014-11-10 23:04:26 +01:00
krzys-h a801c729b3 Removed unused dirty textures 2014-11-10 20:20:34 +01:00
krzys-h aadeb651f9 Long options for charset in po4a
Might fix Travis builds, see colobot#364
2014-11-09 19:43:43 +01:00
krzys-h c9be86fd0b Fixed music installation 2014-11-09 19:16:44 +01:00
krzys-h c5926eaa42 Merge branch 'dev'
Conflicts:
	CMakeLists.txt
2014-11-02 13:13:14 +01:00
CoLoRaptor 212fd6b769 Removed some unused textures 2014-11-01 16:42:22 +01:00
krzys-h 617140ad6b Updated charset in .pot files 2014-11-01 15:09:36 +01:00
krzys-h b2772daee8 Updated translation scripts to use UTF-8 2014-11-01 15:09:21 +01:00
CoLoRaptor b52c062814 Updated ending splashscreen 2014-11-01 14:48:16 +01:00
Cezary Parkowski 5ed219127d Duplicate of textures/interface/intro3.png 2014-11-01 12:49:55 +01:00
Piotr Dziwinski 2660c69a52 Fix sed commands (#349) 2014-10-28 18:28:09 +01:00
Piotr Dziwinski 715574da9a Updated music submodule 2014-10-28 17:46:07 +01:00
Piotr Dziwinski 92f48819cc Use only POSIX sed expressions 2014-10-28 17:43:46 +01:00
CoLoRaptor 7450b025e3 Changed splashscreen images in textures/interface to destroy old PPC splashscreen 2014-10-28 10:37:31 +01:00