Jonathan G Rennison
|
3ef1a0943b
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# src/lang/chuvash.txt
# src/lang/czech.txt
# src/lang/english_AU.txt
# src/lang/english_US.txt
# src/lang/german.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/latvian.txt
# src/lang/russian.txt
# src/tree_gui.cpp
# src/vehicle.cpp
|
3 years ago |
Vít Šefl
|
710b758b81
|
Fix #9241: Grove and forest tree brushes also create rainforests (#9542)
|
3 years ago |
|
Jonathan G Rennison
|
b7ddd486cf
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/cargopacket.cpp
# src/cheat_gui.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/core/pool_func.hpp
# src/date.cpp
# src/economy.cpp
# src/error_gui.cpp
# src/ground_vehicle.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/industry_cmd.cpp
# src/lang/dutch.txt
# src/lang/french.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/mcf.cpp
# src/network/network_content.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/newgrf_engine.cpp
# src/newgrf_station.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/station_cmd.cpp
# src/station_kdtree.h
# src/string_func.h
# src/table/settings.ini
# src/tgp.cpp
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/train_gui.cpp
# src/tree_gui.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
# src/viewport.cpp
# src/viewport_sprite_sorter_sse4.cpp
# src/window.cpp
|
3 years 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 |
Charles Pigott
|
9b800a96ed
|
Codechange: Remove min/max functions in favour of STL variants (#8502)
|
4 years ago |
Niels Martin Hansen
|
2d9fa81bd0
|
Feature: Plant clumps of trees in editor by dragging on the landscape
|
4 years ago |
|
Niels Martin Hansen
|
e0ee2d530a
|
Change: Switch tree GUI to use dynamically generated buttons
This makes it look a bit better in climates with fewer tree types.
|
4 years ago |
|
Niels Martin Hansen
|
4d0f19406b
|
Fix: Wrong tree sprite in tree toolbar
|
4 years ago |
|
Jonathan G Rennison
|
a474e71243
|
Viewport: Cache landscape pixels in map mode
Avoid invalidating landscape pixels for non-landscape updates
(vehicles, overlays, etc.)
|
4 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 |
|
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
|
5 years ago |
peter1138
|
317f69c152
|
Codechange: Use override specifier in Window-derived classes.
|
5 years ago |
|
Jonathan G Rennison
|
224e927e0c
|
Fix "remove all trees in scenario editor" being available in game.
|
9 years ago |
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.
|
9 years ago |
|
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
|
9 years ago |
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
|
10 years ago |
|
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
|
10 years ago |
frosch
|
3d451a0e6e
|
(svn r26419) -Cleanup: Remove implementation of BuildTreesWindow::OnPaint since it matches the one of the base class.
|
10 years ago |
|
frosch
|
3352dc7e62
|
(svn r26419) -Cleanup: Remove implementation of BuildTreesWindow::OnPaint since it matches the one of the base class.
|
10 years ago |
|
frosch
|
16feb5c4e9
|
(svn r25290) -Add: Assign string names to notable windows.
|
11 years ago |
|
frosch
|
8157a8afd8
|
(svn r25290) -Add: Assign string names to notable windows.
|
11 years ago |
|
frosch
|
25adefca23
|
(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.
|
11 years ago |
|
frosch
|
56e4a8c4d6
|
(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.
|
11 years ago |
|
frosch
|
336a93a9d8
|
(svn r24846) -Add: Advanced settings to disable certain sound effects.
|
12 years ago |
|
frosch
|
3ce8d2ce70
|
(svn r24846) -Add: Advanced settings to disable certain sound effects.
|
12 years ago |
|
frosch
|
3b06409153
|
(svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default.
|
12 years ago |
|
frosch
|
03736af2ae
|
(svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default.
|
12 years ago |
|
frosch
|
88b8e43090
|
(svn r24697) -Codechange: Use WDF_UNCLICK_BUTTONS instead of duplicating the same functionality.
|
12 years ago |
|
frosch
|
b998cbdff1
|
(svn r24697) -Codechange: Use WDF_UNCLICK_BUTTONS instead of duplicating the same functionality.
|
12 years ago |
michi_cc
|
a0ccae3762
|
(svn r24135) -Remove [FS#4757]: Tree drag size limit.
|
12 years ago |
|
michi_cc
|
ed56585388
|
(svn r24135) -Remove [FS#4757]: Tree drag size limit.
|
12 years ago |
planetmaker
|
44d6bb55a0
|
(svn r23538) -Codechange: Consistent naming of widgets in tree plant gui
|
13 years ago |
|
planetmaker
|
5ade484ce4
|
(svn r23538) -Codechange: Consistent naming of widgets in tree plant gui
|
13 years ago |
truebrain
|
49e88dcbf0
|
(svn r23528) -Codechange: move widget enums to widgets/NNN_type.h
|
13 years ago |
|
truebrain
|
2aa774e831
|
(svn r23528) -Codechange: move widget enums to widgets/NNN_type.h
|
13 years ago |
|
truebrain
|
da63ce43fa
|
(svn r23525) -Codechange: make Window::flags4 WindowFlags instead of uint16, with only values known in WindowFlags (and move out 2 timers to their own variable)
-Codechange: rename Window::flags4 to Window::flags
-Codechange: move some non-inline functions from .hpp to .cpp
|
13 years ago |
|
truebrain
|
df0afdf0dc
|
(svn r23525) -Codechange: make Window::flags4 WindowFlags instead of uint16, with only values known in WindowFlags (and move out 2 timers to their own variable)
-Codechange: rename Window::flags4 to Window::flags
-Codechange: move some non-inline functions from .hpp to .cpp
|
13 years ago |
|
rubidium
|
29e3ffcf8f
|
(svn r22908) -Codechange: silence MSVC warning
|
13 years ago |
|
rubidium
|
db12a5f703
|
(svn r22908) -Codechange: silence MSVC warning
|
13 years ago |
|
planetmaker
|
d25c74112a
|
(svn r22862) -Add: Allow the tree build gui to resize according to tree size
|
13 years ago |
|
planetmaker
|
56c36aed86
|
(svn r22862) -Add: Allow the tree build gui to resize according to tree size
|
13 years ago |
|
frosch
|
4b4a40a72e
|
(svn r22241) -Codechange: Add additional to-be-used parameter to OnInvalidateData().
|
13 years ago |
|
frosch
|
ec9540a12a
|
(svn r22241) -Codechange: Add additional to-be-used parameter to OnInvalidateData().
|
13 years ago |
|
rubidium
|
05199a641a
|
(svn r21890) -Cleanup: remove some unneeded includes
|
14 years ago |
|
rubidium
|
7eba2bf4d3
|
(svn r21890) -Cleanup: remove some unneeded includes
|
14 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 |
|
frosch
|
39a888a0e2
|
(svn r19634) -Codechange: Use TREE_INVALID more consistently.
|
14 years ago |
|
frosch
|
aea2252960
|
(svn r19634) -Codechange: Use TREE_INVALID more consistently.
|
14 years ago |