Commit Graph

537 Commits (3b83a9e18693cdbfafb3fb964823daf08624f16f)

Author SHA1 Message Date
Jonathan G Rennison 3b83a9e186 Performance improvements to savegame loading 6 years ago
Jonathan G Rennison fa304cdb75 Merge branch 'master' into save_ext
# Conflicts:
#	src/saveload/saveload.cpp
6 years ago
Pavel Stupnikov fef8b831a9 Change: Switch town growth rate and counter to actual game ticks (#6763) 6 years ago
Jonathan G Rennison 4bcd05a620 Merge branch 'cpp-11' into save_ext
# Conflicts:
#	findversion.sh
6 years ago
Jonathan G Rennison c2ab4cb2ae Fix commit fb946f6a, which broke new game/map creation 6 years ago
Jonathan G Rennison fb946f6a2b Don't reset savegame feature versions at end of DoLoad, so that -q works 6 years ago
frosch 8c458c153d (svn r27990) -Update: Docs 6 years ago
Jonathan G Rennison 16c67ea484 Merge branch 'master' into enhanced_viewport_overlay
# Conflicts:
#	src/industry_cmd.cpp
#	src/saveload/saveload.cpp
#	src/stdafx.h
#	src/vehicle.cpp
6 years ago
frosch 59dd7be686 (svn r27978) -Fix [FS#6673] (r18541): Store the map variety setting in the samegame like the other mapgen settings, so restarting maps considers it. (Samu) 6 years ago
frosch 91bcc210cf (svn r27978) -Fix [FS#6673] (r18541): Store the map variety setting in the samegame like the other mapgen settings, so restarting maps considers it. (Samu) 6 years ago
Jonathan G Rennison cb9ffe1bd9 Move std::string str_validate to separate header
This is to fix compilation of squirrel on MacOS/clang, as squirrel
defines macros which clash with including <string>
7 years ago
Jonathan G Rennison dd0666c5f4 Add support for save/loading std::strings. 7 years ago
Jonathan G Rennison fae4ac1a5d Merge branch 'master' into save_ext
# Conflicts:
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
7 years ago
peter1138 ff26c6393e (svn r27793) -Fix [FS#6450]: Use of uninitialised variable cause lzo to fail. Add check for error status. 7 years ago
peter1138 57745b1c74 (svn r27793) -Fix [FS#6450]: Use of uninitialised variable cause lzo to fail. Add check for error status. 7 years ago
frosch ca3aaf8f6d (svn r27778) -Change [FS#6442-ish]: Convenience savegame bump to distinguish 1.7 savegames from 1.6 savegames. 7 years ago
frosch d3de080883 (svn r27778) -Change [FS#6442-ish]: Convenience savegame bump to distinguish 1.7 savegames from 1.6 savegames. 7 years ago
Jonathan G Rennison 56f173e15e Merge branch 'master' into save_ext 8 years ago
frosch 4342798ff5 (svn r27709) -Fix-ish: Silence some warnings. (adf88) 8 years ago
frosch d8a316d7c5 (svn r27709) -Fix-ish: Silence some warnings. (adf88) 8 years ago
Jonathan G Rennison dbd99707b6 Merge branch 'master' into save_ext 8 years ago
frosch 31f046bd9b (svn r27670) -Add: [FS#6471] Assign descriptive names to (GNU pthread) threads. (JGR) 8 years ago
frosch 3f75b8bca2 (svn r27670) -Add: [FS#6471] Assign descriptive names to (GNU pthread) threads. (JGR) 8 years ago
Jonathan G Rennison 94d3700f79 SaveLoad: Add support for saving/loading from a std::vector<T *> 8 years ago
Jonathan G Rennison c752da3a9e SaveLoad: Add support for saving/loading from a std::deque<T *> 8 years ago
Jonathan G Rennison a6e0b1ac7d Merge branch 'cpp-11' into save_ext 8 years ago
alberth 0adfb1ac6f (svn r27653) -Fix(r27647): Rename FileOperation enum and values to SaveLoadOperation to avoid nameclash with windows compiler toolkit. 8 years ago
alberth f286ba8db2 (svn r27653) -Fix(r27647): Rename FileOperation enum and values to SaveLoadOperation to avoid nameclash with windows compiler toolkit. 8 years ago
alberth 4001f6215e (svn r27652) -Fix(r27650): Use the file operation being performed to set the _sl.action variable. 8 years ago
alberth 0b8869930f (svn r27652) -Fix(r27650): Use the file operation being performed to set the _sl.action variable. 8 years ago
alberth 6f201ce4a8 (svn r27651) -Codechange: Introduce methods for setting the name and title of _file_to_saveload. 8 years ago
alberth e735bbebce (svn r27651) -Codechange: Introduce methods for setting the name and title of _file_to_saveload. 8 years ago
alberth 597380e099 (svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType. 8 years ago
alberth a959c0c965 (svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType. 8 years ago
alberth df9a9f074a (svn r27649) -Codechange: Introduce detailed file type enum, rebuild FiosType with it. 8 years ago
alberth c3bed437ee (svn r27649) -Codechange: Introduce detailed file type enum, rebuild FiosType with it. 8 years ago
alberth c6ac071619 (svn r27639) -Codechange: Also always set the abstract FileToSaveLoad::filetype when setting a mode. 8 years ago
alberth b6c29ae4eb (svn r27639) -Codechange: Also always set the abstract FileToSaveLoad::filetype when setting a mode. 8 years ago
alberth 2fa0fdb176 (svn r27638) -Codechange: Move FiosType enum, move and rename SetFiosType function. 8 years ago
alberth e78627f2f1 (svn r27638) -Codechange: Move FiosType enum, move and rename SetFiosType function. 8 years ago
alberth 9135f7130e (svn r27635) -Codechange: Move FileType and FileToSaveLoad structure definitions. 8 years ago
alberth a35e970ab0 (svn r27635) -Codechange: Move FileType and FileToSaveLoad structure definitions. 8 years ago
Jonathan G Rennison e6c7134935 Merge branch 'master' into save_ext
# Conflicts:
#	src/saveload/saveload.cpp
8 years ago
frosch 4d1843a95e (svn r27627) -Codechange: Deduplicate some cursor magic into SetMouseCursorBusy. 8 years ago
frosch 2337d169e8 (svn r27627) -Codechange: Deduplicate some cursor magic into SetMouseCursorBusy. 8 years ago
frosch 13a86497ea (svn r27572) -Fix [FS#6442]: Convenience savegame bump to distinguish 1.6 savegames from 1.5 savegames. 8 years ago
frosch 2de4652d09 (svn r27572) -Fix [FS#6442]: Convenience savegame bump to distinguish 1.6 savegames from 1.5 savegames. 8 years ago
frosch 0c7c0ada78 (svn r27518) -Update: Numbers 8 years ago
frosch fbd79d88f0 (svn r27518) -Update: Numbers 8 years ago
Jonathan G Rennison 1234bdb07c Fix compilation issue with MSVC due to ordering of noreturn and cdecl. 9 years ago