Commit Graph

38 Commits

Author SHA1 Message Date
Jonathan G Rennison
f5e9805b10 Store time display settings both in savegame and client, add setting 2020-06-23 21:05:21 +01:00
Jonathan G Rennison
7960db35f2 Merge branch 'master' into jgrpp
# Conflicts:
#	config.lib
#	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/aircraft_cmd.cpp
#	src/base_station_base.h
#	src/core/pool_type.hpp
#	src/disaster_vehicle.cpp
#	src/economy.cpp
#	src/engine.cpp
#	src/group.h
#	src/group_cmd.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/network/network_command.cpp
#	src/network/network_server.cpp
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/road_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/screenshot.cpp
#	src/screenshot.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehiclelist.cpp
#	src/window_type.h
2020-01-06 18:45:51 +00:00
Niels Martin Hansen
2fd871e2af Feature: Configurable game ending year
Functionally reverts 683b65ee1
2019-12-28 12:27:39 +01: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
ee169c4455 Fix numerical/signed overflow when using high day lengths
Bug reported at day length = 125
2017-08-20 20:41:13 +01:00
Jonathan G Rennison
375b069f82 Replace day length scaled tick macros with global variables.
This is to avoid needing to expensively re-calculate them all the time.
Instead update them by incrementing.
2016-09-10 01:03:48 +01:00
Jonathan G Rennison
26fa77c5ee Run animations at the normal rate regardless of day length factor. 2016-03-02 18:36:53 +00:00
Jonathan G Rennison
29809f2001 Time in minutes is no longer scaled by day length.
Time in minutes now based on the existing date ticks * the day length,
plus the tick skip counter, instead of just the date ticks.
Change the format of the {DATE_WALLCLOCK_*} string params
to use date ticks scaled by the day length, as above.
Update status bar clock.
2015-08-30 18:54:59 +01:00
patch-import
79138de1b9 Import departure boards patch 2015-08-01 19:48:19 +01:00
rubidium
0d9a8b07ec (svn r25260) -Codechange: occasionally clear dead links and compress link graphs (fonsinchen) 2013-05-19 14:26:14 +00:00
rubidium
be4f85766c (svn r25260) -Codechange: occasionally clear dead links and compress link graphs (fonsinchen) 2013-05-19 14:26:14 +00:00
planetmaker
122c4622f5 (svn r22548) -Codechange: Name also the magic number for the lumber mill's tree cutting action (FeyFre) 2011-06-09 16:35:09 +00:00
planetmaker
e5a88a1077 (svn r22548) -Codechange: Name also the magic number for the lumber mill's tree cutting action (FeyFre) 2011-06-09 16:35:09 +00:00
frosch
62b6d0eb0e (svn r22482) -Codechange: Add some contants for the number of ticks between certain cyclical tasks. 2011-05-21 11:26:37 +00:00
frosch
474b4799e8 (svn r22482) -Codechange: Add some contants for the number of ticks between certain cyclical tasks. 2011-05-21 11:26:37 +00:00
rubidium
f09a74a996 (svn r19812) -Codechange: give some unnamed enums a name or, in case they consisted of unrelated values use static const (u)int 2010-05-13 09:44:44 +00:00
rubidium
398418b8fa (svn r19812) -Codechange: give some unnamed enums a name or, in case they consisted of unrelated values use static const (u)int 2010-05-13 09:44:44 +00:00
rubidium
b15fb68503 (svn r18585) -Codechange: replace some magic numbers by constants 2009-12-21 16:13:30 +00:00
rubidium
abb601f682 (svn r18585) -Codechange: replace some magic numbers by constants 2009-12-21 16:13:30 +00:00
rubidium
bd9c679873 (svn r18292) -Codechange: add a command to set the start date of a timetable. Based on work by PhilSophus. 2009-11-25 23:37:15 +00:00
rubidium
a951c505bf (svn r18292) -Codechange: add a command to set the start date of a timetable. Based on work by PhilSophus. 2009-11-25 23:37:15 +00:00
rubidium
371a220960 (svn r18291) -Codechange: rework the calculation of the 'days till year' macro a bit so it can be properly reused and add a MAX_DAY 2009-11-25 23:28:04 +00:00
rubidium
1a8c203d6e (svn r18291) -Codechange: rework the calculation of the 'days till year' macro a bit so it can be properly reused and add a MAX_DAY 2009-11-25 23:28:04 +00:00
rubidium
2e506b04aa (svn r18204) -Codechange: introduce a type for Ticks and use it; furthermore document some related variables/functions 2009-11-21 12:43:09 +00:00
rubidium
37056b564c (svn r18204) -Codechange: introduce a type for Ticks and use it; furthermore document some related variables/functions 2009-11-21 12:43:09 +00:00
rubidium
99d46e0ad7 (svn r17248) -Fix: add GPL license notice where appropriate 2009-08-21 20:21:05 +00:00
rubidium
7fbc33dae1 (svn r17248) -Fix: add GPL license notice where appropriate 2009-08-21 20:21:05 +00:00
smatz
ca45774160 (svn r15077) -Codechange: enumify DAYS_IN_YEAR and DAYS_IN_LEAP_YEAR
-Change: when computing daily running cost, divide by 365 (instead of 364). Since r12134, the rounding errors don't need this correction anymore
2009-01-13 22:58:03 +00:00
smatz
e00cf92f47 (svn r15077) -Codechange: enumify DAYS_IN_YEAR and DAYS_IN_LEAP_YEAR
-Change: when computing daily running cost, divide by 365 (instead of 364). Since r12134, the rounding errors don't need this correction anymore
2009-01-13 22:58:03 +00:00
rubidium
f16427fbe0 (svn r14823) -Document: some variables/structs (Alberth) 2009-01-04 11:32:26 +00:00
rubidium
702c372744 (svn r14823) -Document: some variables/structs (Alberth) 2009-01-04 11:32:26 +00:00
rubidium
ef20d229ab (svn r14755) -Codechange: remove ending year as it can't be changed anyways. 2008-12-28 16:09:58 +00:00
rubidium
683b65ee18 (svn r14755) -Codechange: remove ending year as it can't be changed anyways. 2008-12-28 16:09:58 +00:00
frosch
aadd3b29af (svn r13594) -Feature(ette)[FS#2093]: Supply newgrfs with 'day of month', 'leap year' and 'day of year'. 2008-06-20 21:14:10 +00:00
frosch
4236dd3be5 (svn r13594) -Feature(ette)[FS#2093]: Supply newgrfs with 'day of month', 'leap year' and 'day of year'. 2008-06-20 21:14:10 +00:00
rubidium
db73addb43 (svn r11702) -Codechange: move all date related stuff to date*. 2007-12-26 13:50:40 +00:00
rubidium
b9046c97fb (svn r11702) -Codechange: move all date related stuff to date*. 2007-12-26 13:50:40 +00:00