Jonathan G Rennison
ae15c96c1a
Merge branch 'master' into jgrpp
...
# Conflicts:
# docs/landscape.html
# docs/landscape_grid.html
# src/bridge_gui.cpp
# src/bridge_map.h
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/rail_map.h
# src/rail_type.h
# src/road_map.h
# src/saveload/afterload.cpp
# src/saveload/map_sl.cpp
# src/saveload/saveload.cpp
# src/script/api/script_rail.cpp
# src/station_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
2018-07-26 20:54:13 +01:00
Peter Nelson
bf8d7df736
Change: Extend rail types to 64 (6 bit storage)
2018-07-26 13:27:40 +01:00
Peter Nelson
5db883fbe9
Change: Move rail type bits from m3 to m8.
2018-07-26 13:27:40 +01:00
Jonathan G Rennison
3330e4cef8
Merge branch 'cargo_type_order' into jgrpp
...
# Conflicts:
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/track_func.h
2018-07-02 21:04:06 +01:00
Jonathan G Rennison
373ff3dd4e
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
# src/table/settings.h.preamble
2018-07-02 18:41:39 +01:00
PeterN
11ab3c4ea2
Change: Increase cargo type limit to 64.
2018-06-26 13:32:58 +01:00
Jonathan G Rennison
2c7b96cf1e
Merge branch 'save_ext' into jgrpp
2018-06-11 00:58:52 +01:00
Jonathan G Rennison
a3156804c5
Fix narrowing/type conversion warning on big endian platforms
2018-06-11 00:55:49 +01:00
Jonathan G Rennison
03b0931c57
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/debug.cpp
# src/saveload/saveload.cpp
2018-06-01 23:32:33 +01:00
Jonathan G Rennison
51e9cc6695
Log save/load chunk sizes at sl debug level 3
2018-06-01 23:24:30 +01:00
cirdan
c06c929771
Remove unused ChunkType flag CH_AUTO_LENGTH
...
CH_AUTO_LENGTH is no longer used anywhere, so remove all code
that depends on it.
(cherry picked from commit 9c620d9de5d45b78f7d992d6b3897009fe988d86)
(cherry picked from commit 4a19babf9e
2018-06-01 23:23:57 +01:00
Jonathan G Rennison
159909f4b1
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/saveload/saveload.cpp
2018-05-29 12:23:56 +01:00
Jonathan G Rennison
aae7806d5d
Move save/load ReadBuffer and MemoryDumper to separate header
...
Add static accessors
2018-05-29 00:21:39 +01:00
Jonathan G Rennison
bbec436a74
Change SlAutolength to only call proc once
2018-05-29 00:16:53 +01:00
innocenat
7c4bd7d3a3
Add variable std::vector save type
...
SL_VEC in the game currenty only support SlRefType, not VarType. This add another save type, SL_VARVEC, to support saving std::vector with POD type. It supports all integer type.
(cherry picked from commit 2895b1921d59554a5dd2
2018-05-29 00:16:53 +01:00
Jonathan G Rennison
c71ed22e7a
Save/memory dumper performance improvements
2018-05-29 00:16:53 +01:00
Jonathan G Rennison
3b83a9e186
Performance improvements to savegame loading
2018-05-29 00:16:53 +01:00
Jonathan G Rennison
fa304cdb75
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
2018-05-25 19:09:20 +01:00
Jonathan G Rennison
ad1c402ad8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/settings_type.h
# src/town_cmd.cpp
# src/window.cpp
2018-05-03 23:54:51 +01:00
Pavel Stupnikov
fef8b831a9
Change: Switch town growth rate and counter to actual game ticks ( #6763 )
2018-05-02 21:01:30 +02:00
Jonathan G Rennison
1fe0bb76b9
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
2018-04-27 02:42:20 +01:00
Jonathan G Rennison
4bcd05a620
Merge branch 'cpp-11' into save_ext
...
# Conflicts:
# findversion.sh
2018-04-27 01:33:39 +01:00
Jonathan G Rennison
70b6500d73
Merge branch 'save_ext' into jgrpp
2018-03-22 23:13:16 +00:00
Jonathan G Rennison
c2ab4cb2ae
Fix commit fb946f6a, which broke new game/map creation
2018-03-22 23:11:19 +00:00
Jonathan G Rennison
22724e13bc
Merge branch 'save_ext' into jgrpp
2018-03-20 01:15:21 +00:00
Jonathan G Rennison
fb946f6a2b
Don't reset savegame feature versions at end of DoLoad, so that -q works
2018-03-20 01:15:01 +00:00
frosch
8c458c153d
(svn r27990) -Update: Docs
2018-03-14 18:05:06 +00:00
Jonathan G Rennison
385a2552e9
Merge branch 'enhanced_viewport_overlay' into jgrpp
2018-03-11 22:21:39 +00:00
Jonathan G Rennison
864d94d2c5
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/industry_cmd.cpp
# src/vehicle.cpp
2018-03-11 22:16:19 +00:00
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
2018-03-11 22:10:21 +00:00
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)
2018-03-11 12:11:09 +00:00
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)
2018-03-11 12:11:09 +00:00
keldorkatarn
1d3cf59d8a
Allow building multiple docks per station.
...
(cherry picked from commit 0110c4a35d383e0be2cbb53cbe9cbe6784abb3e9)
# Conflicts:
# src/station_cmd.cpp
2017-09-20 19:11:48 +01:00
Jonathan G Rennison
2574e46df8
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/smallmap_gui.cpp
2017-09-04 01:04:04 +01:00
innocenat
59554a5dd2
Fix bug in new SL_VARVEC save/load code
2017-05-30 02:56:02 +07:00
innocenat
2895b1921d
Add variable std::vector save type
...
SL_VEC in the game currenty only support SlRefType, not VarType. This add another save type, SL_VARVEC, to support saving std::vector with POD type. It supports all integer type.
2017-05-29 19:08:15 +07:00
Jonathan G Rennison
d1a287d73c
Merge branch 'save_ext' into jgrpp
2017-04-11 18:42:11 +01:00
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>
2017-04-11 18:39:27 +01:00
Jonathan G Rennison
8317eac918
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/lang/german.txt
# src/lang/korean.txt
# src/lang/traditional_chinese.txt
# src/window.cpp
2017-04-01 01:14:28 +01:00
Jonathan G Rennison
dd0666c5f4
Add support for save/loading std::strings.
2017-03-29 19:41:06 +01:00
Jonathan G Rennison
b3fd11efd2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_anim_sse4.cpp
2017-03-19 12:27:24 +00:00
Jonathan G Rennison
fae4ac1a5d
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/company_sl.cpp
# src/saveload/saveload.cpp
2017-03-19 12:12:52 +00:00
peter1138
ff26c6393e
(svn r27793) -Fix [FS#6450]: Use of uninitialised variable cause lzo to fail. Add check for error status.
2017-03-13 22:16:44 +00:00
peter1138
57745b1c74
(svn r27793) -Fix [FS#6450]: Use of uninitialised variable cause lzo to fail. Add check for error status.
2017-03-13 22:16:44 +00:00
Jonathan G Rennison
ac69b746ab
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/gfxinit.cpp
# src/saveload/saveload.cpp
2017-03-12 20:37:26 +00:00
frosch
ca3aaf8f6d
(svn r27778) -Change [FS#6442-ish]: Convenience savegame bump to distinguish 1.7 savegames from 1.6 savegames.
2017-03-11 20:37:32 +00:00
frosch
d3de080883
(svn r27778) -Change [FS#6442-ish]: Convenience savegame bump to distinguish 1.7 savegames from 1.6 savegames.
2017-03-11 20:37:32 +00:00
Jonathan G Rennison
75410ddae4
Chunnel: Save/load changes
2017-03-04 12:39:32 +00:00
HackaLittleBit
f173b74e81
Chunnel patch 28398: Codechange: Save Tunnel Pool.
...
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
2017-03-04 11:53:48 +00:00
Jonathan G Rennison
5c7f36ef4b
Merge branch 'enhanced_viewport_overlay' into jgrpp
...
Further fixes for viewport lines/marker for multiplayer clients.
# Conflicts:
# src/lang/russian.txt
2016-12-26 15:38:56 +00:00
