Jonathan G Rennison
|
1f535915d1
|
Merge branch 'master' into jgrpp-nrt
# Conflicts:
# config.lib
# src/core/bitmath_func.hpp
# src/lang/korean.txt
# src/main_gui.cpp
# src/order_gui.cpp
# src/script/api/script_object.cpp
# src/station_cmd.cpp
# src/video/cocoa/wnd_quartz.mm
|
2019-09-18 01:18:28 +01:00 |
|
glx22
|
b3fd787959
|
Fix #7188: check the validity of command callback for scripts (#7701)
|
2019-09-07 17:37:01 +01:00 |
|
Jonathan G Rennison
|
96f000226e
|
Exclude virtual trains from various vehicle list iterations
|
2019-05-27 17:56:41 +01:00 |
|
Jonathan G Rennison
|
674732cd68
|
Merge: Codechange: Use null pointer literal instead of the NULL macro
|
2019-04-11 18:14:13 +01:00 |
|
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
2019-04-10 23:22:20 +02:00 |
|
Jonathan G Rennison
|
ba34ec7ade
|
Merge branch 'master' into jgrpp
Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
# Makefile.bundle.in
# config.lib
# src/animated_tile.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/build_vehicle_gui.cpp
# src/command.cpp
# src/command_func.h
# src/console_gui.cpp
# src/core/smallstack_type.hpp
# src/date.cpp
# src/debug.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/core/game.h
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_content.cpp
# src/network/network_type.h
# src/network/network_udp.cpp
# src/newgrf_house.h
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/osk_gui.cpp
# src/pathfinder/opf/opf_ship.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.h
# src/station_base.h
# src/station_cmd.cpp
# src/table/gameopt_settings.ini
# src/table/newgrf_debug_data.h
# src/table/settings.ini
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
|
2019-03-27 18:12:04 +00:00 |
|
Henry Wilson
|
c01a2e2a81
|
Codechange: Removed SmallVector completely
|
2019-03-26 20:15:57 +00:00 |
|
Henry Wilson
|
ab711e6942
|
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
|
2019-03-26 20:15:57 +00:00 |
|
Henry Wilson
|
a0f36a50e6
|
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
|
2019-03-26 20:15:57 +00:00 |
|
Henry Wilson
|
81315939b9
|
Codechange: Replaced SmallVector::Find() non-const with std::find()
|
2019-03-26 20:15:57 +00:00 |
|
Henry Wilson
|
a690936ed7
|
Codechange: Replace SmallVector::Length() with std::vector::size()
|
2019-03-26 20:15:57 +00:00 |
|
Henry Wilson
|
bfd79e59dc
|
Codechange: Replace SmallVector::Clear() with std::vector::clear()
|
2019-03-26 20:15:57 +00:00 |
|
Jonathan G Rennison
|
f59535c0b7
|
Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
# src/train_cmd.cpp
|
2018-08-16 05:45:30 +01:00 |
|
Jonathan G Rennison
|
60cc1a48ac
|
Refresh trace restrict slots window as with the train list window
|
2018-08-15 19:38:56 +01:00 |
|
Jonathan G Rennison
|
4a0d949d83
|
Merge branch 'master' into jgrpp
|
2018-01-14 23:22:47 +00:00 |
|
frosch
|
6f36c52736
|
(svn r27936) -Fix: When moving wagons in the depot, the drag highlight did not exactly match the length of the dragged wagon chain.
|
2017-12-10 13:45:53 +00:00 |
|
frosch
|
432edcd4a5
|
(svn r27936) -Fix: When moving wagons in the depot, the drag highlight did not exactly match the length of the dragged wagon chain.
|
2017-12-10 13:45:53 +00:00 |
|
Jonathan G Rennison
|
cea0d42548
|
Merge branch 'master' into jgrpp
|
2016-12-12 19:21:33 +00:00 |
|
frosch
|
1db921bedb
|
(svn r27689) -Fix: MSVC warnings.
|
2016-12-10 14:33:58 +00:00 |
|
frosch
|
149adc9cc1
|
(svn r27689) -Fix: MSVC warnings.
|
2016-12-10 14:33:58 +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
|
a37bb32fd6
|
(svn r27667) -Codechange: Add VehicleSpriteSeq::GetBounds and Draw.
|
2016-10-16 14:58:38 +00:00 |
|
frosch
|
c175067ed9
|
(svn r27667) -Codechange: Add VehicleSpriteSeq::GetBounds and Draw.
|
2016-10-16 14:58:38 +00:00 |
|
frosch
|
f36539837e
|
(svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq.
|
2016-10-16 14:57:56 +00:00 |
|
frosch
|
d2393b4f6c
|
(svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq.
|
2016-10-16 14:57:56 +00:00 |
|
Jonathan G Rennison
|
761463d134
|
Merge branch 'template_train_replacement-sx' into jgrpp
# Conflicts:
# src/window.cpp
|
2016-08-26 00:19:11 +01:00 |
|
frosch
|
0214caaac2
|
(svn r27629) -Fix: When dragging multiple vehicles in the depot, make the destination gap as long as the chain instead of just considering the first vehicle.
|
2016-08-15 18:33:29 +00:00 |
|
frosch
|
cff2b49365
|
(svn r27629) -Fix: When dragging multiple vehicles in the depot, make the destination gap as long as the chain instead of just considering the first vehicle.
|
2016-08-15 18:33:29 +00:00 |
|
Jonathan G Rennison
|
5b2dc8bcd8
|
Fix vehicle needs repair speed limits being incorrect in vehicle details.
|
2016-02-01 00:21:51 +00:00 |
|
Jonathan G Rennison
|
e03d97eab6
|
Improved breakdowns: Fix string parameter count issues.
Fix whitespace.
|
2016-01-31 23:24:17 +00:00 |
|
Jonathan G Rennison
|
80d52eb20e
|
Improved breakdowns patch: fix various issues
* Whitespace/formatting
* Fix setting lang string
* Fix spelling of VRF_TO_HEAVY
|
2015-08-02 23:00:39 +01:00 |
|
patch-import
|
9f5164b403
|
Import Improved Breakdowns patch
Fix trailing whitespace
http://www.tt-forums.net/viewtopic.php?p=1146419#p1146419
|
2015-08-02 22:58:52 +01:00 |
|
frosch
|
8767a11d60
|
(svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad().
|
2015-02-01 20:54:24 +00:00 |
|
frosch
|
a8080b6256
|
(svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad().
|
2015-02-01 20:54:24 +00:00 |
|
peter1138
|
f7f49c15a3
|
(svn r26951) -Codechange: Do the GUI-scale dance for vehicle, depot, and purchase lists.
|
2014-10-04 16:40:23 +00:00 |
|
peter1138
|
ce9fab58bc
|
(svn r26951) -Codechange: Do the GUI-scale dance for vehicle, depot, and purchase lists.
|
2014-10-04 16:40:23 +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 |
|
rubidium
|
0463dbdc9e
|
(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 |
|
rubidium
|
2771de7f34
|
(svn r25454) -Remove/Fix/Cleanup: SETX(Y) does not work at all with other than default fonts, so get rid of it
|
2013-06-24 18:39:19 +00:00 |
|
rubidium
|
7c0f34130c
|
(svn r25454) -Remove/Fix/Cleanup: SETX(Y) does not work at all with other than default fonts, so get rid of it
|
2013-06-24 18:39:19 +00:00 |
|
frosch
|
c5d7445704
|
(svn r25185) -Fix [FS#5508]: Remove ambivalent functions CargoList::Empty() and Count(), and replace them with VehicleCargoList::StoredCount(), TotalCount(), StationCargoList::AvailableCount() and TotalCount(). (fonsinchen)
|
2013-04-13 13:42:08 +00:00 |
|
frosch
|
5eddbb338b
|
(svn r25185) -Fix [FS#5508]: Remove ambivalent functions CargoList::Empty() and Count(), and replace them with VehicleCargoList::StoredCount(), TotalCount(), StationCargoList::AvailableCount() and TotalCount(). (fonsinchen)
|
2013-04-13 13:42:08 +00:00 |
|
frosch
|
8e8d484558
|
(svn r24987) -Fix: When choosing a train in a depot to attach a newly purchased wagon to, do not consider trains currently moving in and out of the depot.
|
2013-02-10 21:05:24 +00:00 |
|
frosch
|
affd456995
|
(svn r24987) -Fix: When choosing a train in a depot to attach a newly purchased wagon to, do not consider trains currently moving in and out of the depot.
|
2013-02-10 21:05:24 +00:00 |
|
planetmaker
|
f00d9976f9
|
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
|
2013-01-08 22:46:42 +00:00 |
|
planetmaker
|
c24374f99c
|
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
|
2013-01-08 22:46:42 +00:00 |
|
frosch
|
3e60f014cc
|
(svn r24352) -Fix: When highlighting the drop position for vehicles in depots, make space for all articulated parts.
|
2012-06-23 14:32:34 +00:00 |
|
frosch
|
9208059e3e
|
(svn r24352) -Fix: When highlighting the drop position for vehicles in depots, make space for all articulated parts.
|
2012-06-23 14:32:34 +00:00 |
|
frosch
|
2f9d982a83
|
(svn r23991) -Fix [FS#5076]: Also display the cargo subtype for vehicles which have no capacity, but a subtype.
|
2012-02-25 20:47:16 +00:00 |
|
frosch
|
031f6ee611
|
(svn r23991) -Fix [FS#5076]: Also display the cargo subtype for vehicles which have no capacity, but a subtype.
|
2012-02-25 20:47:16 +00:00 |
|