Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-13 07:10:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,831 Commits 12 Branches 180 Tags 450 MiB
8317eac918
Commit Graph

23831 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
8317eac918 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/traditional_chinese.txt
#	src/window.cpp
 2017-04-01 01:14:28 +01:00
Jonathan G Rennison
86d1a00ba6 Merge branch 'master' into save_ext 2017-04-01 01:10:21 +01:00
Jonathan G Rennison
83091f55da Merge branch 'vehicle_group_info' into jgrpp 2017-04-01 01:02:22 +01:00
Jonathan G Rennison
e4aacee627 Merge branch 'master' into vehicle_group_info 
# Conflicts:
#	src/group_gui.cpp
#	src/saveload/vehicle_sl.cpp
 2017-04-01 01:02:05 +01:00
peter1138
f17d38598a (svn r27838) -Fix: Small news window's fake caption (r19943) was not sized to fit its text. 2017-03-31 23:09:50 +00:00
Jonathan G Rennison
85c7c4b307 Merge branch 'signal_tunnels_bridges' into jgrpp 2017-03-31 22:43:12 +01:00
Jonathan G Rennison
ab595bf67c Fix bridge/tunnel exit PBS signals never being set to green. 2017-03-31 22:43:00 +01:00
Jonathan G Rennison
f4b5efd67d Merge branch 'template_train_replacement' into jgrpp 2017-03-31 14:30:49 +01:00
Jonathan G Rennison
753fc2ab67 TBTR: Fix virtual rail engines not havign build year set. 2017-03-31 14:30:40 +01:00
Jonathan G Rennison
3084cac654 Merge branch 'enhanced_viewport_overlay' into jgrpp 2017-03-31 14:16:01 +01:00
Jonathan G Rennison
f3ed6765a5 Add Ctrl+Click to scroll to plan. 2017-03-31 14:15:36 +01:00
Jonathan G Rennison
a3d21411e7 Add a 'Show All' button to plans GUI. 2017-03-31 14:15:36 +01:00
Jonathan G Rennison
b9e6ad1c6d Plans GUI: Fix various alignment issues. 
Visibility button clicking, double mode, RTL mode, vertical alignment.
 2017-03-31 14:15:36 +01:00
Jonathan G Rennison
ac8b67ba9c Merge branch 'measurement_tool' into jgrpp 2017-03-31 12:12:12 +01:00
Jonathan G Rennison
0172f3acab Fix height above sea-level in measurement tool. 2017-03-31 12:11:20 +01:00
peter1138
60d4d1db3f (svn r27837) -Fix (r26969): Black remap did nothing in 8bpp-simple blitter. 2017-03-30 21:33:40 +00:00
translators
a39bdc14a0 (svn r27836) -Update from Eints: 
catalan: 2 changes by juanjo
 2017-03-30 17:45:36 +00:00
Jonathan G Rennison
48bbe0325d Merge branch 'cpp-11' into save_ext 2017-03-29 19:49:29 +01:00
Jonathan G Rennison
4e9d4dd80a Add a PreCleanPool() static method to pool item types. 
(cherry picked from commit 87142ed840)
 2017-03-29 19:47:25 +01:00
Jonathan G Rennison
a3034891a1 Add missing include guard for dyn arena alloc header. 2017-03-29 19:46:30 +01:00
Jonathan G Rennison
dd0666c5f4 Add support for save/loading std::strings. 2017-03-29 19:41:06 +01:00
Jonathan G Rennison
2fb822d392 Fix includes and header guards of container functions. 2017-03-29 19:39:55 +01:00
translators
4d3d43a70e (svn r27835) -Update from Eints: 
norwegian (bokmal): 37 changes by eirik174
 2017-03-29 17:45:37 +00:00
peter1138
5bcc54e021 (svn r27834) -Change: Parse extmidi command string for parameters to pass on. 2017-03-29 17:36:46 +00:00
peter1138
4f3c7e74e7 (svn r27833) -Change: Trackdir maps directly to TrackdirBits 2017-03-28 21:44:40 +00:00
Jonathan G Rennison
f58fe00294 Merge branch 'master' into save_ext 2017-03-28 02:26:13 +01:00
peter1138
065a0547e2 (svn r27832) -Fix: Missing or incorrect colour codes in translations 2017-03-27 22:00:45 +00:00
peter1138
348607aa89 (svn r27831) -Fix (r24577): Misaligned resize icon (due to widget bounds being inclusive) 2017-03-26 19:07:08 +00:00
translators
485c64fcbe (svn r27830) -Update from Eints: 
catalan: 6 changes by juanjo
italian: 1 change by lorenzodv
russian: 6 changes by Lone_Wolf
 2017-03-26 17:45:37 +00:00
