Commit Graph

1149 Commits (9c20f275a015536e95446162a4509191809b5fe7)

Author SHA1 Message Date
krzys-h 490e6fe2d6 Always show CBot documentation in SatCom, fixes #382 2014-11-11 17:22:21 +01:00
krzys-h a50da4f5de Loading texturesfrom objects/ subdirectory
Closes #381
2014-11-11 15:52:08 +01:00
krzys-h fa4c70d1fe Resetting fields in scene to defaults
Fixes #218
2014-11-11 15:38:11 +01:00
krzys-h dbdaecd1e8 Fixed texture recoloring reset
Partially fixes #218
2014-11-11 15:32:38 +01:00
krzys-h 48ca5b5663 Removed info about CD in background music tooltip; removed unused 3D sound translation 2014-11-11 14:59:56 +01:00
krzys-h fa2bd7901a Translations for autosave 2014-11-11 14:56:19 +01:00
krzys-h a1fe9c8d7f Implemented autosave (#292) 2014-11-11 14:50:44 +01:00
krzys-h b8103963c3 Sorting saved games list (#380) 2014-11-11 12:08:19 +01:00
krzys-h afa0061364 Reset save filename if exception is thrown while loading 2014-11-10 22:50:00 +01:00
krzys-h 5cd45fbe17 Fixed saving aParamString in CAutoEgg 2014-11-10 22:45:06 +01:00
krzys-h abcbaa1902 Fixed running programs with long names (#379) 2014-11-10 22:42:05 +01:00
krzys-h 462f0ce9d7 Removed unused PHYSFS conversions 2014-11-10 22:19:52 +01:00
krzys-h 76ca4fc6ae Fixed isnan() on MXE 2014-11-10 22:17:41 +01:00
krzys-h 97e76e6303 Better handling of filenames longer than maximum allowed
#354
2014-11-10 22:07:51 +01:00
krzys-h b698c40abf Fixed saving Shielder's shield (#365) 2014-11-10 21:26:02 +01:00
krzys-h ef35a3a2ef Custom path to SecondTexture, closes #370 2014-11-10 20:46:39 +01:00
krzys-h 643d1ec46a Fixed scenetest mode 2014-11-10 20:23:18 +01:00
krzys-h fca746fdb4 Merge branch 'dev-physfs-save' into dev 2014-11-10 19:39:56 +01:00
krzys-h a952e0ec54 Fixed DefenseTower empty cell detection (#378) 2014-11-10 19:38:49 +01:00
krzys-h 759b9871bb Removed CMainDialog::GetPHYSFSSavegameDir()
CMainDialog is also finished.
This is last commit for saving with PHYSFS, closes issue #334
2014-11-10 19:26:36 +01:00
krzys-h aeaea87d0d Saving/loading list of finished missions via PHYSFS 2014-11-10 19:23:51 +01:00
krzys-h fc5fcc7e61 Loading/saving apperance via PHYSFS 2014-11-10 19:02:43 +01:00
krzys-h 4994965201 Removed CRobotMain::GetPHYSFSSavegameDir()
Everything in CRobotMain uses PHYSFS now
2014-11-10 19:02:07 +01:00
krzys-h 025419324b Research saving (for free game) in PHYSFS 2014-11-10 18:49:00 +01:00
krzys-h 169e860240 Removed PHYSFS hacks from Load/SaveFileScript as they are no longer necessary 2014-11-10 18:36:16 +01:00
krzys-h ebf92e98c9 Removed CBOT_STACK switch
It was just making it harder to look for cause of #119
2014-11-10 18:22:48 +01:00
krzys-h c330bcac6d PHYSFS in CStudio 2014-11-10 18:17:13 +01:00
krzys-h c861e67cc0 Fixed proxyDistance saving 2014-11-10 17:50:50 +01:00
krzys-h 5bb740696f Fixed screenshot saving 2014-11-10 17:50:36 +01:00
krzys-h fc16c36a45 Use PHYSFS in listing save files
Revert "Don't use physfs in saving code for now"

This reverts commit 3b1cfdbfb4.

Conflicts:
	src/ui/maindialog.cpp
2014-11-10 17:37:34 +01:00
krzys-h 8c84f012c6 Level state loading via CLevelParser 2014-11-10 17:15:34 +01:00
krzys-h 3dade17f89 Level saving through CLevelParser 2014-11-10 14:27:42 +01:00
krzys-h 1477e72ab4 Saving code for CLevelParser 2014-11-10 12:05:57 +01:00
krzys-h 1ae66d39f3 Don't require user to launch the SpaceShip before ending the mission, if it has selectable=0
Closes #376
2014-11-09 19:26:36 +01:00
krzys-h bfdc577547 Removed m_checkEndTime
It was disabled some time ago
2014-11-09 19:19:14 +01:00
krzys-h 894d4173f6 Activate console by "~", closes #366 2014-11-09 18:58:13 +01:00
CoLoRaptor 81a02220ee Depth of field to Render distance in EN & PL translations, close issue #369 2014-11-05 23:01:33 +01:00
Didier Raboud c1043837a5 Allow PHYSFS to follow symlinks, fixes the launch on Debian systems which fonts' are symlinks to the system fonts 2014-11-02 17:18:53 +01:00
krzys-h 6d152d5aee Fixed console spam when music files are not installed
Closes #359
2014-11-02 13:35:00 +01:00
MrSimbax 3ffc08a7f9 Fixed amount of fireball damage done to allies, close issue #356
In the original game the whole series did damage 0.02 (0.10 * 0.2) to human. In Gold, one particle do such damage, so 51 particles do 51 * 0.02 = 1.02 damage to human! I changed the multiplier for allies from 0.2 to 0.004 (approx. 0.2 / 51), but this problem probably occured somewhere else during rewriting the engine from DirectX to OpenGL and SDL.
2014-11-02 13:34:59 +01:00
krzys-h ccdbce8cd7 Fixed icon on Windows; updated properties in .rc file 2014-11-01 19:57:23 +01:00
krzys-h 750f0f0810 COLOBOT: Gold Edition -> Colobot: Gold Edition 2014-11-01 19:46:06 +01:00
krzys-h 11a8742079 #335, #348, #352
I don't know what I'm doing anymore :/
I should set up dev envrioment on Windows so I don't have to commit every time I want somebody on Windows to test if my changes work
2014-11-01 14:02:39 +01:00
krzys-h 25d5d105fd Fallback to English files if translated ones are not available 2014-10-31 21:23:10 +01:00
krzys-h d0a2d66270 Removed duplicate license header 2014-10-31 21:10:55 +01:00
krzys-h 501cd7026b Fixed m_exitAfterMission 2014-10-31 20:49:40 +01:00
krzys-h 71577b7b0a Fixed #335 and #348 2014-10-31 20:40:19 +01:00
krzys-h f8841f96f2 Added -headless
For automated stuff on devices without GPU
2014-10-31 20:40:13 +01:00
krzys-h 487e43ff4e Changing resolution from commandline
Conflicts:
	src/app/app.cpp
2014-10-31 20:40:09 +01:00
krzys-h d0383ae09b -runscene for userlevels
You need to know which ID is assigned to te userlevel category (by order in "User" menu)
-runscene custom101 = first userlevel from first chapter
2014-10-31 15:32:24 +01:00
krzys-h 601ea0ec87 Increased mission end accuracy
It whould now detect mission end immediately. We need somebody with an older computer than mine to make sure it doesn't cause FPS drop.
2014-10-30 22:26:14 +01:00
krzys-h c1f931c8ee Added some debug stuff, possible fix for #348 and #335 2014-10-30 22:18:33 +01:00
krzys-h 066344dde3 Fixed screenshoot loading again
issue #335
2014-10-29 21:15:45 +01:00
krzys-h d6d08797ca I forgot to remove some debug stuff 2014-10-29 21:13:12 +01:00
krzys-h f68e7df8d6 Fixed program saving (#352) 2014-10-29 21:06:59 +01:00
krzys-h 6d2fd18b41 Implemented mission timer 2014-10-29 17:53:46 +01:00
krzys-h 61e06149c6 Fixed position updating 2014-10-29 16:08:55 +01:00
krzys-h d91569e165 Showing coordinates in stats menu (F12/showstat); removed "showpos" cheat
Issue #277

Conflicts:
	src/object/cheat.cpp
	src/object/robotmain.cpp
	src/object/robotmain.h
2014-10-29 16:08:55 +01:00
CoLoRaptor ca3a1cb02b Changed splashscreens filenames in maindialog.cpp 2014-10-28 10:37:05 +01:00
krzys-h f679b5c84c Sorry, I didn't mean to remove that 2014-10-27 22:09:57 +01:00
krzys-h d75efcc5b2 Fixed problems with loading save screenshots (issue #335) 2014-10-27 22:08:49 +01:00
krzys-h 11854dc89e Fixed script saving (issue #348) 2014-10-27 21:49:03 +01:00
krzys-h d6e88a07b0 Support for %lvl% in TerrainInitTextures + cleanup
cleanup:
* Removed CProfile::SetUserPath (unused)
* Removed CProfile::GetUserBasedPath (unused)
* Removed CProfile::CopyFileToTemp (i have no idea why it even existed)
* Removed CopyFileListToTemp (it did the same as CopyFileToTemp but for multiple files, wasn't even fully implemented)
2014-10-27 21:15:14 +01:00
Tomasz Kapuściński 990ecf7290 Corrected clamping mode in textures 2014-10-26 22:24:12 +01:00
krzys-h 569dd8ed25 Fixed regex in CResourceManager::CleanPath 2014-10-26 20:43:51 +01:00
krzys-h ca4f1e85d2 Support for %lvl% in all commands
Except for TerrainInitTextures (I'm not sure what it does but it does something weird)
2014-10-26 18:35:13 +01:00
krzys-h 475f222276 Fixed "Device" tab opening if it was opened in main menu earlier 2014-10-25 19:11:24 +02:00
krzys-h 0d873ad43a Added warning about restarting game in order to apply changes
issue #339
2014-10-25 18:43:02 +02:00
krzys-h 26376c652d Nothing else works, so restart the game on resolution change
Fixes #339 for now, but we'll need alternative solution later
2014-10-25 18:34:29 +02:00
krzys-h c9eb3ce5c5 Another possible (and more likely correct) fix for #339 2014-10-25 18:17:03 +02:00
krzys-h 9d68868f8e Possible fix for #339 (?) 2014-10-25 18:00:39 +02:00
krzys-h fdbc4080c7 But do 182d5206a8 only on Windows, since it works correctly on Linux 2014-10-25 17:28:30 +02:00
krzys-h 182d5206a8 Disable resolution settings in simulation 2014-10-25 17:23:09 +02:00
krzys-h c12ebb1c7b Fixed NewScript (#341) 2014-10-25 17:17:59 +02:00
krzys-h ef1edba307 Fixed #340 again 2014-10-25 17:09:14 +02:00
krzys-h 81062e5e87 Fixed linking convert_model (#332) 2014-10-25 12:44:52 +02:00
krzys-h 78d7cc9eef Change userlevels button text via text file 2014-10-25 12:21:13 +02:00
krzys-h db7ab65354 Fixed #344 2014-10-25 12:10:29 +02:00
krzys-h 7d28b9a6da Fixed #340 2014-10-25 12:01:21 +02:00
krzys-h 4c865322f0 Fixed #341 2014-10-25 11:30:38 +02:00
Tomasz Kapuściński 1aebe8af03 Added support for VBO in OpenGL older than 1.5 if ARB extension is present 2014-10-24 00:29:26 +02:00
krzys-h 2d043d46bb Merge branch 'vieux-blood_mode' into dev
Conflicts:
	src/common/restext.cpp
	src/ui/maindialog.cpp
2014-10-22 17:52:17 +02:00
Victor Vieux d019a4990f add option to disable blood 2014-10-21 21:44:17 -07:00
Tomasz Kapuściński d3a722a0c5 Improved VBO support detection 2014-10-22 00:53:35 +02:00
CoLoRaptor 1ab5746ca7 Disabled active window resizing that crashes in some software/hardware configurations 2014-10-21 22:22:32 +02:00
krzys-h 97b7c0cab1 Fixed map turning gray after resizing window 2014-10-20 21:54:52 +02:00
krzys-h c0ac60e4fa Fixed save directories in things not yet refactored to use PHYSFS 2014-10-20 21:15:39 +02:00
krzys-h cf7be276dc Possibly fixed goto() by changing safety margin
TODO: More testing

Closes #326
2014-10-20 20:48:03 +02:00
krzys-h 0245fdc6c3 Merge branch 'dev-physfs' into dev
Conflicts:
	src/app/app.cpp
2014-10-19 16:18:36 +02:00
krzys-h d7ef0a1a5f Implemented "Apply changes" button (issue #141) 2014-10-19 15:45:59 +02:00
krzys-h c001c46cb5 Small fix to 72b4228abe 2014-10-19 15:27:00 +02:00
krzys-h 9ea0b37408 Possible fix for #331 2014-10-19 14:21:55 +02:00
krzys-h 0fb1cb11d4 Changed max and default font size
Min font size is 9, max is now 24 (previously 21)
Default size is now 19 (previously 9)

Closes #330
2014-10-19 13:33:19 +02:00
krzys-h 83abb8ca8e Fixed program saving 2014-10-19 13:18:31 +02:00
krzys-h 7af92cc4ce Added portable build flag 2014-10-18 20:00:30 +02:00
krzys-h b85a41b42a Also fixed the same thing in file writing code 2014-10-15 21:31:43 +02:00
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