dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,971 Commits 1 Branch 0 Tags
5732e4f7ff6f7a2cd26e0a211c82eaaba925802c
Commit Graph

500 Commits

Author SHA1 Message Date
Jonathan G Rennison
5344ec1931 Add a "leave early" order timetable flag 
Re-arrange timetable GUI slightly.
Add an "extra" drop-down item.
 2018-08-13 01:40:17 +01:00
Jonathan G Rennison
035f5622b9 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/console_cmds.cpp
#	src/landscape.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/openttd.cpp
#	src/roadveh_cmd.cpp
#	src/toolbar_gui.cpp
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/viewport.cpp
#	src/window_type.h
 2018-07-24 18:30:42 +01:00
J0an Josep
8975318286 Fix 2a868b9f3b: Expose widgets and windows to scripts and fix documentation. 2018-07-23 20:32:18 +02:00
Jonathan G Rennison
3ed5d8f09f Add mechanism to lock wait times in timetable against autofill/automate changes 2018-07-19 00:32:24 +01:00
Jonathan G Rennison
8f25bbc93c Fix use of HasBit beyond field width in ShowDropDownMenu masks 2018-06-06 19:24:17 +01:00
Jonathan G Rennison
ad1c402ad8 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/debug.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/settings_type.h
#	src/town_cmd.cpp
#	src/window.cpp
 2018-05-03 23:54:51 +01:00
