Commit Graph

29 Commits (jgrpp)

Author SHA1 Message Date
Jonathan G Rennison 42c8f50551 Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release-linux.yml
#	.github/workflows/release-macos.yml
#	.github/workflows/release-windows.yml
#	.gitignore
#	COMPILING.md
#	src/company_gui.cpp
#	src/date_gui.cpp
#	src/engine.cpp
#	src/engine_func.h
#	src/fileio.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/newgrf_debug_gui.cpp
#	src/newgrf_gui.cpp
#	src/order_gui.cpp
#	src/osk_gui.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/script/api/script_event_types.hpp
#	src/sl/oldloader_sl.cpp
#	src/smallmap_gui.cpp
#	src/station_cmd.cpp
#	src/toolbar_gui.cpp
#	src/town_gui.cpp
#	src/transparency_gui.cpp
#	src/vehicle_gui.cpp
#	src/widget.cpp
#	src/widget_type.h
#	src/widgets/dropdown.cpp
#	src/widgets/dropdown_func.h
#	src/widgets/dropdown_type.h
#	src/widgets/group_widget.h
#	src/widgets/vehicle_widget.h
#	src/window.cpp
#	src/window_gui.h
#	src/window_type.h
5 months ago
Peter Nelson a0dfb76e34 Codechange: Replace mishmash of types for widget index with WidgetID.
Indices were stored as int, but often passed around as uint/uint8_t and casts.

Now they should all use WidgetID.
5 months ago
Jonathan G Rennison 6c3e5642f8 Merge branch 'master' into jgrpp
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/crashlog.cpp
#	src/fileio.cpp
#	src/fileio_func.h
#	src/fios_gui.cpp
#	src/ini_load.cpp
#	src/ini_type.h
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/network/network_client.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/os/windows/win32.cpp
#	src/road_cmd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/table/settings.ini
#	src/tree_cmd.cpp
#	src/tree_gui.cpp
#	src/vehicle_base.h
#	src/video/cocoa/cocoa_v.mm
#	src/video/cocoa/event.mm
#	src/video/cocoa/wnd_quartz.mm
#	src/viewport.cpp
#	src/widgets/tree_widget.h
3 years ago
Niels Martin Hansen 2d9fa81bd0 Feature: Plant clumps of trees in editor by dragging on the landscape 3 years ago
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
5 years ago
S. D. Cloudt 13cc8a0cee Cleanup: Removed SVN headers 5 years ago
patch-import 01cf154f51 Import polyline rail tool patch v10b
http://www.tt-forums.net/viewtopic.php?f=33&t=57080
8 years ago
alberth 7d989073d4 (svn r21627) -Codechange: Remove _place_proc global variable. 14 years ago
alberth 852e647bcc (svn r21627) -Codechange: Remove _place_proc global variable. 14 years ago
rubidium 7127338414 (svn r18872) -Codechange: introduce PaletteID and use it 15 years ago
rubidium f94c83a387 (svn r18872) -Codechange: introduce PaletteID and use it 15 years ago
rubidium 9467b7c6d6 (svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header 15 years ago
rubidium 82fc28f77f (svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header 15 years ago
rubidium 99d46e0ad7 (svn r17248) -Fix: add GPL license notice where appropriate 15 years ago
rubidium 7fbc33dae1 (svn r17248) -Fix: add GPL license notice where appropriate 15 years ago
rubidium e88cb7f70f (svn r16088) -Codechange: merge HighLightStyle and ViewportHighlightMode as they are basically the same thing 15 years ago
rubidium 329cabab4f (svn r16088) -Codechange: merge HighLightStyle and ViewportHighlightMode as they are basically the same thing 15 years ago
frosch 7014833641 (svn r15065) -Change (r14919): Allow to select a new station location by ctrl-clicking while distant-join window is open. (PhilSophus) 16 years ago
frosch 4780c73224 (svn r15065) -Change (r14919): Allow to select a new station location by ctrl-clicking while distant-join window is open. (PhilSophus) 16 years ago
rubidium 4d5b9e38d6 (svn r13160) -Codechange: prepare GUIPlaceProcDragXY for the removal of WindowEvent. 16 years ago
rubidium fc4393dcfe (svn r13160) -Codechange: prepare GUIPlaceProcDragXY for the removal of WindowEvent. 16 years ago
rubidium 2c5db97704 (svn r13011) -Codechange: move PlaceProc_BuyLand out of rail_gui.cpp to the place where it is used and remove some unneeded globalisations of some other PlaceProc functions. 16 years ago
rubidium c74ca38970 (svn r13011) -Codechange: move PlaceProc_BuyLand out of rail_gui.cpp to the place where it is used and remove some unneeded globalisations of some other PlaceProc functions. 16 years ago
rubidium 0c30e46c9c (svn r13010) -Codechange: move the tree building GUI out of misc_gui.cpp. 16 years ago
rubidium cd3dda5c0c (svn r13010) -Codechange: move the tree building GUI out of misc_gui.cpp. 16 years ago
rubidium 8b9ffbe158 (svn r13009) -Codechange: move more tile highlighting related functions/types to tilehighlight_*.h. 16 years ago
rubidium cabd771fc0 (svn r13009) -Codechange: move more tile highlighting related functions/types to tilehighlight_*.h. 16 years ago
rubidium c28ce39e3c (svn r12987) -Codechange: split viewport and tile selection. 16 years ago
rubidium 3d5567ccf7 (svn r12987) -Codechange: split viewport and tile selection. 16 years ago