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
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
7 years ago
f42cc19aad
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# Makefile.src.in
# src/crashlog.cpp
# src/crashlog.h
7 years ago
7dd6027194
Codechange: Use a SmallVec for the animated tile list instead of replicating most of the logic.
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
80c0655c06
Relax validation for conditional order travel time in old savegame load
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
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
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
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
a47fb85cd8
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
44fa555c6d
Merge branch 'save_ext' into improved_breakdowns
7 years ago
0acb4fdd2f
Safer level crossings: add setting to improve RV level crossing safety.
7 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
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
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
1b9139efe8
(svn r27760) -Change: Enable realisitic train and road vehicle acceleration by default.
8 years ago
60f7168c22
(svn r27760) -Change: Enable realisitic train and road vehicle acceleration by default.
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
1f727e9029
Custom bridge heads: Add savegame version and setting.
8 years ago
dcbde21f18
Merge branch 'save_ext' into improved_breakdowns
...
# Conflicts:
# src/train_cmd.cpp
8 years ago
ddae95addb
Rescale town cargo adj setting by 10x, for finer adjustment.
...
Use DECIMAL1 instead of an integer.
8 years ago
f82feb160f
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# projects/openttd_vs100.vcxproj
# projects/openttd_vs100.vcxproj.filters
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs80.vcproj
# projects/openttd_vs90.vcproj
# source.list
# src/misc.cpp
# src/openttd.cpp
# src/pbs.cpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/saveload.cpp
# src/signal.cpp
# src/train_cmd.cpp
# src/tunnelbridge_map.h
8 years ago
0d2e9f91bf
Adjust signal on bridge/tunnel map bits, rename accessors, add docs.
...
Use same bit to store red/green state for entrances and exits.
No longer re-use exit bit to store red/green state of entrance.
Avoid modifying the M2 of tunnel entrances/exits.
Rename and rationalise map accessor functions.
Document bits used in landscape HTML docs.
8 years ago
e844b82d9e
Use vector instead of list for Station::loading_vehicles.
8 years ago
888cd1be07
Merge branch 'cpp-11' into signal_tunnels_bridges
...
# Conflicts:
# src/saveload/saveload.cpp
8 years ago
f7774415f2
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# src/stdafx.h
8 years ago
5e67582a64
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/saveload/extended_ver_sl.cpp
# src/saveload/saveload.cpp
8 years ago
597380e099
(svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType.
8 years ago
a959c0c965
(svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType.
8 years ago
74ff8b9e8e
Merge branch 'crashlog_improvements' into jgrpp
...
# Conflicts:
# Makefile.src.in
8 years ago
Jonathan G Rennison
Pavel Stupnikov
Michael Lutz
keldorkatarn
frosch
HackaLittleBit
alberth