dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,000 Commits 1 Branch 0 Tags
fcd08d0daac460ca8d95f1b96f1e97ef2ca28fda
Commit Graph

350 Commits

Author SHA1 Message Date
Jonathan G Rennison
b8328ad21f Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/command.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/tracerestrict.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/vehiclelist.cpp
#	src/window_type.h
 2017-04-05 19:00:24 +01:00
Jonathan G Rennison
6417fb16c3 Initial implementation of trace restrict slots 2017-03-30 21:14:14 +01:00
Jonathan G Rennison
688ee9ac11 Add string control code to consume an argument. 2017-03-30 20:27:03 +01:00
Jonathan G Rennison
58d8a791e4 Merge branch 'save_ext' into tracerestrict-sx 2017-03-20 19:18:34 +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
ce32ca4dc6 (svn r27758) -Change: Increase the maximum number of GameScript texts to 64k, and NewGRF texts to 512k. 2017-02-26 19:41:30 +00:00
frosch
49b940f69c (svn r27756) -Codechange: Add StringTab enum 2017-02-26 19:40:53 +00:00
frosch
02967c3c08 (svn r27754) -Codechange: Add GetStringTab(), GetStringIndex() and MakeStringID() to access the structure of StringIDs. 2017-02-26 19:39:58 +00:00
Jonathan G Rennison
f5212b27e4 Add a DECIMAL1 string code, which is DECIMAL with a fixed param of 1. 2016-11-25 23:12:23 +00:00
Jonathan G Rennison
162e495cc9 Merge branch 'save_ext' into tracerestrict-sx 
# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/extended_ver_sl.cpp
 2016-09-05 23:33:33 +01:00
Jonathan G Rennison
7b56097f50 Merge branch 'master' into jgrpp 
# Conflicts:
#	config.lib
#	src/linkgraph/demands.cpp
#	src/linkgraph/mcf.cpp
#	src/linkgraph/refresh.cpp
#	src/linkgraph/refresh.h
#	src/smallmap_gui.cpp
 2016-07-24 10:16:55 +01:00
Jonathan G Rennison
f0fee802a9 Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/lang/english.txt
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/table/settings.ini
#	src/vehicle_gui.cpp
 2016-07-05 22:34:50 +01:00
Jonathan G Rennison
8ec1b2200e Change tracerestrict weight ratio properties to use decimals, and the weight unit. 
Add {POWER_WEIGHT_RATIO} and {FORCE_WEIGHT_RATIO} string codes.
 2016-07-05 21:20:06 +01:00
Jonathan G Rennison
80e3af6bf5 Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/lang/english.txt
#	src/saveload/extended_ver_sl.cpp
#	src/tracerestrict.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
 2016-06-30 20:25:22 +01:00
Jonathan G Rennison
2c6f74a982 Move header definition for unit conversion functions to own header. 2016-06-30 18:28:42 +01:00
Jonathan G Rennison
b5531975da Add train weight, power, and max TE tracerestrict conditionals. 
Minor refactorings.
 2016-06-29 22:08:05 +01:00
