Jonathan G Rennison
|
5b78090a61
|
Merge branch 'master' into jgrpp
# Conflicts:
# CMakeLists.txt
# src/saveload/town_sl.cpp
# src/screenshot.h
# src/script/api/ai/ai_date.hpp.sq
# src/script/api/ai/ai_marine.hpp.sq
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_date.hpp.sq
# src/script/api/game/game_marine.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/game/game_window.hpp.sq
# src/script/api/script_window.hpp
# src/script/api/template/template_window.hpp.sq
# src/signal.cpp
# src/statusbar_gui.cpp
# src/toolbar_gui.cpp
# src/viewport.cpp
# src/viewport_func.h
|
2020-08-27 18:31:09 +01:00 |
|
TechGeekNZ
|
a10013dd00
|
Codechange: Spell 'Viewport' consistently
Some places in the codebase misspell 'Viewport' as 'ViewPort' or 'view_port'.
This patch makes everything consistent.
|
2020-07-27 17:31:29 +01:00 |
|
Jonathan G Rennison
|
7960db35f2
|
Merge branch 'master' into jgrpp
# Conflicts:
# config.lib
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj
# projects/openttd_vs142.vcxproj.filters
# src/aircraft_cmd.cpp
# src/base_station_base.h
# src/core/pool_type.hpp
# src/disaster_vehicle.cpp
# src/economy.cpp
# src/engine.cpp
# src/group.h
# src/group_cmd.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/network/network_command.cpp
# src/network/network_server.cpp
# src/openttd.cpp
# src/order_cmd.cpp
# src/road_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/cargopacket_sl.cpp
# src/saveload/linkgraph_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/settings_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train.h
# src/train_cmd.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehiclelist.cpp
# src/window_type.h
|
2020-01-06 18:45:51 +00:00 |
|
glx
|
1f6b3a37f9
|
Codechange: Replace FOR_ALL_ENGINES with range-based for loops
|
2019-12-21 20:13:03 +01:00 |
|
Jonathan G Rennison
|
cbdd9f84d8
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
|
2019-11-12 18:43:10 +00:00 |
|
S. D. Cloudt
|
13cc8a0cee
|
Cleanup: Removed SVN headers
|
2019-11-10 17:59:20 +00:00 |
|
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
|
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
|
58433c7667
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/core/smallmap_type.hpp
# src/lang/korean.txt
# src/network/network_content.cpp
# src/smallmap_gui.cpp
# src/station_cmd.cpp
|
2019-03-30 20:45:58 +00:00 |
|
glx22
|
66dd7c3879
|
Fix: MSVC warnings (#7423)
|
2019-03-28 00:09:33 +01: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
|
a690936ed7
|
Codechange: Replace SmallVector::Length() with std::vector::size()
|
2019-03-26 20:15:57 +00:00 |
|
peter1138
|
317f69c152
|
Codechange: Use override specifier in Window-derived classes.
|
2019-03-24 16:10:04 +01:00 |
|
Jonathan G Rennison
|
7b8db50fd5
|
Add UI setting for whether to open new vehicle GUI when share-cloning
|
2019-02-25 23:04:10 +00:00 |
|
Jonathan G Rennison
|
e735c1a51a
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/aircraft_cmd.cpp
# src/autoreplace_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/script_station.hpp
# src/track_func.h
# src/vehicle_base.h
|
2018-11-05 12:53:36 +00:00 |
|
Alexander Weiss
|
b3dc90af58
|
Change: Clone tool in depot window now behaves like clone button in vehicle window. Keep the tool active when share-cloning. Open the vehicle GUI when copy-cloning. (#6754)
|
2018-10-31 12:51:10 +01:00 |
|
Jonathan G Rennison
|
4a0d949d83
|
Merge branch 'master' into jgrpp
|
2018-01-14 23:22:47 +00:00 |
|
frosch
|
42392fd7b5
|
(svn r27938) -Fix (r27899): When scrolling in the train depot, also scroll the tile separators.
|
2017-12-10 13:48:49 +00:00 |
|
frosch
|
b34418ae60
|
(svn r27938) -Fix (r27899): When scrolling in the train depot, also scroll the tile separators.
|
2017-12-10 13:48:49 +00:00 |
|
frosch
|
c14f23a03d
|
(svn r27937) -Change: When train depots have a horizontal scrollbar, allow scrolling 1 tile beyond the longest train, so you can actually attach a wagon at the end.
|
2017-12-10 13:48:06 +00:00 |
|
frosch
|
c2cddb4cc4
|
(svn r27937) -Change: When train depots have a horizontal scrollbar, allow scrolling 1 tile beyond the longest train, so you can actually attach a wagon at the end.
|
2017-12-10 13:48:06 +00:00 |
|
Jonathan G Rennison
|
f77a368268
|
Merge branch 'crashlog_improvements' into jgrpp
|
2017-09-04 01:23:08 +01:00 |
|
frosch
|
d279bccffa
|
(svn r27899) -Feature: Draw vertical separators at tile distance in the train depot GUI. This only applies if all vehicles use consistent lengths, i.e. either if only using default vehicles, or if only using NewGRF vehicles with 32px reference width. (based on patch by Wolf01)
|
2017-08-26 12:12:59 +00:00 |
|
frosch
|
61c68f906d
|
(svn r27899) -Feature: Draw vertical separators at tile distance in the train depot GUI. This only applies if all vehicles use consistent lengths, i.e. either if only using default vehicles, or if only using NewGRF vehicles with 32px reference width. (based on patch by Wolf01)
|
2017-08-26 12:12:59 +00:00 |
|
Jonathan G Rennison
|
f34833f111
|
Merge branch 'improved_breakdowns' into jgrpp
# Conflicts:
# src/vehiclelist.cpp
|
2017-08-15 19:26:26 +01:00 |
|
frosch
|
a47fb85cd8
|
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
|
2017-08-13 18:38:42 +00:00 |
|
frosch
|
b4b98e5165
|
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
|
2017-08-13 18:38:42 +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
|
caa9bffb56
|
(svn r27630) -Codechange: Deduplicate code to attach vehicle to cursor.
|
2016-08-15 18:33:52 +00:00 |
|
frosch
|
ddc9205212
|
(svn r27630) -Codechange: Deduplicate code to attach vehicle to cursor.
|
2016-08-15 18:33:52 +00:00 |
|
frosch
|
0e3e4eeb53
|
(svn r27628) -Codechange: Prepare for drawing cursors consisting of multiple sprites.
|
2016-08-15 18:33:08 +00:00 |
|
frosch
|
3cb7d9703b
|
(svn r27628) -Codechange: Prepare for drawing cursors consisting of multiple sprites.
|
2016-08-15 18:33:08 +00:00 |
|
Jonathan G Rennison
|
655b329142
|
Merge branch 'master' into jgrpp
# Conflicts:
# config.lib
|
2016-06-02 19:25:23 +01:00 |
|
frosch
|
c5ae45c764
|
(svn r27583) -Fix [FS#6415]: Do not decrease the column width of depot windows when vehicles with high unitnumbers leave. (Airbus)
|
2016-05-29 12:21:40 +00:00 |
|
frosch
|
7d4754a4f8
|
(svn r27583) -Fix [FS#6415]: Do not decrease the column width of depot windows when vehicles with high unitnumbers leave. (Airbus)
|
2016-05-29 12:21:40 +00:00 |
|
Jonathan G Rennison
|
9ee5aecbaf
|
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
|
2015-11-24 01:06:51 +00:00 |
|
alberth
|
e32afcc4ea
|
(svn r27450) -Feature[FS#6391](r27446): Lower the sell-chain button in the train depot GUI while dragging a vehicle over it. (Eearslya)
|
2015-11-20 09:25:27 +00:00 |
|
alberth
|
3ccfc954f3
|
(svn r27450) -Feature[FS#6391](r27446): Lower the sell-chain button in the train depot GUI while dragging a vehicle over it. (Eearslya)
|
2015-11-20 09:25:27 +00:00 |
|
Jonathan G Rennison
|
7ff6ad1e36
|
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
|
2015-11-18 23:33:10 +00:00 |
|
frosch
|
1a0723579b
|
(svn r27446) -Feature: Lower the sell-vehicle button in the depot GUI while dragging a vehicle over it. (Eearslya)
|
2015-11-14 22:54:52 +00:00 |
|
frosch
|
f6891ac30e
|
(svn r27446) -Feature: Lower the sell-vehicle button in the depot GUI while dragging a vehicle over it. (Eearslya)
|
2015-11-14 22:54:52 +00:00 |
|
Jonathan G Rennison
|
a4ad4130a6
|
Merge branch 'master' into infrastructure_sharing
Conflicts:
src/aircraft_cmd.cpp
src/economy.cpp
src/lang/english.txt
src/order_gui.cpp
src/roadveh_cmd.cpp
src/saveload/saveload.cpp
src/settings.cpp
src/settings_gui.cpp
src/train_cmd.cpp
|
2015-08-06 22:55:09 +01:00 |
|
patch-import
|
ee791055f9
|
Import infrastructure sharing patch
Strip trailing whitespace
Remove a leftover line form settings.ini
http://www.tt-forums.net/viewtopic.php?p=1008843#p1008843
|
2015-08-06 22:24:28 +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 |
|
frosch
|
cd3f113249
|
(svn r27133) -Fix: Dragging of free wagons in depot failed with GUI zoom.
|
2015-02-01 19:40:04 +00:00 |
|
frosch
|
3bc7ee3ab7
|
(svn r27133) -Fix: Dragging of free wagons in depot failed with GUI zoom.
|
2015-02-01 19:40:04 +00:00 |
|
rubidium
|
ba96233b6e
|
(svn r27014) -Fix [FS#6102]: unit number was not always fully shown in depots
|
2014-10-14 11:40:38 +00:00 |
|