dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,288 Commits 1 Branch 0 Tags
25bd3ed6f47a7fec425f137e8f47dc883fd1023c
Commit Graph

23288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fonsinchen
8d5566651b (svn r27611) -Codechange: Cache the calculated value of CapacityAnnotation 2016-07-10 11:53:43 +00:00
Jonathan G Rennison
3ac94e97c8 Cache the result of GetImage() in Vehicle::UpdateViewport() where possible. 
Sprite number is not cached if callback is made, or a variable access
outside a whitelist occurs.
Invalidate cached sprite number when direction or cargo changes,
or vehicle is marked dirty.
 2016-07-08 19:07:25 +01:00
Jonathan G Rennison
9ae057b8bf Fix loading of SpringPP savegames. 
Was broken in jgrpp-0.13.1
 2016-07-08 00:35:37 +01:00
Jonathan G Rennison
d5ee260daf Update changed format code in translation. 2016-07-06 17:26:50 +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
ed33a62bcd Merge branch 'tracerestrict' into tracerestrict-sx 2016-07-05 22:19:34 +01:00
Jonathan G Rennison
0ab2abbc23 Add client setting to show train weight ratios in details header. 
Off by default.
 2016-07-05 21:54:43 +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
translators
8f2461cdfb (svn r27610) -Update from Eints: 
korean: 1 change by telk5093
 2016-07-02 17:45:35 +00:00
Jonathan G Rennison
f3e0da1e63 Update project files. 2016-07-01 18:33:27 +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
71aa4c75cb Bump tracerestrict version due to weight/power/TE conditionals. 2016-06-30 20:17:45 +01:00
Jonathan G Rennison
e4b932d53a Merge branch 'tracerestrict' into tracerestrict-sx 2016-06-30 20:15:27 +01:00
Jonathan G Rennison
f942de699c Add power/weight and max TE/weight ratio tracerestrict conditionals. 
Minor refactorings.
 2016-06-30 19:31:45 +01:00
Jonathan G Rennison
91ba866852 Fix comment typo. 2016-06-30 18:55:26 +01:00
Jonathan G Rennison
b11d48b431 Update project files 2016-06-30 18:37:39 +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
rubidium
fe0d3761f7 (svn r27606) -Change/fix: GCC6 defaults to C++14, but our configure limits it to C++0x just because we want to use features from C++0x (which are also in C++14), so use the C++ standard that's the GCC6 default 2016-06-27 17:54:05 +00:00
rubidium
dd5e3d9f33 (svn r27605) -Fix: GCC 6 warning about misleading indentation 2016-06-27 17:52:30 +00:00
translators
932951982f (svn r27604) -Update from Eints: 
spanish: 3 changes by SilverSurferZzZ
 2016-06-24 17:45:37 +00:00
Jonathan G Rennison
929327ecaf Merge branch 'template_train_replacement-sx' into jgrpp 2016-06-21 18:56:47 +01:00
Jonathan G Rennison
84e467328f Merge branch 'template_train_replacement' into template_train_replacement-sx 2016-06-21 18:56:40 +01:00
Jonathan G Rennison
ff922f41da Fix NewGRF vehicle variables 4A, FE and FF crashing with virtual trains. 
This is due to attempts to look up the rail type of the current tile.
 2016-06-21 18:56:29 +01:00
translators
60d05aa27d (svn r27603) -Update from Eints: 
spanish: 12 changes by SilverSurferZzZ
 2016-06-19 17:45:36 +00:00
Jonathan G Rennison
cf26d48c9b Add a "SoftClamp" function which tolerates min > max, use for DrawTrainEngine. 2016-06-18 13:22:59 +01:00
Jonathan G Rennison
2cdc4c5fa0 Use preview instead of purchase sprites for engine preview width calc. 2016-06-18 13:22:08 +01:00
Jonathan G Rennison
afb5b625ef Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/rail_cmd.cpp
 2016-06-18 11:12:20 +01:00
Jonathan G Rennison
fe1fee456a Merge branch 'tracerestrict' into tracerestrict-sx 2016-06-18 11:11:18 +01:00
Jonathan G Rennison
a091780843 Fix type mismatch in GRF externals. 2016-06-18 11:10:57 +01:00
frosch
5973140ac2 (svn r27602) -Fix [FS#6481]: Compilation with --disable-network. (Deranged) 2016-06-17 18:56:19 +00:00
translators
3d54c33180 (svn r27601) -Update from Eints: 
spanish (mexican): 4 changes by Absay
 2016-06-13 17:45:37 +00:00
frosch
a073b276ba (svn r27600) -Fix: [NewGRF] shift-and-add-divide/modulo varadjusts use signed division/modulo. 2016-06-13 17:34:18 +00:00
Jonathan G Rennison
3db5b67376 Version: Committing version data for tag: jgrpp-0.13.3 2016-06-12 21:37:31 +01:00
Jonathan G Rennison
6bcd6aec76 Merge branch 'master' into jgrpp 2016-06-12 21:25:38 +01: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
62631cba02 Attempt to log distro name/version in Unix crashlog. 
Factor out fork/execve/read stdout code into own function.
 2016-06-12 20:58:52 +01:00
Jonathan G Rennison
8d078acb4e Log registers and fault instruction in Unix crashlog. 2016-06-12 19:34:06 +01:00
translators
1234b7d0f8 (svn r27599) -Update from Eints: 
persian: 2 changes by rkarimabadi
 2016-06-12 17:45:36 +00:00
Jonathan G Rennison
0951cb320c Show ./configure invocation in crash log. 2016-06-10 23:39:26 +01:00
Jonathan G Rennison
411f91731d Config: Fix --with-self-gdb-debug config re-exec 2016-06-10 23:39:26 +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
e95a24a4e9 Merge branch 'template_train_replacement-sx' into jgrpp 2016-06-10 00:06:16 +01:00
Jonathan G Rennison
ed20e1c61a Merge branch 'template_train_replacement' into template_train_replacement-sx 2016-06-10 00:05:57 +01:00
Jonathan G Rennison
b7aac40da8 Fix deleting an in-use template vehicle, only updating the first group. 2016-06-10 00:05:24 +01:00
frosch
9a7618aeb6 (svn r27598) -Fix: Company 0 could accept engine previews before they were offered. 2016-06-09 19:04:53 +00:00
Jonathan G Rennison
3b42e299aa Merge branch 'town_cargo_adj-sx' into jgrpp 2016-06-06 22:16:18 +01:00
Jonathan G Rennison
947d118595 Merge branch 'town_cargo_adj' into town_cargo_adj-sx 2016-06-06 22:16:10 +01:00
Jonathan G Rennison
5428c9e5ab Fix generation of town cargo other than pax/mail (e.g. ECS tourists). 2016-06-06 22:15:57 +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