Commit Graph

1563 Commits (b86598366e08ac140f6bfc14dd6c762521ecb8cf)

Author SHA1 Message Date
krzys-h 63b6aa56b0 Fixed crash when colobot.ini doesn't exist 2014-10-15 21:28:40 +02:00
krzys-h 47ea8a1175 Updated some more license headers 2014-10-15 21:16:06 +02:00
krzys-h f65b00089a Merge branch 'dev' into dev-physfs
Conflicts:
	data
2014-10-14 15:42:19 +02:00
krzys-h 9fd6cf5449 Changed all occurences of PPC in the code to TerranovaTeam 2014-10-14 15:26:18 +02:00
krzys-h ca18d01630 Updated license from PPC to TerranovaTeam
Polish Portal of Colobot (PPC) changed name to International Colobot Community (ICC).
The part of the community actively working on the game is known as TerranovaTeam.
2014-10-14 15:26:01 +02:00
Piotr Dziwinski 343504168f Clean up translations
* translate only marked strings from restext.cpp
 * update and clean pot and po files
 * remove redundant POT-Creation-Data
2014-10-09 00:32:58 +02:00
Piotr Dziwinski eab300c3a0 Updated data submodule 2014-10-07 23:52:24 +02:00
Piotr Dziwinski 342210b062 GCC 4.6 compilation fixes 2014-10-07 23:25:37 +02:00
krzys-h 72b4228abe Fixed CBot debugger (#325) 2014-10-07 22:28:32 +02:00
Piotr Dziwinski 12feb49098 Fixes in unit tests 2014-10-07 22:22:59 +02:00
Piotr Dziwinski 502f7a8a5f Add physfs to travis config 2014-10-07 22:16:07 +02:00
Piotr Dziwinski 5274acd624 Merge with dev 2014-10-07 22:15:40 +02:00
krzys-h 2770ee8927 Fixed issue #324 2014-10-07 21:40:51 +02:00
krzys-h 3ef2f976df Added %chap% for current chapter directory 2014-09-29 21:53:21 +02:00
krzys-h c2b8787453 On development builds store savegame data in current directory 2014-09-29 21:39:21 +02:00
krzys-h f569b46a81 Updated data submodule 2014-09-29 21:32:59 +02:00
krzys-h f2c6b322dd Replaced std::to_string with boost::lexical_cast<std::string>
MXE has problems with std::to_string
2014-09-28 19:25:28 +02:00
krzys-h ab5c1271c0 Updated data submodule 2014-09-27 18:59:33 +02:00
krzys-h ad79babbc1 Made proxyDistance optional 2014-09-27 18:34:08 +02:00
krzys-h fd68ac923a Updated level check script 2014-09-27 18:27:45 +02:00
krzys-h b3fa72c007 Moved effect??.png textures and made pos= in GroundSpot optional 2014-09-27 18:26:29 +02:00
krzys-h 32504be8a9 Fixed TerrainLevel bug 2014-09-27 17:46:52 +02:00
krzys-h 8fab044bcd Removed more unused variables 2014-09-27 17:16:58 +02:00
krzys-h c29ef4ec41 Fixed some warnings
Removed unused variables and fixed signed/unsigned comparation warnings
2014-09-27 16:49:00 +02:00
krzys-h d3eaf2e1ce Merge branch 'dev-physfs' into dev-physfs-levels 2014-09-26 21:05:55 +02:00
krzys-h 71f84d1e16 Fixed human.png texture 2014-09-26 21:02:54 +02:00
krzys-h de375548ad Userlevel listing 2014-09-26 20:53:11 +02:00
krzys-h 3b1cfdbfb4 Don't use physfs in saving code for now
This requires too much refactoring and we want to release 0.1.5 soon.
We'll need to rewrite saving/loading code to fully implement new level parser anyway.
2014-09-26 19:50:27 +02:00
krzys-h 740036e430 New level parser
Known issues:
* TerrainLevel for some reason doesn't work
* %lvl% is not yet implemented everywhere because of hardcoded directories in functions
2014-09-24 22:56:19 +02:00
Piotr Dziwinski 9f2d544b27 Fix zenity version checking problems 2014-09-21 21:28:59 +02:00
Piotr Dziwinski d3a4d75c23 Updated data submodule 2014-09-21 13:01:56 +02:00
Piotr Dziwinski 8433feb8bb Update .gitignore files 2014-09-21 12:29:06 +02:00
Piotr Dziwinski 2b86e6e9d9 Rewrite CMainDialog to use physfs 2014-09-21 12:29:06 +02:00
Piotr Dziwinski 6a1ceba8c0 Some cleaning up 2014-09-21 12:29:06 +02:00
krzys-h f0b38721e0 Loading all mods found in "mods" directory 2014-09-21 12:29:01 +02:00
koocotte 7557b888bc Add missing dependency "gettext" for Ubuntu
Conflicts:
	INSTALL.md
2014-09-02 23:15:56 +02:00
MrSimbax 80bb585778 Add po4a to the command installing dependencies
There is an one-line command in the INSTALL.md for Ubuntu/Debian users which
installs all dependencies. po4a was listed above it, but it wasn't in the command itself.
2014-08-24 20:56:12 +02:00
Piotr Dziwinski e4d52d9afb CProfile refactoring 2014-08-12 21:24:33 +02:00
Piotr Dziwinski 74312b0405 Better CMake organization and unit test cleanups
* created a static library containing most source modules
  to avoid compiling source modules twice in code and unit tests
* moved profile_test to main unit tests executable
* removed image_test and edit_test as not really useful
2014-08-12 20:58:55 +02:00
Piotr Dziwinski 4bdfa0aa4e Remove unused accessors from CDevice 2014-08-12 18:18:30 +02:00
Piotr Dziwinski 360b72ac5a Fix task stopping checks in CBrain
This possibly fixes some issues resulting from improperly
stopping tasks (CTask::Abort() not called before deleting the task).
Found while looking for instances of #318.
2014-08-10 18:00:40 +02:00
Piotr Dziwinski 9de086390b Remove some more delete checks (#318) 2014-08-10 17:51:47 +02:00
Piotr Dziwinski ac019c263d Remove unnecessary delete checks (#318) 2014-08-09 22:45:07 +02:00
krzys-h ea0615ee05 Fixed #315 2014-08-08 14:03:43 +02:00
krzys-h 17fe2b3d61 Updated submodule 2014-08-08 13:41:31 +02:00
krzys-h b0dbfa3d15 Auto-update from Pootle 2014-08-08
This commit was automatically generated from http://translations.colobot.info/
2014-08-08 04:32:46 +02:00
krzys-h 78f69f6166 Auto-update from Pootle 2014-08-07
This commit was automatically generated from http://translations.colobot.info/
2014-08-07 04:32:58 +02:00
krzys-h 4a202a086f Fixed #314 2014-08-06 17:18:52 +02:00
krzys-h a56e69883f Removed some unused code 2014-08-06 16:58:36 +02:00
krzys-h 0b2f25a6e3 Restored -datadir and -langdir arguments, added -savedir
Also, fixed some crashes when unable to open file
2014-08-06 12:27:17 +02:00