peter1138
01c8ba0d5d (svn r27829) -Fix (r27821): Occasional crash caused by mixing int/uint arithmetic. 2017-03-25 23:19:41 +00:00
translators
7659ec05af (svn r27828) -Update from Eints: 
croatian: 2 changes by VoyagerOne
italian: 6 changes by lorenzodv
english (us): 15 changes by Supercheese
latin: 15 changes by Supercheese
 2017-03-25 18:45:40 +00:00
frosch
98673c94b8 (svn r27827) -Codechange (r27819): Deduplicate code. (adf88) 2017-03-25 12:21:17 +00:00
peter1138
95cab27381 (svn r27826) -Fix (r27825): Wrong code style 2017-03-24 19:25:01 +00:00
peter1138
0e68f9db70 (svn r27825) -Feature [FS#4950]: Add option to close windows with right click (Flamefire) 2017-03-24 18:55:16 +00:00
translators
6ceb8a0d28 (svn r27824) -Update from Eints: 
catalan: 7 changes by juanjo
croatian: 4 changes by VoyagerOne
korean: 15 changes by telk5093
scottish gaelic: 54 changes by GunChleoc
 2017-03-24 18:45:45 +00:00
peter1138
4255e2e136 (svn r27823) -Fix: Vehicle viewport is not user scrollable so flag window as such. 2017-03-24 12:00:52 +00:00
peter1138
0887289e3d (svn r27822) -Feature: Vehicle Group Info: Add profits and occupancy display to group vehicle list (mtm, JGR) 2017-03-24 07:33:31 +00:00
peter1138
2c0ef5c659 (svn r27821) -Change: Draw images in centre of buttons (inspired by Juanjo) 2017-03-23 22:00:00 +00:00
Jonathan G Rennison
0d4bf16f57 Merge branch 'custom_bridgeheads' into jgrpp 2017-03-23 20:15:45 +00:00
Jonathan G Rennison
57a5f08687 Fix handling of custom bridge heads on steep slopes. 2017-03-23 20:15:37 +00:00
peter1138
6da57ed3e8 (svn r27820) -Fix: Allow dropdown to be drawn above origin widget even with scrollbar (Juanjo) 2017-03-23 20:07:59 +00:00
peter1138
abcab89af3 (svn r27819) -Fix (r26990): Update viewport sign dimensions when changing GUI zoom level. 2017-03-23 18:07:04 +00:00
translators
b54d144b28 (svn r27818) -Update from Eints: 
greek: 36 changes by kyrm
 2017-03-22 18:45:40 +00:00
translators
ccf94e8108 (svn r27817) -Update from Eints: 
greek: 39 changes by kyrm
croatian: 7 changes by VoyagerOne
 2017-03-21 18:45:37 +00:00
peter1138
48b9cbbb76 (svn r27816) -Fix [FS#6421]: Do not search directories when opening ini files as we already have their full path. 2017-03-20 19:30:49 +00:00
Jonathan G Rennison
efe30c4299 Merge branch 'tracerestrict-sx' into jgrpp 2017-03-20 19:20:19 +00:00
Jonathan G Rennison
88a524717b Merge branch 'tracerestrict' into tracerestrict-sx 
# Conflicts:
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
 2017-03-20 19:19:18 +00:00
Jonathan G Rennison
58d8a791e4 Merge branch 'save_ext' into tracerestrict-sx 2017-03-20 19:18:34 +00:00
Jonathan G Rennison
2af2a49887 Revert "(svn r27811) -Change: Remove unused parameters in FreeTrainTrackReservation" 
This reverts commit 166e504c13.

These parameters are used for tracerestrict functionality.
 2017-03-20 19:16:32 +00:00
Jonathan G Rennison
f9f2d37a8e Merge branch 'master' into tracerestrict 
# Conflicts:
#	src/saveload/saveload.cpp
 2017-03-20 19:14:48 +00:00