Commit Graph

21 Commits

Author SHA1 Message Date
Jonathan G Rennison
5243cfd6d0 Use TinyString for custom name fields which are almost always empty 2020-05-22 00:10:09 +01:00
Jonathan G Rennison
f8d6e781ba Merge branch 'master' into jgrpp
# Conflicts:
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj.filters
#	src/base_consist.h
#	src/company_base.h
#	src/newgrf_config.cpp
#	src/newgrf_config.h
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
#	src/settings.cpp
#	src/signs_base.h
#	src/string.cpp
#	src/string_func.h
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/town_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_cmd.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/null_v.cpp
2020-05-21 22:24:01 +01:00
Michael Lutz
63ccb36ef3 Codechange: Use std::string for most of the user-settable custom names. 2020-05-21 20:02:34 +02:00
Jonathan G Rennison
cbdd9f84d8 Merge branch 'master' into jgrpp
# Conflicts:
#	src/console_gui.cpp
#	src/lang/korean.txt
#	src/video/sdl2_v.cpp
#	src/video/sdl2_v.h
#	src/window.cpp
#	src/window_gui.h
2019-11-12 18:43:10 +00:00
S. D. Cloudt
13cc8a0cee Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
Jonathan G Rennison
674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 2019-04-11 18:14:13 +01:00
Henry Wilson
7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 2019-04-10 23:22:20 +02:00
Jonathan G Rennison
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.
2017-12-18 01:26:27 +00: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
712d5e9c66 Fix set distributed timetable start not working when using minutes.
Remove WALLCLOCK_NETWORK_COMPATIBLE, it's a pain and not useful.
Whitespace fixes.
2016-01-30 16:02:05 +00:00
patch-import
79138de1b9 Import departure boards patch 2015-08-01 19:48:19 +01:00
rubidium
58ec317c5a (svn r24998) -Fix [FS#5137]: Set vehicle's service interval is percent flag appropriately on creation (peter1138) 2013-02-14 17:24:55 +00:00
rubidium
ced17303c2 (svn r24998) -Fix [FS#5137]: Set vehicle's service interval is percent flag appropriately on creation (peter1138) 2013-02-14 17:24:55 +00:00
rubidium
2c67dc3d9f (svn r24994) -Codechange: Replace access to service_interval with accessors (peter1138) 2013-02-14 17:04:01 +00:00
rubidium
c77cd1f409 (svn r24994) -Codechange: Replace access to service_interval with accessors (peter1138) 2013-02-14 17:04:01 +00:00
frosch
348f2d35be (svn r24446) -Add [FS#5199]: Store more consist properties in order backups. 2012-07-29 16:48:00 +00:00
frosch
9527bad3a7 (svn r24446) -Add [FS#5199]: Store more consist properties in order backups. 2012-07-29 16:48:00 +00:00
frosch
4216eb383f (svn r24443) -Codechange: Move Vehicle::name to BaseConsist. 2012-07-29 16:45:11 +00:00
frosch
48e0d9901f (svn r24443) -Codechange: Move Vehicle::name to BaseConsist. 2012-07-29 16:45:11 +00:00
frosch
2a875a1907 (svn r24442) -Codechange: Split some members of Vehicle into a new class BaseConsist. 2012-07-29 16:44:39 +00:00
frosch
4c9f65800b (svn r24442) -Codechange: Split some members of Vehicle into a new class BaseConsist. 2012-07-29 16:44:39 +00:00