e21ade375e
Codechange: Change from numeric to descriptive SLV enum labels for last entries.
6 years ago
0f37a683a2
Codechange: Additional type safety for saveload version variables.
6 years ago
9de12521ec
Codechange: Convert saveload numbers to enum values.
...
(This was mostly achieved with a few in-place regexes)
6 years ago
ea4ea62816
Codechange: Make saveload version upper bound exclusive, i.e. version object was removed instead of version object last appeared.
6 years ago
ddf31702a2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/group_gui.cpp
# src/lang/english.txt
# src/saveload/saveload.cpp
# src/widgets/group_widget.h
6 years ago
c41463b259
Merge branch 'save_ext' into jgrpp
6 years ago
02e2627765
Extend documentation in extended_ver_sl.cpp
...
Correct typo
6 years ago
5f0258b0c5
Fix minor formatting issue in SlXvIsChunkDiscardable
6 years ago
23960d0f2c
Feature: Group liveries, and livery window usability enhancements. ( #7108 )
...
* Change: Replace checkbox in livery selection window with Default option in drop down selection.
This reduces clutter in the UI and allows for primary/secondary colours to independently follow the default scheme if desired.
* Feature: Add vehicle group liveries.
6 years ago
255b6adfc9
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/vehicle_cmd.cpp
6 years ago
67633606b0
Codechange: Remove value mangling and field misuse in SLE_WRITEBYTE.
...
The original translation functionality hasn't been used since 2007.
6 years ago
281d346fe2
Merge branch 'master' into jgrpp
...
# Conflicts:
# bin/baseset/no_sound.obs
# bin/baseset/orig_dos.obg
# bin/baseset/orig_dos.obs
# bin/baseset/orig_dos_de.obg
# bin/baseset/orig_win.obg
# bin/baseset/orig_win.obm
# bin/baseset/orig_win.obs
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.cpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.cpp
# src/blitter/8bpp_base.hpp
# src/blitter/common.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.cpp
# src/saveload/saveload.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/viewport_func.h
6 years ago
e5b61e0b6c
Refactor CallVehicleTicks vehicle loop
6 years ago
225790892d
Change: Make ships stop and change direction slowly instead of instantly turning.
6 years ago
094160ede3
Merge remote-tracking branch 'damfr/save-unique-id' into jgrpp
...
# Conflicts:
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
6 years ago
8e832afb65
Merge branch 'save_ext' into jgrpp
6 years ago
d3cef7284a
Fix missing case in SlCalcObjMemberLength
...
Fixes 80d6f6c622
6 years ago
191afd93c1
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/settings.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/vehicle_base.h
# src/widgets/dropdown.cpp
6 years ago
80d6f6c622
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
# src/saveload/saveload.h
6 years ago
81330b8d6e
Change: Add path cache for ships.
6 years ago
1c725fce47
Change: Add ability to save/load std::deque<> containers.
6 years ago
e15601e12f
Cache whether a train may have a depot or bridge speed restriction
6 years ago
0bb9207f4d
Index OrderList contents in a flat vector
6 years ago
d87ac8ec7e
Improve performance of train breakdown detection
6 years ago
0e7519f33e
Merge branch 'more_cond_orders-sx' into jgrpp
...
# Conflicts:
# config.lib
# projects/openttd_vs100.vcxproj
# projects/openttd_vs100.vcxproj.filters
# projects/openttd_vs80.vcproj
# projects/openttd_vs90.vcproj
# src/order_gui.cpp
# src/order_type.h
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
6 years ago
635c7ca2d5
Merge branch 'save_ext' into more_cond_orders-sx
...
# Conflicts:
# src/lang/english.txt
# src/order_type.h
6 years ago
0dba091d79
Merge branch 'cpp-11' into save_ext
...
# Conflicts:
# config.lib
# src/saveload/saveload.cpp
6 years ago
65b9a103ad
Initial implementation of two rail types per tile
6 years ago
cd41683b9b
Add tracerestrict feature reverse behind signal
6 years ago
a315d39067
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
# src/tracerestrict.h
6 years ago
cae0b21534
Trace restrict: Bump size of item type field
...
Reserve value for TRIT_REVERSE
6 years ago
5f6858c379
Add: Setting to save a unique id for each savegame
6 years ago
46b1ea81e4
Add company rate limit for land area purchasing
6 years ago
e735c1a51a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/aircraft_cmd.cpp
# src/autoreplace_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/script_station.hpp
# src/track_func.h
# src/vehicle_base.h
6 years ago
83a063f51c
Add train is in slot conditional order
6 years ago
e66cec8f86
Add: NewGRF support for 16-in-16-out industries
6 years ago
8859381d30
Add: Industries can produce and accept up to 16 different cargoes
6 years ago
e0c0394e37
Fix: Remove various dead or unnecessary assignments
6 years ago
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
0e3986c39c
Extend timetable wait/travel times from 16 to 32 bits wide
6 years ago
ee00a28717
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
6 years ago
c4f5c8e789
TBTR: Add option to replace only old vehicles
6 years ago
6bcc705c7c
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/saveload/saveload.cpp
6 years ago
4b0b4e0643
Feature: [NewGRF] Increase size of persistent storage to 256.
6 years ago
3e50336079
Add trace restrict train status conditional
6 years ago
d8b9e2953e
Merge branch 'enhanced_viewport_overlay' into jgrpp
...
# Conflicts:
# src/command.cpp
# src/saveload/extended_ver_sl.cpp
6 years ago
98da7019d6
Plans: Make it possible to give plans a name.
...
(cherry picked from commit d9b553f130a6eda36e2eea217785f829d3d8624e)
6 years ago
6578d94e63
Add support for timetabled wait times at waypoints
6 years ago
e55a327c09
Enable locking timetable travel times
6 years ago
5344ec1931
Add a "leave early" order timetable flag
...
Re-arrange timetable GUI slightly.
Add an "extra" drop-down item.
6 years ago
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
6 years ago
9490f33a6c
Merge branch 'master' into crashlog_improvements
...
# Conflicts:
# src/console_cmds.cpp
# src/openttd.cpp
# src/vehicle.cpp
6 years ago
9e1e074c2b
Update existing assertions to log tile information where suitable
6 years ago
bf8d7df736
Change: Extend rail types to 64 (6 bit storage)
6 years ago
5db883fbe9
Change: Move rail type bits from m3 to m8.
6 years ago
65548c37a8
Change: Extend map array by 2 bytes with a uint16.
6 years ago
3ed5d8f09f
Add mechanism to lock wait times in timetable against autofill/automate changes
6 years ago
6740a9a470
Merge branch 'custom_bridgeheads' into jgrpp
...
# Conflicts:
# docs/landscape.html
# src/bridge_map.h
# src/pbs.cpp
# src/saveload/company_sl.cpp
# src/saveload/extended_ver_sl.cpp
# src/settings_type.h
# src/signal.cpp
# src/train_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
# src/tunnelbridge_map.h
# src/vehicle.cpp
# src/viewport.cpp
6 years ago
77362b829a
Initial support for rail custom bridge heads
6 years ago
2419974f19
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
6 years ago
bce0ce85b3
Fix comment on setting update for 0.1 increment town cargo scale factor
6 years ago
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
6 years ago
00b1fe6246
Cargo type orders: Add support for 64 cargo types
6 years ago
0ae32838ea
Merge branch 'save_ext' into cargo_type_order
...
# Conflicts:
# src/core/smallstack_type.hpp
6 years ago
373ff3dd4e
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
# src/table/settings.h.preamble
6 years ago
5770f1407a
Signals on bridges: Shrink M2 simulated signal states field
6 years ago
2aacddd412
Codechange: lengthof is not defined for runtime-length strings, use sizeof instead
6 years ago
5f86e1a390
Codechange: Silence -Wclass-memaccess warnings with GCC8
6 years ago
11ab3c4ea2
Change: Increase cargo type limit to 64.
6 years ago
ef0a458ab6
Add go to depot and sell vehicle orders
...
Controlled by a setting (default off)
6 years ago
fd08259698
Fix fast path being unconditionally disabled in save/load whole map
6 years ago
2586096ef6
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/pbs.cpp
# src/saveload/extended_ver_sl.cpp
6 years ago
1b4db7d86c
Trace restrict: Add wait at entrance PBS for reservation ending here
6 years ago
e82ccad052
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# src/pbs.cpp
# src/saveload/extended_ver_sl.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/signal.cpp
# src/table/settings.ini
# src/train_cmd.cpp
# src/tunnelbridge.h
6 years ago
d03139b241
Use separate bits for signals on bridge/tunnel entrance/exit red/green states
6 years ago
2c7b96cf1e
Merge branch 'save_ext' into jgrpp
6 years ago
a3156804c5
Fix narrowing/type conversion warning on big endian platforms
6 years ago
c5954fd1bd
Fix syntax errors in saveload_buffer.h on strict pointer alignment platforms
...
Fixes #57
6 years ago
fd4d9591c1
Merge branch 'save_ext' into jgrpp
6 years ago
616cbf580a
Use unaligned typedefs in unaligned save/load accessors
6 years ago
40c7ccd6e6
Merge branch 'enhanced_viewport_overlay' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
6 years ago
9376dc7089
Change viewport plan save format
...
The previous format stored sparse keys in a non-sparse array chunk,
which resulted in a significant savegame size penalty.
6 years ago
03b0931c57
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/debug.cpp
# src/saveload/saveload.cpp
6 years ago
51e9cc6695
Log save/load chunk sizes at sl debug level 3
6 years ago
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
6 years ago
4134b81af0
Remove save-only autolength flag from economy chunk handlers
...
CH_AUTO_LENGTH is only used when saving chunks; it makes no sense
to set it for chunks without a save handler.
(cherry picked from commit 8b2fe11d8491fb5f3b9bd7dd5344a0956817e41c)
(cherry picked from commit ec157b4a66
6 years ago
4007338280
Clear VF_CARGO_UNLOADING flag from vehicles with no cargo_payment
...
Bump train_through_load savegame version
6 years ago
777151c34d
Station rating: Track last visited vehicle type separately per-cargo
6 years ago
e6e93d40e8
Station flow stat save/load performance improvement
...
Avoid use of SlObject in inner loop
6 years ago
6187517429
Add whole-map savegame chunk
...
This is to avoid haveing to do many passes to save/load map
6 years ago
159909f4b1
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/saveload/saveload.cpp
6 years ago
aae7806d5d
Move save/load ReadBuffer and MemoryDumper to separate header
...
Add static accessors
6 years ago
bbec436a74
Change SlAutolength to only call proc once
6 years ago
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
6 years ago
c71ed22e7a
Save/memory dumper performance improvements
6 years ago
3b83a9e186
Performance improvements to savegame loading
6 years ago
cecbf257bc
Merge branch 'save_ext' into template_train_replacement
...
# Conflicts:
# src/saveload/saveload.cpp
# src/vehicle_gui.cpp
6 years ago
fa304cdb75
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
6 years ago
56be293107
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_anim_sse2.cpp
# src/blitter/32bpp_base.cpp
# src/blitter/32bpp_base.hpp
# src/ground_vehicle.cpp
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/newgrf_house.cpp
# src/newgrf_house.h
# src/town_cmd.cpp
# src/vehicle_base.h
# src/viewport_gui.cppp
6 years ago
a07394a63a
Change: Remove direction parameter from Vehicle::UpdateDeltaXY. ( #6792 )
...
The value is either unused or always the same as this->direction.
6 years ago
4cebebcf68
Change: Add CargoTypes type for cargo masks. ( #6790 )
6 years ago
42b43c9983
Change: Available railtypes is always calculated on load, so no need to load value for old savegames ( #6782 )
6 years ago
38779254e5
Check cargo action count consistencies on load
...
Add scope info logging to AfterLoadVehicles
6 years ago
a60eff174d
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
6 years ago
5877cd0f9b
TBTR: Fix display of vehicle sprites for some NewGRFs, fix issues in large UI modes
...
Slight code, GUI layout, and savegame format tidying
6 years ago
6342099c4d
Allow 256 NewGRFs in multiplayer
...
Add extended network format for server info
Add general UDP packet fragmentation system
Fix map dimensions >= 64k
Increase length of server revision string
Maintain backwards compatibility with trunk for advertisement/server listing
6 years ago
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
7 years ago
fef8b831a9
Change: Switch town growth rate and counter to actual game ticks ( #6763 )
7 years ago
cfb8092397
Fix b4b98e5165: Use FALLTHROUGH attribute with correct indentation.
7 years ago
1fe0bb76b9
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
7 years ago
4bcd05a620
Merge branch 'cpp-11' into save_ext
...
# Conflicts:
# findversion.sh
7 years ago
f42cc19aad
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# Makefile.src.in
# src/crashlog.cpp
# src/crashlog.h
7 years ago
78588d8ce5
First implementation of conditional order checking slot occupancy
...
(cherry picked from commit 524e3e56cb4a357ba60335f91dce1e00cb8d22f2)
Some code adjustments: serialisation/storage, formatting
See: #40
7 years ago
2e4ac325e2
Add extra data fields to Order extended data
7 years ago
4955996b35
Remove costly recalculation of a date format we already have.
...
(cherry picked from commit 6aca18d18252f1c2f6d4a215999b7d7afb7df813)
See #36
7 years ago
7dd6027194
Codechange: Use a SmallVec for the animated tile list instead of replicating most of the logic.
7 years ago
78838ee2a2
Add freight train load/unload mode: through load
7 years ago
52edafab5e
Add savegame support for 32 bit Train::flags field
7 years ago
09ca051ff8
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
# src/train.h
7 years ago
def3a3933b
Move dual-use of load_unload_ticks for bridge/tun signals to new field
7 years ago
70b6500d73
Merge branch 'save_ext' into jgrpp
7 years ago
c2ab4cb2ae
Fix commit fb946f6a, which broke new game/map creation
7 years ago
22724e13bc
Merge branch 'save_ext' into jgrpp
7 years ago
fb946f6a2b
Don't reset savegame feature versions at end of DoLoad, so that -q works
7 years ago
8c458c153d
(svn r27990) -Update: Docs
7 years ago
80c0655c06
Relax validation for conditional order travel time in old savegame load
7 years ago
385a2552e9
Merge branch 'enhanced_viewport_overlay' into jgrpp
7 years ago
864d94d2c5
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/industry_cmd.cpp
# src/vehicle.cpp
7 years ago
16c67ea484
Merge branch 'master' into enhanced_viewport_overlay
...
# Conflicts:
# src/industry_cmd.cpp
# src/saveload/saveload.cpp
# src/stdafx.h
# src/vehicle.cpp
7 years ago
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)
7 years ago
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)
7 years ago
8c0c9274ea
Merge branch 'infrastructure_sharing' into jgrpp
...
# Conflicts:
# src/economy.cpp
# src/misc.cpp
# src/openttd.cpp
# src/saveload/extended_ver_sl.cpp
7 years ago
9000d74f3c
Pay all cargo payment incomes when cargo finally delivered
7 years ago
093bd804cd
Merge branch 'save_ext' into infrastructure_sharing
7 years ago
d730cfd51d
Cache sprite sequence bounds for vehicles
7 years ago
5b226adc75
TBTR: Whitespace fix
7 years ago
3a2a316588
Merge branch 'day_length' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
# src/saveload/vehicle_sl.cpp
7 years ago
5db5581684
Merge branch 'save_ext' into jgrpp
7 years ago
15fea054fb
Add function pointer mode to SlXvFeatureTest
7 years ago
7b567c9d26
Extend vehicle running ticks to 16 bits to avoid overflow at day length > 3
7 years ago
dda20d08c1
Merge branch 'improved_breakdowns' into jgrpp
...
Update German and Korean language strings
# Conflicts:
# src/saveload/extended_ver_sl.cpp
7 years ago
0a80aec634
Implement critical breakdown speed reduction for road vehicles
7 years ago
218085c535
Timetable: Implement autofill/automate for taken conditional orders.
...
Fix wrong timetable values being set after using skip or send to depot.
Add timetabled flag for conditional order branch taken travel time.
7 years ago
740e4543c3
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/industry_cmd.cpp
7 years ago
135ad9c6c9
(svn r27929) -Cleanup: Remove unused Industry::random_triggers
7 years ago
6cc55abaf9
(svn r27929) -Cleanup: Remove unused Industry::random_triggers
7 years ago
a9ca7c1ead
Fix crash when loading old savegames with buoys
7 years ago
be37aad470
Update multiple docks to use savegame framework, fix merge conflicts
7 years ago
06abeb4570
Move dock creation code in afterload further up so it runs before the catchment area is created, since that code checks for the presence of the new docks.
...
(cherry picked from commit 80cf10dc0788644ed844b313e5c73dc634f7b43a)
# Conflicts:
# src/saveload/afterload.cpp
7 years ago
1d3cf59d8a
Allow building multiple docks per station.
...
(cherry picked from commit 0110c4a35d383e0be2cbb53cbe9cbe6784abb3e9)
# Conflicts:
# src/station_cmd.cpp
7 years ago
4a6ddb2d50
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# config.lib
7 years ago
2574e46df8
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/smallmap_gui.cpp
7 years ago
36a712a579
Add very and extremely slow options to town growth rate setting
7 years ago
ba33754993
Merge branch 'save_ext' into tracerestrict-sx
...
# Conflicts:
# src/vehiclelist.cpp
7 years ago
f34833f111
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/vehiclelist.cpp
7 years ago
2d66f25f6c
Merge branch 'save_ext' into improved_breakdowns
...
# Conflicts:
# src/vehicle.cpp
7 years ago
258e591f71
Merge branch 'cpp-11' into save_ext
7 years ago
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
a47fb85cd8
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
9077d6f4d2
Add support for loading SpringPP v2.3, v2.4 savegames
7 years ago
965938c0f5
Merge branch 'scheduled-dispatch-sx' into jgrpp
7 years ago
bbd2e6f2f5
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
# src/train_cmd.cpp
7 years ago
350c2bb24f
Make trains break down after collision with road vehicle.
7 years ago
44fa555c6d
Merge branch 'save_ext' into improved_breakdowns
7 years ago
59554a5dd2
Fix bug in new SL_VARVEC save/load code
7 years ago
0b8f0e64ec
Scheduled Dispatch feature
...
Code is tested and run well on small-ish train network. Not tested extensively.
7 years ago
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.
7 years ago
0acb4fdd2f
Safer level crossings: add setting to improve RV level crossing safety.
8 years ago
bfb8f6f32e
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
# src/tracerestrict.h
# src/tracerestrict_gui.cpp
8 years ago
d1a287d73c
Merge branch 'save_ext' into jgrpp
8 years ago
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>
8 years ago
c44141bad6
Add conditional to test slot occupancy state.
...
Bump tracerestrict version.
8 years ago
b8328ad21f
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/command.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/saveload/extended_ver_sl.cpp
# src/settings_gui.cpp
# src/tracerestrict.cpp
# src/tracerestrict.h
# src/tracerestrict_gui.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/vehiclelist.cpp
# src/window_type.h
8 years ago
f50a9fef4f
Add TRRS tracerestrict slot chunk to SLXI header.
8 years ago
8317eac918
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/lang/german.txt
# src/lang/korean.txt
# src/lang/traditional_chinese.txt
# src/window.cpp
8 years ago
83091f55da
Merge branch 'vehicle_group_info' into jgrpp
8 years ago
9d0f0967f9
Enabled loading non-SLXI version 2002 tracerestrict savegames.
8 years ago
19e5964b31
Bump tracerestrict version due to wait at PBS and slot features.
8 years ago
6417fb16c3
Initial implementation of trace restrict slots
8 years ago
7194e19380
Merge branch 'save_ext' into tracerestrict-sx
8 years ago
dd0666c5f4
Add support for save/loading std::strings.
8 years ago
f58fe00294
Merge branch 'master' into save_ext
8 years ago
0887289e3d
(svn r27822) -Feature: Vehicle Group Info: Add profits and occupancy display to group vehicle list (mtm, JGR)
8 years ago
19d56a33e8
(svn r27822) -Feature: Vehicle Group Info: Add profits and occupancy display to group vehicle list (mtm, JGR)
8 years ago
58d8a791e4
Merge branch 'save_ext' into tracerestrict-sx
8 years ago
b3fd11efd2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_anim_sse4.cpp
8 years ago
fae4ac1a5d
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/company_sl.cpp
# src/saveload/saveload.cpp
8 years ago
57745b1c74
(svn r27793) -Fix [FS#6450]: Use of uninitialised variable cause lzo to fail. Add check for error status.
8 years ago
ff26c6393e
(svn r27793) -Fix [FS#6450]: Use of uninitialised variable cause lzo to fail. Add check for error status.
8 years ago
ac69b746ab
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/gfxinit.cpp
# src/saveload/saveload.cpp
8 years ago
d3de080883
(svn r27778) -Change [FS#6442-ish]: Convenience savegame bump to distinguish 1.7 savegames from 1.6 savegames.
8 years ago
ca3aaf8f6d
(svn r27778) -Change [FS#6442-ish]: Convenience savegame bump to distinguish 1.7 savegames from 1.6 savegames.
8 years ago
5e28cc4757
(svn r27772) -Fix [FS#5819]: If the intro game had a savegame version which contains a NewGRF configuration, then townname NewGRFs would not be activated in the game options.
8 years ago
24786a71ee
(svn r27772) -Fix [FS#5819]: If the intro game had a savegame version which contains a NewGRF configuration, then townname NewGRFs would not be activated in the game options.
8 years ago
0d5ee772fc
(svn r27770) -Fix [FS#6540]: Initialize variables in station_sl.cpp (JGR)
8 years ago
4e13285274
(svn r27770) -Fix [FS#6540]: Initialize variables in station_sl.cpp (JGR)
8 years ago
0690dbb8bf
Merge branch 'jgrpp' into chunnel
8 years ago
fa044852d5
Merge branch 'day_length' into jgrpp
...
# Conflicts:
# src/saveload/afterload.cpp
8 years ago
1f148322fb
Reset day length factor to 1 when loading pre day length savegame
8 years ago
11906f24c5
Merge branch 'save_ext' into day_length
8 years ago
89a0a9c182
Chunnel: Use hash table for tunnel search, change tunnel fields and savegame format.
8 years ago
ad15b47f72
Chunnel: Fix setting of tunnel ID in load conversion, add method to set ID.
8 years ago
afd8c6b867
Chunnel: Increase tunnel pool size, make tunnel IDs 32 bit.
...
Add lookup mechanism for tunnel IDs which don't fit in 16 bits in M2.
8 years ago
702404dc6a
Fix issues with uncleared variables when loading old save games.
8 years ago
79439925c8
Clear discardable chunk IDs in SlXvResetState.
8 years ago
02b33e7f64
Chunnel: Add error text for too many tunnels.
8 years ago
75410ddae4
Chunnel: Save/load changes
8 years ago
aac5b2d4ad
Chunnel: Adjust struct Tunnel constructor
8 years ago
ee0d6e2fe6
Chunnel: Remove debug prints from afterload code.
8 years ago
04244e7215
Chunnel: Fix typo in name of GetOtherTunnelBridgeEndOld
8 years ago
f173b74e81
Chunnel patch 28398: Codechange: Save Tunnel Pool.
...
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
8 years ago
67e7d12eb7
Chunnel patch 28393: Codechange: Rework GetOtherTunnelEnd proc.
...
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
8 years ago
a6168dd2f0
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/saveload/company_sl.cpp
8 years ago
60f7168c22
(svn r27760) -Change: Enable realisitic train and road vehicle acceleration by default.
8 years ago
1b9139efe8
(svn r27760) -Change: Enable realisitic train and road vehicle acceleration by default.
8 years ago
0c1fcc02ec
(svn r27757) -Change: Make StringID 32bit.
8 years ago
fc4c4d080c
(svn r27757) -Change: Make StringID 32bit.
8 years ago
49b940f69c
(svn r27756) -Codechange: Add StringTab enum
8 years ago
a56e2bccd0
(svn r27756) -Codechange: Add StringTab enum
8 years ago
02967c3c08
(svn r27754) -Codechange: Add GetStringTab(), GetStringIndex() and MakeStringID() to access the structure of StringIDs.
8 years ago
9ad09627ad
(svn r27754) -Codechange: Add GetStringTab(), GetStringIndex() and MakeStringID() to access the structure of StringIDs.
8 years ago
f89e8b76d6
Fix increased number of NewGRFs support.
...
Improve error handling if multiplayer limit is exceeded.
8 years ago
072915f2c7
Merge branch 'custom_bridgeheads' into jgrpp
...
# Conflicts:
# docs/landscape_grid.html
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/extended_ver_sl.h
# src/settings_gui.cpp
# src/settings_type.h
# src/tunnelbridge_cmd.cpp
# src/tunnelbridge_map.h
8 years ago
da177d063f
Custom bridge heads: Initial implementation
8 years ago
1f727e9029
Custom bridge heads: Add savegame version and setting.
8 years ago
1e5c788541
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# src/table/settings.ini
# src/tunnelbridge.h
8 years ago
d762835903
Signals on tunnel/bridges are now added to infrastructure stats.
8 years ago
24b3424ca3
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/economy.cpp
# src/network/network_command.cpp
# src/saveload/extended_ver_sl.cpp
8 years ago
d4157b3662
TBTR: Handle leftover template vehicles without owners in old saves.
8 years ago
d25daebf2f
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
8 years ago
82152d8605
Merge branch 'tracerestrict' into tracerestrict-sx
...
# Conflicts:
# src/saveload/saveload.cpp
8 years ago
f5e4d8e73a
Merge branch 'master' into tracerestrict
...
# Conflicts:
# src/rail_gui.cpp
# src/saveload/saveload.cpp
8 years ago
7ecdebddb3
Change and simplify algorithm for vehicle repair cost.
...
This is due to absurdly high repair costs for old vehicles with
old algorithm, due to implicit exponential increases.
Get rid of variable in vehicle struct.
8 years ago
dcbde21f18
Merge branch 'save_ext' into improved_breakdowns
...
# Conflicts:
# src/train_cmd.cpp
8 years ago
074555e41d
Merge branch 'save_ext' into signal_tunnels_bridges
8 years ago
5c7f36ef4b
Merge branch 'enhanced_viewport_overlay' into jgrpp
...
Further fixes for viewport lines/marker for multiplayer clients.
# Conflicts:
# src/lang/russian.txt
8 years ago
0d1e08ed75
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/clear_cmd.cpp
8 years ago
56f173e15e
Merge branch 'master' into save_ext
8 years ago
d8a316d7c5
(svn r27709) -Fix-ish: Silence some warnings. (adf88)
8 years ago
4342798ff5
(svn r27709) -Fix-ish: Silence some warnings. (adf88)
8 years ago
e1a841aa05
Fix loading of signals on bridges/tunnels from SpringPP savegames.
...
Reg/green states were incorrect.
8 years ago
ddae95addb
Rescale town cargo adj setting by 10x, for finer adjustment.
...
Use DECIMAL1 instead of an integer.
8 years ago
37a58fd11d
Add setting to increase station catchment radius.
...
Update acceptance and refresh screen when catchment settings change.
8 years ago
dbd99707b6
Merge branch 'master' into save_ext
8 years ago
7f10d83a4a
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/linkgraph/linkgraphjob.cpp
# src/saveload/extended_ver_sl.cpp
# src/train_cmd.cpp
# src/vehicle_base.h
8 years ago
92254acf8d
TBTR: Savegame and API changes to support multiple sprites per vehicle.
8 years ago
d204062300
Merge branch 'master' into template_train_replacement
8 years ago
3f75b8bca2
(svn r27670) -Add: [FS#6471] Assign descriptive names to (GNU pthread) threads. (JGR)
8 years ago
31f046bd9b
(svn r27670) -Add: [FS#6471] Assign descriptive names to (GNU pthread) threads. (JGR)
8 years ago
ba566e9126
(svn r27668) -Feature: [NewGRF] Allow composing vehicles from multiple sprites.
8 years ago
Peter Nelson
Jonathan G Rennison
PeterN
damfr
Niels Martin Hansen
Charles Pigott
Michael Lutz
keldorkatarn
cirdan
innocenat
Pavel Stupnikov
J0an Josep
frosch
fonsinchen
HackaLittleBit