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

24132 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
0172f3acab Fix height above sea-level in measurement tool. 2017-03-31 12:11:20 +01:00
HackaLittleBit
eddd635f00 Chunnel: Make error reporting consistent with tunnel length reporting at cursor. 
Error reporting should be in tune with occurrence of events.
 2017-03-31 01:54:41 +01:00
Jonathan G Rennison
0772236986 Add a release slot at front of train slot action. 
Distinguish from release slot at back.
Fix slot release and acquire at front when passing PBS from back.
 2017-03-31 01:10:26 +01:00
Jonathan G Rennison
870216d27c Show manage slots in veh/group window drop down even when no vehicles. 2017-03-31 00:08:25 +01:00
Jonathan G Rennison
7dbf99fa33 Add UI setting to hide adv tracerestrict features from GUI 
Hide wait at PBS and slot features.
 2017-03-30 23:32:37 +01:00
Jonathan G Rennison
9d0f0967f9 Enabled loading non-SLXI version 2002 tracerestrict savegames. 2017-03-30 22:52:14 +01:00
Jonathan G Rennison
19e5964b31 Bump tracerestrict version due to wait at PBS and slot features. 2017-03-30 22:49:27 +01:00
peter1138
60d4d1db3f (svn r27837) -Fix (r26969): Black remap did nothing in 8bpp-simple blitter. 2017-03-30 21:33:40 +00:00
Jonathan G Rennison
927323dcb1 Add trace restrict slot membership conditional. 2017-03-30 21:53:30 +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
translators
a39bdc14a0 (svn r27836) -Update from Eints: 
catalan: 2 changes by juanjo
 2017-03-30 17:45:36 +00:00
Jonathan G Rennison
7194e19380 Merge branch 'save_ext' into tracerestrict-sx 2017-03-29 19:52:59 +01: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
Jonathan G Rennison
0430502faa Merge branch 'tracerestrict' into tracerestrict-sx 2017-03-28 02:04:44 +01:00
Jonathan G Rennison
5a2d482c28 Tracerestrict: Add wait at PBS signal action. 2017-03-27 23:30:15 +01:00
peter1138
065a0547e2 (svn r27832) -Fix: Missing or incorrect colour codes in translations 2017-03-27 22:00:45 +00:00
Jonathan G Rennison
c882082467 Chunnel: Fix swap of vehicle chunnel flag when reversing consist. 2017-03-27 18:34:55 +01: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
Jonathan G Rennison
612c825bb6 Chunnel: Minor whitespace/scope changes, rename function. 2017-03-24 22:51:29 +00:00
HackaLittleBit
2549def764 Chunnel: Use separate container function for chunnel related conditions. 2017-03-24 22:40:38 +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