Jonathan G Rennison
40b7d6d335
Import, rebase and make changes to build and refit patch.
...
http://www.tt-forums.net/viewtopic.php?f=33&t=35805
2015-09-12 22:05:00 +01:00
Jonathan G Rennison
8357b911e5
Merge branch 'more_cond_orders-sx' into jgrpp
...
Conflicts:
src/order_base.h
src/order_gui.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
2015-08-26 23:24:41 +01:00
Jonathan G Rennison
ffdd845b1c
Merge branch 'master' into more_cond_orders
...
Conflicts:
src/order_base.h
src/order_gui.cpp
src/saveload/saveload.cpp
src/saveload/saveload.h
2015-08-26 22:51:47 +01:00
patch-import
c757a97214
Import more conditional orders patch
...
http://www.tt-forums.net/viewtopic.php?p=1033223#p1033223
2015-08-26 22:28:20 +01:00
Jonathan G Rennison
19764bb4fb
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
2015-08-11 21:41:58 +01:00
Jonathan G Rennison
388dab7390
Merge branch 'master' into enhanced_viewport_overlay
...
Conflicts:
src/road_gui.cpp
src/widgets/dropdown.cpp
2015-08-11 21:41:41 +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
Jonathan G Rennison
f0fecda985
Merge branch 'order_occupancy-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/settings_gui.cpp
2015-08-09 23:45:21 +01:00
Jonathan G Rennison
117599ec7f
Order occupancy: Add column to orders GUI to show occupancy running average.
...
This is an exponentially weighted moving average of occupancies updated
when any vehicle in the shared order set leaves the station of that order.
The weighting factor is an adv setting.
2015-08-09 23:39:55 +01:00
Jonathan G Rennison
7ed93f9211
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
...
town_gui.cpp updated due to struct CommandContainer change.
Conflicts:
src/command.cpp
src/command_type.h
src/gfxinit.cpp
src/openttd.cpp
src/pbs.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/saveload/saveload.cpp
src/stdafx.h
src/train_cmd.cpp
src/viewport_type.h
src/window_type.h
2015-08-05 21:54:11 +01:00
Jonathan G Rennison
e24839ed65
Merge branch 'master' into enhanced_viewport_overlay
...
Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw
Conflicts:
src/clear_cmd.cpp
src/pbs.cpp
src/rail_cmd.cpp
src/toolbar_gui.cpp
src/train_cmd.cpp
src/vehicle.cpp
src/viewport.cpp
src/viewport_func.h
2015-08-05 21:25:13 +01:00
patch-import
536a95dfd0
Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
...
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
2015-08-05 21:24:30 +01:00
Jonathan G Rennison
ba4e5dd62f
Merge branch 'auto_timetables-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/settings_gui.cpp
src/vehicle.cpp
2015-08-04 22:08:59 +01:00
Jonathan G Rennison
33854a138f
Merge branch 'save_ext' into auto_timetables-sx
2015-08-04 21:30:30 +01:00
patch-import
80deb3c01d
Import auto timetable separation patch
...
http://www.tt-forums.net/viewtopic.php?p=1140899#p1140899
2015-08-04 21:27:23 +01:00
Jonathan G Rennison
c7f4b3fe6f
Merge branch 'smallmap-screenshot' into jgrpp
2015-08-04 02:03:31 +01:00
Jonathan G Rennison
948b4e1d5e
Implement taking smallmap screenshots.
...
This is largely based on this patch:
http://www.tt-forums.net/viewtopic.php?p=849533#p849533
with the following changes:
* this uses a button in the smallmap window instead of a console command
* screenshot now uses zoom level and mode of smallmap window
2015-08-04 01:26:32 +01:00
Jonathan G Rennison
ce34225b0e
Merge branch 'house_placing' into jgrpp
2015-08-03 21:29:22 +01:00
patch-import
19dcbb1cb9
Import Picking and placing single houses in scenario editor patch
...
Minor whitespace fixes
http://www.tt-forums.net/viewtopic.php?f=33&t=68894&view=unread#p1099696
2015-08-03 21:29:13 +01:00
Jonathan G Rennison
3c9c0acba1
Merge branch 'measurement_tool' into jgrpp
2015-08-02 21:06:39 +01:00
patch-import
9dfdd8bce8
Import measurement patch
...
http://www.tt-forums.net/viewtopic.php?p=1086160#p1086160
2015-08-02 21:04:46 +01:00
Jonathan G Rennison
8271acadb7
Merge branch 'show_veh_tunnel' into jgrpp
2015-08-02 18:25:08 +01:00
Jonathan G Rennison
6452b0fe02
Merge branch 'departure-boards-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/window_type.h
2015-08-02 18:23:25 +01:00
Jonathan G Rennison
78b2e5babb
Merge branches 'upgrade_airport' and 'vehicle_group_info' into jgrpp
2015-08-02 18:17:44 +01:00
Jonathan G Rennison
2bcbeea011
Merge branch 'progsig-sx' into jgrpp
...
Conflicts:
src/command.cpp
src/command_type.h
src/lang/english.txt
src/rail_cmd.cpp
src/rail_gui.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/saveload/saveload.cpp
src/widgets/rail_widget.h
src/window_type.h
2015-08-02 18:15:18 +01:00
patch-import
45b5145396
Add group info patch
...
Fix whitespace, add NOSAVE comment in vehicle struct
http://www.tt-forums.net/viewtopic.php?f=33&t=72855
2015-08-02 12:35:18 +01:00
patch-import
79138de1b9
Import departure boards patch
2015-08-01 19:48:19 +01:00
patch-import
fc0efe599e
Port of the programmable signals patch to recent trunk
...
Also add some additional changes from the SpringPP patch,
and make some other minor changes/fixes.
2015-08-01 17:06:43 +01:00
Jonathan G Rennison
5e7638a6d0
Port of old vehicles visible in tunnels patch
...
from http://dev.openttdcoop.org/projects/clientpatches/repository/changes/VehicelsInTunnels.diffhttp://dev.openttdcoop.org/projects/clientpatches/repository/changes/VehicelsInTunnels.diff
2015-07-30 00:32:55 +01:00
Jonathan G Rennison
5f1b148cf9
Initial minimal working tracerestrict implementation.
...
This is a port of the tracerestrict/routing restrictions feature
from TTDPatch.
At present this implements if tests (train length only),
and pathfinder deny and penalty actions.
This requires the use of YAPF. Note that restrictions are only evaluated
within the YAPF lookahead distance.
2015-07-28 01:36:52 +01:00
alberth
da9721ffd6
(svn r27174) -Feature[FS#6236]: Display relative offset changes in the sprite aligner (juzza1).
2015-03-01 08:17:14 +00:00
frosch
18a1131e9f
(svn r27131) -Fix: Dropdown- and tooltip-windows should not steal the focus.
2015-02-01 12:23:39 +00:00
rubidium
0c2f4bdc2b
(svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces)
2014-10-15 18:31:37 +00:00
peter1138
2655de52d7
(svn r26990) -Feature: Add option to choose normal, double or quad-size interface.
2014-10-11 13:22:37 +00:00
rubidium
fa193ece85
(svn r26885) -Feature-ish: user interface for limiting the maximum height of a map
2014-09-21 12:25:04 +00:00
alberth
f24aa8807d
(svn r26811) -Fix[FS#6108]: Fixed spelling error in widget name.
2014-09-11 17:10:38 +00:00
alberth
aa2078a40e
(svn r26805) -Feature: Allow hiding of non-interesting engines in the autoreplace GUI.
2014-09-07 16:14:38 +00:00
alberth
cb3f69f746
(svn r26804) -Feature: Allow hiding of non-interesting engines in the build vehicle GUI.
2014-09-07 16:14:06 +00:00
alberth
5d38e0f24b
(svn r26800) -Feature[FS#1640]: Vehicle sorting in autoreplace GUI.
2014-09-07 16:11:14 +00:00
frosch
a7987ade44
(svn r26691) -Codechange: Simplify ShowDropDownListAt (Juanjo)
2014-07-16 20:38:36 +00:00
frosch
8e99615c7e
(svn r26680) -Codechange: Simplify dropdown height computation. (Juanjo)
2014-07-08 20:07:50 +00:00
frosch
f8def6184b
(svn r26629) -Fix [FS#6012]: If the video driver fails to supply a list of resolutions, display an error message.
2014-06-05 17:14:16 +00:00
alberth
c24998e79f
(svn r26613) -Feature: Upgrade currently active newgrfs to newest installed version.
2014-05-24 19:15:57 +00:00
alberth
ac23e46713
(svn r26610) -Feature: Select an editable preset name for saving.
2014-05-24 19:11:20 +00:00
frosch
f5545aa0b1
(svn r26526) -Remove: Ability to set map generation seed via GUI. If you really need it, use the console.
2014-04-27 15:15:28 +00:00
frosch
9430dfe7fa
(svn r26525) -Remove: Screenshot format setting from GUI.
2014-04-27 15:13:46 +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
planetmaker
6384755793
(svn r26442) -Fix [FS#5962] Silence compiler warning by adding newline at end of file
2014-04-03 10:54:37 +00:00
alberth
e3583b4cd1
(svn r26320) -Add: Label for both the filter category and filter type in the advanced settings window.
2014-02-09 13:04:50 +00:00
rubidium
a1ea310e66
(svn r26128) -Fix: erroneous cast
2013-11-26 15:12:54 +00:00