Commit Graph

1217 Commits (ab5c1271c01095db4a15156f425893c5707ad579)

Author SHA1 Message Date
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
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
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 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