Jonathan G Rennison
4a6ddb2d50
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# config.lib
2017-09-04 01:22:54 +01:00
Jonathan G Rennison
f34833f111
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/vehiclelist.cpp
2017-08-15 19:26:26 +01:00
Jonathan G Rennison
2d66f25f6c
Merge branch 'save_ext' into improved_breakdowns
...
# Conflicts:
# src/vehicle.cpp
2017-08-15 19:17:12 +01:00
frosch
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
2017-08-13 18:38:42 +00:00
frosch
a47fb85cd8
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
2017-08-13 18:38:42 +00:00
Jonathan G Rennison
44fa555c6d
Merge branch 'save_ext' into improved_breakdowns
2017-06-06 18:41:01 +01:00
Jonathan G Rennison
0acb4fdd2f
Safer level crossings: add setting to improve RV level crossing safety.
2017-05-07 19:33:59 +01:00
Jonathan G Rennison
0690dbb8bf
Merge branch 'jgrpp' into chunnel
2017-03-05 15:30:27 +00:00
Jonathan G Rennison
fa044852d5
Merge branch 'day_length' into jgrpp
...
# Conflicts:
# src/saveload/afterload.cpp
2017-03-05 15:29:45 +00:00
Jonathan G Rennison
1f148322fb
Reset day length factor to 1 when loading pre day length savegame
2017-03-05 15:25:34 +00:00
Jonathan G Rennison
89a0a9c182
Chunnel: Use hash table for tunnel search, change tunnel fields and savegame format.
2017-03-05 14:39:10 +00:00
Jonathan G Rennison
ad15b47f72
Chunnel: Fix setting of tunnel ID in load conversion, add method to set ID.
2017-03-05 14:39:06 +00:00
Jonathan G Rennison
02b33e7f64
Chunnel: Add error text for too many tunnels.
2017-03-04 13:06:43 +00:00
Jonathan G Rennison
75410ddae4
Chunnel: Save/load changes
2017-03-04 12:39:32 +00:00
Jonathan G Rennison
aac5b2d4ad
Chunnel: Adjust struct Tunnel constructor
2017-03-04 12:36:01 +00:00
Jonathan G Rennison
ee0d6e2fe6
Chunnel: Remove debug prints from afterload code.
2017-03-04 12:24:00 +00:00
Jonathan G Rennison
04244e7215
Chunnel: Fix typo in name of GetOtherTunnelBridgeEndOld
2017-03-04 12:23:56 +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
HackaLittleBit
67e7d12eb7
Chunnel patch 28393: Codechange: Rework GetOtherTunnelEnd proc.
...
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
2017-03-04 11:44:25 +00:00
Jonathan G Rennison
a6168dd2f0
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/saveload/company_sl.cpp
2017-02-28 00:15:45 +00:00
frosch
1b9139efe8
(svn r27760) -Change: Enable realisitic train and road vehicle acceleration by default.
2017-02-26 20:31:02 +00:00
frosch
60f7168c22
(svn r27760) -Change: Enable realisitic train and road vehicle acceleration by default.
2017-02-26 20:31:02 +00:00
Jonathan G Rennison
f89e8b76d6
Fix increased number of NewGRFs support.
...
Improve error handling if multiplayer limit is exceeded.
2017-02-14 00:35:15 +00:00
Jonathan G Rennison
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
2017-02-05 20:43:56 +00:00
Jonathan G Rennison
1f727e9029
Custom bridge heads: Add savegame version and setting.
2017-02-05 18:01:31 +00:00
Jonathan G Rennison
dcbde21f18
Merge branch 'save_ext' into improved_breakdowns
...
# Conflicts:
# src/train_cmd.cpp
2017-01-02 18:13:45 +00:00
Jonathan G Rennison
ddae95addb
Rescale town cargo adj setting by 10x, for finer adjustment.
...
Use DECIMAL1 instead of an integer.
2016-11-25 23:24:41 +00:00
Jonathan G Rennison
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
2016-09-18 20:07:48 +01:00
Jonathan G Rennison
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.
2016-09-18 20:06:39 +01:00
Jonathan G Rennison
e844b82d9e
Use vector instead of list for Station::loading_vehicles.
2016-09-13 22:58:00 +01:00
Jonathan G Rennison
888cd1be07
Merge branch 'cpp-11' into signal_tunnels_bridges
...
# Conflicts:
# src/saveload/saveload.cpp
2016-09-11 13:16:54 +01:00
Jonathan G Rennison
f7774415f2
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# src/stdafx.h
2016-09-08 19:36:00 +01:00
Jonathan G Rennison
5e67582a64
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/saveload/extended_ver_sl.cpp
# src/saveload/saveload.cpp
2016-09-07 22:02:57 +01:00
alberth
597380e099
(svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType.
2016-09-04 12:57:43 +00:00
alberth
a959c0c965
(svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType.
2016-09-04 12:57:43 +00:00
Jonathan G Rennison
74ff8b9e8e
Merge branch 'crashlog_improvements' into jgrpp
...
# Conflicts:
# Makefile.src.in
2016-06-12 21:21:55 +01:00
Jonathan G Rennison
abbc960e96
Linux crashlog: Use sigaction to get more info on fatal signals.
2016-06-10 23:39:26 +01:00
Jonathan G Rennison
5b7eb46fe4
Merge branch 'improved_breakdowns-sx' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
2016-06-05 23:21:55 +01:00
Jonathan G Rennison
0d20a54606
Fix broken-down aircraft stuck at 0 speed on load.
...
Bump improved breakdowns version.
2016-06-05 23:20:25 +01:00
Jonathan G Rennison
d8a083b666
Allow timetable start dates to be set with full precision.
...
This avoids rounding of start dates when using minutes and
day length > 1.
2016-05-11 21:31:31 +01:00
Jonathan G Rennison
4c5173b6bf
Merge branch 'auto_timetables-sx' into jgrpp
...
# Conflicts:
# src/lang/english.txt
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/table/company_settings.ini
# src/vehicle.cpp
2016-05-08 01:13:35 +01:00
Jonathan G Rennison
d59252d15b
Timetable auto separation is now per vehicle, with a company default.
...
Remove global on-off setting.
Add button to timetable GUI.
Add company setting to control default for new vehicles.
Fix automate, start date, change time and autofill buttons
being shown enabled for other companies' vehicles.
2016-05-08 01:12:07 +01:00
Jonathan G Rennison
d0aa4a53ed
Improve performance of updating railtypes when reloading NewGRFs.
...
Now O(N) instead of O(N log N), and only traverses map once.
2016-04-08 20:38:32 +01:00
keldorkatarn
75396c9b5f
- Make sure we clear the additional railtype bit only for the correct tiles.
...
- Backup and restore the correct railtype for tiles when newGRFs are reloaded during a game.
(cherry picked from commit f5bf8e69b4fe95519513b934dc1057dc304ce3da)
2016-04-08 20:38:31 +01:00
keldorkatarn
5cc56d6ad9
Make 32 instead of 16 rail types possible. by using one free bit of m1 in the map array.
...
(cherry picked from commit b44843800880cdc186f5183301ee0f42afbb5f84)
Also set non-rail type M3 bits to 0 where applicable.
Change savegame versioning to SLXI format.
2016-04-08 20:38:31 +01:00
Jonathan G Rennison
d08b162119
Merge branch 'signal_tunnels_bridges-sx' into jgrpp
...
# Conflicts:
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
# src/signal.cpp
# src/train_cmd.cpp
2016-02-21 12:16:11 +00:00
Jonathan G Rennison
83f6463a6f
Bump version, set semaphore/pbs/exit sig state on upgrade.
2016-02-21 12:11:25 +00:00
Jonathan G Rennison
0779c7b7a9
Merge branch 'template_train_replacement-sx' into jgrpp
...
# Conflicts:
# src/build_vehicle_gui.cpp
# src/saveload/afterload.cpp
2016-02-16 21:08:21 +00:00
Jonathan G Rennison
d688039a42
TBTR: Update template veh sprite IDs when loading savegame/GRFs.
2016-02-15 23:19:41 +00:00
Jonathan G Rennison
580b2f7584
Merge branch 'template_train_replacement-sx' into jgrpp
...
Remove a duplicated declaration.
# 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/group_gui.cpp
# src/lang/english.txt
# src/network/network_command.cpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/extended_ver_sl.h
# src/saveload/saveload.cpp
# src/train_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/window_type.h
2016-02-14 17:55:51 +00:00