0d93ecb6bf
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/alloc_type.hpp
# src/group_gui.cpp
# src/newgrf.cpp
# src/saveload/economy_sl.cpp
# src/saveload/map_sl.cpp
# src/station_cmd.cpp
5 years ago
4f052fc2a4
Cleanup: Fix alignment after NULL -> nullptr change.
5 years ago
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
5 years ago
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
5 years ago
8b1880187a
Remove: AutoFreeSmallVector.
...
The last use was for storing a list of memory blocks. As the way these lists are accessed is very
specific, it is easier to just write an explicit destructor instead of trying to exactly match the behaviour.
5 years ago
361758b516
Merge branches 'crashlog_improvements', 'save_ext' into jgrpp
...
# Conflicts:
# Makefile.src.in
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj
# projects/openttd_vs142.vcxproj.filters
# src/core/smallstack_type.hpp
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/linkgraphjob.h
# src/misc.cpp
# src/network/network_udp.cpp
# src/openttd.cpp
# src/saveload/saveload.cpp
5 years ago
7f80884047
Merge branch 'cpp-11' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
5 years ago
94c5269fa7
Codechange: Use atomic variables for thread synchronization where useful.
5 years ago
05bc2ed7cb
Codechange: Replace custom thread code with C++11 thread objects.
...
We assume a conforming C++11 compiler environment that has a valid <thread>-header.
Failure to run a real thread is handled gracefully.
5 years ago
ba34ec7ade
Merge branch 'master' into jgrpp
...
Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
# Makefile.bundle.in
# config.lib
# src/animated_tile.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/build_vehicle_gui.cpp
# src/command.cpp
# src/command_func.h
# src/console_gui.cpp
# src/core/smallstack_type.hpp
# src/date.cpp
# src/debug.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/core/game.h
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_content.cpp
# src/network/network_type.h
# src/network/network_udp.cpp
# src/newgrf_house.h
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/osk_gui.cpp
# src/pathfinder/opf/opf_ship.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.h
# src/station_base.h
# src/station_cmd.cpp
# src/table/gameopt_settings.ini
# src/table/newgrf_debug_data.h
# src/table/settings.ini
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
5 years ago
cc62f4163f
Cleanup: Remove unused size template parameters from SmallMap and Auto[Free|Delete]SmallVector
5 years ago
a0f36a50e6
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
5 years ago
a690936ed7
Codechange: Replace SmallVector::Length() with std::vector::size()
5 years ago
af7d9020a1
Codechange: Use override specifer for overriding member declarations
...
This is a C++11 feature that allows the compiler to check that a virtual
member declaration overrides a base-class member with the same signature.
Also src/blitter/32bpp_anim_sse4.hpp +38 is no longer erroneously marked
as virtual despite being a template.
5 years ago
5e6d283463
Merge branch 'master' into jgrpp
...
Remove the viewport sign cache as this is now superseded by the kd tree
implementation
# Conflicts:
# src/crashlog.cpp
# src/lang/english.txt
# src/misc.cpp
# src/pathfinder/follow_track.hpp
# src/pbs.cpp
# src/rail_cmd.cpp
# src/saveload/vehicle_sl.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/ship_cmd.cpp
# src/station.cpp
# src/station_base.h
# src/station_cmd.cpp
# src/table/settings.ini
# src/thread/thread_morphos.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/viewport.cpp
# src/waypoint.cpp
5 years ago
7adae09897
Codechange: liblzma is called liblzma, how ever strange that might be
...
It is the only library we use that calls itself with 'lib' in the
name. This might be confusing, but with the arrival of cmake a lot
of these things are automated. And detection will find 'liblzma',
not 'lzma', like with 'lzo', 'zlib', ..
5 years ago
2fdcc52321
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/lang/dutch.txt
# src/lang/korean.txt
# src/network/network.cpp
# src/network/network_client.cpp
# src/rail.cpp
# src/rail_cmd.cpp
# src/saveload/afterload.cpp
# src/ship_cmd.cpp
# src/toolbar_gui.cpp
# src/vehicle.cpp
5 years ago
1db19208ba
Merge branch 'cpp-11' into save_ext
...
# Conflicts:
# src/saveload/saveload.h
5 years ago
c0c8fb25fb
Change: Use SlErrorCorrupt() on pool index error when loading a savegame, instead of terminating. ( #7219 )
5 years ago
2142452305
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/gamelog.cpp
# src/gamelog_internal.h
# src/lang/german.txt
# src/lang/korean.txt
# src/network/core/config.h
# src/network/network.cpp
# src/network/network_udp.cpp
# src/rev.h
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/saveload/depot_sl.cpp
# src/saveload/gamelog_sl.cpp
# src/saveload/misc_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/table/settings.ini
# src/viewport.cpp
5 years ago
46b5b0155c
Merge branch 'cpp-11' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
# src/saveload/saveload.h
5 years ago
0f37a683a2
Codechange: Additional type safety for saveload version variables.
5 years ago
9de12521ec
Codechange: Convert saveload numbers to enum values.
...
(This was mostly achieved with a few in-place regexes)
5 years ago
ea4ea62816
Codechange: Make saveload version upper bound exclusive, i.e. version object was removed instead of version object last appeared.
5 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
5 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.
5 years ago
255b6adfc9
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/vehicle_cmd.cpp
5 years ago
67633606b0
Codechange: Remove value mangling and field misuse in SLE_WRITEBYTE.
...
The original translation functionality hasn't been used since 2007.
5 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
5 years ago
225790892d
Change: Make ships stop and change direction slowly instead of instantly turning.
5 years ago
8e832afb65
Merge branch 'save_ext' into jgrpp
5 years ago
d3cef7284a
Fix missing case in SlCalcObjMemberLength
...
Fixes 80d6f6c622
5 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
5 years ago
80d6f6c622
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
# src/saveload/saveload.h
5 years ago
81330b8d6e
Change: Add path cache for ships.
5 years ago
1c725fce47
Change: Add ability to save/load std::deque<> containers.
5 years ago
0dba091d79
Merge branch 'cpp-11' into save_ext
...
# Conflicts:
# config.lib
# src/saveload/saveload.cpp
5 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
8859381d30
Add: Industries can produce and accept up to 16 different cargoes
6 years ago
f5b1115039
Doc: Lots and lots of doxymentation fixes
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
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
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
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
373ff3dd4e
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
# src/table/settings.h.preamble
6 years ago
11ab3c4ea2
Change: Increase cargo type limit to 64.
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
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
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
fa304cdb75
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
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
6 years ago
fef8b831a9
Change: Switch town growth rate and counter to actual game ticks ( #6763 )
6 years ago
1fe0bb76b9
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
6 years ago
4bcd05a620
Merge branch 'cpp-11' into save_ext
...
# Conflicts:
# findversion.sh
6 years ago
70b6500d73
Merge branch 'save_ext' into jgrpp
6 years ago
c2ab4cb2ae
Fix commit fb946f6a, which broke new game/map creation
6 years ago
22724e13bc
Merge branch 'save_ext' into jgrpp
6 years ago
fb946f6a2b
Don't reset savegame feature versions at end of DoLoad, so that -q works
6 years ago
8c458c153d
(svn r27990) -Update: Docs
6 years ago
385a2552e9
Merge branch 'enhanced_viewport_overlay' into jgrpp
6 years ago
864d94d2c5
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/industry_cmd.cpp
# src/vehicle.cpp
6 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
6 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)
6 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)
6 years ago
1d3cf59d8a
Allow building multiple docks per station.
...
(cherry picked from commit 0110c4a35d383e0be2cbb53cbe9cbe6784abb3e9)
# Conflicts:
# src/station_cmd.cpp
7 years ago
2574e46df8
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/smallmap_gui.cpp
7 years ago
59554a5dd2
Fix bug in new SL_VARVEC save/load code
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
d1a287d73c
Merge branch 'save_ext' into jgrpp
7 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>
7 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
7 years ago
dd0666c5f4
Add support for save/loading std::strings.
7 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
7 years ago
fae4ac1a5d
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/company_sl.cpp
# src/saveload/saveload.cpp
7 years ago
ff26c6393e
(svn r27793) -Fix [FS#6450]: Use of uninitialised variable cause lzo to fail. Add check for error status.
7 years ago
57745b1c74
(svn r27793) -Fix [FS#6450]: Use of uninitialised variable cause lzo to fail. Add check for error status.
7 years ago
ac69b746ab
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/gfxinit.cpp
# src/saveload/saveload.cpp
7 years ago
ca3aaf8f6d
(svn r27778) -Change [FS#6442-ish]: Convenience savegame bump to distinguish 1.7 savegames from 1.6 savegames.
7 years ago
d3de080883
(svn r27778) -Change [FS#6442-ish]: Convenience savegame bump to distinguish 1.7 savegames from 1.6 savegames.
7 years ago
75410ddae4
Chunnel: Save/load changes
7 years ago
f173b74e81
Chunnel patch 28398: Codechange: Save Tunnel Pool.
...
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
7 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
4342798ff5
(svn r27709) -Fix-ish: Silence some warnings. (adf88)
8 years ago
d8a316d7c5
(svn r27709) -Fix-ish: Silence some warnings. (adf88)
8 years ago
dbd99707b6
Merge branch 'master' into save_ext
8 years ago
31f046bd9b
(svn r27670) -Add: [FS#6471] Assign descriptive names to (GNU pthread) threads. (JGR)
8 years ago
3f75b8bca2
(svn r27670) -Add: [FS#6471] Assign descriptive names to (GNU pthread) threads. (JGR)
8 years ago
8e6569c11f
Include tick skip counter in all desync debug output.
...
Change message format to make field identification easier.
Update desync message reader to support tick skip counter.
8 years ago
Jonathan G Rennison
peter1138
Henry Wilson
Michael Lutz
Patric Stout
PeterN
Niels Martin Hansen
Charles Pigott
cirdan
innocenat
Pavel Stupnikov
frosch
keldorkatarn
HackaLittleBit