frosch
5973140ac2 (svn r27602) -Fix [FS#6481]: Compilation with --disable-network. (Deranged) 2016-06-17 18:56:19 +00:00
Jonathan G Rennison
f81b252386 Fix statusbar date when time in minutes and show date with time are both on. 2015-09-06 21:22:29 +01: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
Jonathan G Rennison
19764bb4fb Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 2015-08-11 21:41:58 +01:00
michi_cc
44918010df (svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists. 2015-08-10 20:24:13 +00:00
rubidium
ee700fd3b1 (svn r27367) -Codechange: make a distinction between the layouting part of ICU (lx) or the sorting/collation part of ICU (i18n) 2015-08-09 12:33:27 +00:00
Jonathan G Rennison
526cb42608 Merge branch 'master' into depature-boards 
Conflicts:
	src/table/strgen_tables.h
 2015-08-01 20:39:16 +01:00
patch-import
79138de1b9 Import departure boards patch 2015-08-01 19:48:19 +01:00
michi_cc
a41f197379 (svn r27288) -Fix: Slow network content GUI in MSVC Debug builds due to repeated string resolving. 2015-05-17 19:49:35 +00:00
rubidium
978d4e4eaa (svn r27102) -Fix [FS#6194]: money values would end up wrong in strings when outside of the bounds of a 32 bits integer 2015-01-01 20:50:43 +00:00
frosch
e4063cb6d4 (svn r27063) -Fix [FS#6172]: Some lists did not use natural string sorting. 2014-11-18 20:12:42 +00:00
rubidium
213b0613c7 (svn r26733) -Fix [FS#6086]: inconsistency in using spaces between number and unit in some strings 
Try to follow the SI recommendation to use a non-breaking space between a number and its units (and prefix)
 2014-08-15 20:14:48 +00:00
planetmaker
9a64e4b43e (svn r26657) -Add [FS#6047]: Days in dates are not represented by ordinal numbers in all languages 2014-06-20 20:57:32 +00:00
frosch
9430dfe7fa (svn r26525) -Remove: Screenshot format setting from GUI. 2014-04-27 15:13:46 +00:00
rubidium
034735a54c (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 2014-04-25 15:40:32 +00:00
rubidium
5c7c2445d8 (svn r26489) -Codechange: properly account for the end of buffers in the file io code instead of assuming MAX_PATH is okay 2014-04-23 21:23:21 +00:00
rubidium
6ecc602050 (svn r26486) -Codechange: replace a number of snprintfs with seprintf 2014-04-23 21:12:09 +00:00
rubidium
2be4215f43 (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 2014-04-23 20:13:33 +00:00
frosch
bc53bbb8b6 (svn r26242) -Codechange: Use GRFFile that filled the TextRefStack to translate StringIDs from the TextRefStack, instead of passing stuff via global vars. 2014-01-12 18:00:55 +00:00
frosch
9215fd3c96 (svn r26239) -Fix: Check that there is space left in the string parameter array, before pushing NewGRF parameters to it. 2014-01-12 18:00:02 +00:00
frosch
68c8aa93cd (svn r26238) -Codechange: Use StringParameters::GetDataLeft to check for left space in the param array. 2014-01-12 17:59:43 +00:00
frosch
cb6aee2f27 (svn r26237) -Cleanup: Remove unused SCC_STRING_ID. 2014-01-12 17:59:27 +00:00
rubidium
fcd6bf6342 (svn r26063) -Fix (r26062): a few tabs too much 2013-11-23 13:24:31 +00:00
rubidium
54ecaa1290 (svn r26062) -Fix: beef up checks against invalid data in highscore and language files 2013-11-23 13:18:29 +00:00
fonsinchen
02af2aa10e (svn r26041) -Fix: make variable initialization more obvious for humans and compilers. 2013-11-19 19:43:56 +00:00
rubidium
565ad16fc4 (svn r26007) -Change: make handling strings coming from game scripts slightly more lenient, i.e. less 'fatal error... must quit' 2013-11-16 09:54:22 +00:00
rubidium
1b9e91534f (svn r26006) -Fix [FS#5804]: Game script showing vehicle on a story book, then the vehicle being removed and eventually being replaced by a non-user vehicle (most likely smoke) causing an assertion to trigger 2013-11-16 09:49:13 +00:00
rubidium
1cf6dad8f2 (svn r25508) -Change: split unit localisation choice into a choice per type of unit, and move it to the advanced settings 
-Feature [FS#5482]: have tractive effort in imperial (lbf) and metric (kgf) units
-Feature: have weights and volumes in imperial units (short tons, gallons)
 2013-06-29 09:47:18 +00:00
rubidium
2771de7f34 (svn r25454) -Remove/Fix/Cleanup: SETX(Y) does not work at all with other than default fonts, so get rid of it 2013-06-24 18:39:19 +00:00
rubidium
44d584f84a (svn r25437) -Codechange: rework the FreeTypeSettings structure to make it better grouped 2013-06-23 15:23:22 +00:00
rubidium
d99113bd00 (svn r25436) -Codechange: split the font detection code out of the font caching code 2013-06-23 15:20:23 +00:00
frosch
81e810a4f5 (svn r25314) -Fix (r25313): If '0' is the broadest digit, 0 * sum(10^i, i=0..(n-1)) is not the broadest n-digit number. 
-Fix [FS#5562]: Proper size-estimation for numbers with n digits.
 2013-06-01 15:10:32 +00:00
frosch
ddf817e8f3 (svn r25313) -Fix: Do not assume '8' to be the broadest digit, but test all of them. 2013-06-01 14:33:48 +00:00
planetmaker
3a6db3e216 (svn r25078) -Add: New plural form to be used by Scottish Gaelic (1,11; 2,12; 3..10, 13..19; other) 2013-03-10 11:02:11 +00:00