Joan Josep
944f785be8 Fix: Spelling errors (#6769) 2018-04-30 18:52:32 +02:00
Niels Martin Hansen
19f5a6cbb0 Feature #6090: Change music set during gameplay 2018-04-29 19:26:05 +02:00
keldorkatarn
78588d8ce5 First implementation of conditional order checking slot occupancy 
(cherry picked from commit 524e3e56cb4a357ba60335f91dce1e00cb8d22f2)

Some code adjustments: serialisation/storage, formatting

See: #40
 2018-04-22 15:03:16 +01:00
Jonathan G Rennison
097cf9b0b1 Add UI setting to control whether cargo filter drop down is shown 2017-10-17 00:16:10 +01:00
Jonathan G Rennison
f3c95dd9a7 Add cargo filter support to vehicle list and tracerestrict slot windows 
Refactor out common code
 2017-10-16 22:51:07 +01:00
patch-import
b1613a24f0 Import: Filter vehicles in company vehicles lists by cargo patch 
https://www.tt-forums.net/viewtopic.php?p=1193133#p1193133
 2017-10-16 19:36:29 +01:00
Jonathan G Rennison
51e018c9a4 Merge branch 'departure-boards' into jgrpp 2017-09-22 22:24:57 +01:00
Jonathan G Rennison
07ca7cfb8c Add show passenger and show freight buttons to departure window 2017-09-22 22:24:44 +01:00
Jonathan G Rennison
aa138baec9 Add UI setting for whether programmable signals shown in UI (default off) 
Add setting subcategory for advanced signal features
 2017-09-04 19:25:45 +01:00
Jonathan G Rennison
2e7e712f06 Ctrl+click on shared list button in order/timetable window to add veh to group 2017-08-18 19:17:16 +01:00
Jonathan G Rennison
8c4a3cfb64 Add patchpack info and website to about window. 2017-06-22 19:48:10 +01:00
innocenat
0b8f0e64ec Scheduled Dispatch feature 
Code is tested and run well on small-ish train network. Not tested extensively.
 2017-05-30 01:37:08 +07:00
Jonathan G Rennison
83091f55da Merge branch 'vehicle_group_info' into jgrpp 2017-04-01 01:02:22 +01:00
Jonathan G Rennison
3084cac654 Merge branch 'enhanced_viewport_overlay' into jgrpp 2017-03-31 14:16:01 +01:00
Jonathan G Rennison
a3d21411e7 Add a 'Show All' button to plans GUI. 2017-03-31 14:15:36 +01: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
19d56a33e8 (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
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
902663176d (svn r27820) -Fix: Allow dropdown to be drawn above origin widget even with scrollbar (Juanjo) 2017-03-23 20:07:59 +00:00
Jonathan G Rennison
54494a0a7c Merge branch 'send_money_company' into jgrpp 2017-03-03 22:42:07 +00:00
patch-import
f820543391 Import give money to company patch 
From: https://www.tt-forums.net/viewtopic.php?p=1183311#p1183311

Fix language files and minor formatting issues
 2017-03-02 00:09:23 +00:00
Jonathan G Rennison
90cd312428 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/fios.h
 2017-01-17 19:11:09 +00:00
frosch
050271ed2d (svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message. 2017-01-14 18:30:26 +00:00
frosch
7b553d255e (svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message. 2017-01-14 18:30:26 +00:00
Jonathan G Rennison
0d1e08ed75 Merge branch 'save_ext' into enhanced_viewport_overlay 
# Conflicts:
#	src/clear_cmd.cpp
 2016-12-26 15:35:01 +00:00
Jonathan G Rennison
58381a3ea2 Merge branch 'master' into jgrpp 2016-12-09 00:01:03 +00:00
frosch
da76191afc (svn r27683) -Change: Rearrange the autoreplace GUI for trains, and do not filter it by railtype by default. 2016-12-08 20:21:39 +00:00
frosch
ad43465c31 (svn r27683) -Change: Rearrange the autoreplace GUI for trains, and do not filter it by railtype by default. 2016-12-08 20:21:39 +00:00
Jonathan G Rennison
31b2a39d02 Merge branch 'save_ext' into departure-boards 
Adjust calls to GenerateVehicleSortList due to API change.
 2016-11-11 18:37:52 +00:00
Jonathan G Rennison
7f10d83a4a Merge branch 'template_train_replacement' into jgrpp 
# Conflicts:
#	src/linkgraph/linkgraphjob.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/train_cmd.cpp
#	src/vehicle_base.h
 2016-11-01 23:00:48 +00:00
frosch
77b790cd5a (svn r27671) -Codechange: Replace magic numbers in the toolbar with the already existing WID_TN_xxx. (Wolf01) 2016-10-30 17:36:57 +00:00
frosch
30574a7cad (svn r27671) -Codechange: Replace magic numbers in the toolbar with the already existing WID_TN_xxx. (Wolf01) 2016-10-30 17:36:57 +00:00
Jonathan G Rennison
662d0e94ab When a focused drop-down window is closed, focus the parent. 
This fixes vehicle route line focusing then using the drop-down
menus in the order GUI.
 2016-09-21 23:31:06 +01:00
Jonathan G Rennison
9ea018abc5 Merge branch 'cargo_type_order' into jgrpp 
# Conflicts:
#	src/order_base.h
#	src/order_gui.cpp
#	src/order_type.h
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/vehicle_base.h
 2016-09-08 00:12:48 +01:00
Jonathan G Rennison
c1c983ea16 Import cargo type orders patch 
https://www.tt-forums.net/viewtopic.php?p=1047749#p1047749

Port to current trunk, resolve various conflicts, etc.
Adjust bit allocations for CmdModifyOrder.
Use save_ext framework for added order flags.
 2016-09-04 23:00:10 +01:00
Jonathan G Rennison
f6d374ade4 Merge branch 'house_placing' into jgrpp 
This reverts the house picking/placing patch back to v2.
This is to fix house placement/town growth desync issues introduced in v4.

# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/town_gui.cpp
 2016-05-12 22:57:42 +01:00
Jonathan G Rennison
95b65163e3 Revert back to v2 of house picking/placing patch. 2016-05-12 22:35:39 +01:00
Jonathan G Rennison
4c5173b6bf Merge branch 'auto_timetables-sx' into jgrpp 
# Conflicts:
#	src/lang/english.txt
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/table/company_settings.ini
#	src/vehicle.cpp
 2016-05-08 01:13:35 +01:00
Jonathan G Rennison
d59252d15b Timetable auto separation is now per vehicle, with a company default. 
Remove global on-off setting.
Add button to timetable GUI.
Add company setting to control default for new vehicles.

Fix automate, start date, change time and autofill buttons
being shown enabled for other companies' vehicles.
 2016-05-08 01:12:07 +01:00
Jonathan G Rennison
54b8eb9b4c Merge branch 'polyline_track_tool' into jgrpp 
# Conflicts:
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/viewport.cpp
#	src/viewport_func.h
 2016-04-13 21:14:47 +01:00
patch-import
01cf154f51 Import polyline rail tool patch v10b 
http://www.tt-forums.net/viewtopic.php?f=33&t=57080
 2016-04-13 21:03:51 +01:00
Jonathan G Rennison
41a06e698f Merge branch 'house_placing' into jgrpp 
# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/town_gui.cpp
 2016-04-08 20:15:08 +01:00
patch-import
0fd34a17a5 Update to v4 of house placing patch. 2016-04-08 19:42:10 +01:00
patch-import
2e04f211df Import remove all trees in scenario editor patch. 
http://www.tt-forums.net/viewtopic.php?f=33&t=49326

Update to current current version.
Use CMD_LANDSCAPE_CLEAR instead of CMD_CLEAR_AREA.
Whitespace, misc fixes.
 2016-01-28 00:09:14 +00:00