frosch
d9b4413bc9
Codechange: rename sound ids to make more sense. ( #8701 )
4 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
4 years ago
Charles Pigott
9b800a96ed
Codechange: Remove min/max functions in favour of STL variants ( #8502 )
4 years ago
Jonathan G Rennison
bbbda0739b
Add third DoCommand parameter p3
4 years ago
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
5 years ago
glx
ddabfed1cd
Codechange: Replace station related FOR_ALL with range-based for loops
5 years ago
glx
3a14cea068
Codechange: Replace FOR_ALL_COMPANIES with range-based for loops
5 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
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
5 years ago
glx22
b3fd787959
Fix #7188 : check the validity of command callback for scripts ( #7701 )
5 years ago
Jonathan G Rennison
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
6 years ago
Henry Wilson
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
6 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
6 years ago
peter1138
317f69c152
Codechange: Use override specifier in Window-derived classes.
6 years ago
Jonathan G Rennison
e3207a77fb
Add setting to control if and how land purchasing is permitted
6 years ago
Jonathan G Rennison
10320747a9
Allow purchasing a region of tile at once, by dragging
6 years ago
Jonathan G Rennison
f34833f111
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/vehiclelist.cpp
7 years ago
frosch
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
frosch
a47fb85cd8
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
Jonathan G Rennison
09291a3b74
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/train_cmd.cpp
# src/vehicle_base.h
8 years ago
frosch
9aa33862a7
(svn r27571) -Codechange: Consistent naming for command callbacks which play a sound effect.
8 years ago
frosch
14c1a7ad0b
(svn r27571) -Codechange: Consistent naming for command callbacks which play a sound effect.
8 years ago
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
8 years ago
Jonathan G Rennison
95b65163e3
Revert back to v2 of house picking/placing patch.
8 years ago
Jonathan G Rennison
41a06e698f
Merge branch 'house_placing' into jgrpp
...
# Conflicts:
# src/settings_gui.cpp
# src/settings_type.h
# src/town_gui.cpp
9 years ago
Jonathan G Rennison
efa27abde5
Merge branch 'measurement_tool' into jgrpp
9 years ago
Jonathan G Rennison
95eb2dbd32
Change default measurement tool hotkey to shift-R.
...
This is to avoid clashing with the rail remove hotkey.
9 years ago
Jonathan G Rennison
531956bb4d
Merge branch 'house_placing' into jgrpp
9 years ago
Jonathan G Rennison
7bd91f172b
Change house GUI picker logic to be more like object GUI window.
...
Deselect house on object placement abort.
Set object placement on init or house selection.
Adjust display to still work even if no house selected,
by continuing to show the previous selection.
9 years ago
Jonathan G Rennison
0007e6fda2
Merge branch 'master' into house_placing
...
Conflicts:
src/terraform_gui.cpp
9 years ago
alberth
65db59da81
(svn r27397) -Fix(r27346)[FS#6370]: Fix object editing crash in scenario editor (based on work by adf88)
9 years ago
alberth
4cbfe940cb
(svn r27397) -Fix(r27346)[FS#6370]: Fix object editing crash in scenario editor (based on work by adf88)
9 years ago
Jonathan G Rennison
b67d139317
Merge branch 'house_placing' into jgrpp
9 years ago
Jonathan G Rennison
7040d61287
House picker: Allow only one instance, remove button toggle behaviour.
...
This makes it behave more like object picker window.
9 years ago
Jonathan G Rennison
af85ccbbc3
Fix crash when opening object picker window.
...
SELGW = ScenarioEditorLandscapeGenerationWindow
Crash is triggered by the following:
1. SELGW has a OnPlaceObject active (e.g. raise/lower land).
2. SELGW button is clicked to open BuildObjectWindow
3. BuildObjectWindow constructor calls ResetObjectToPlace
4: SELGW::OnPlaceObjectAbort is called
5: DeleteWindowById(WC_BUILD_OBJECT, 0) is called
6: BuildObjectWindow is freed whilst its constructor is executing
7: Crash occurs either through access to this->vscroll
or during the dynamic_cast to get widget: WID_BO_SELECT_MATRIX.
The use-after-free was caught by AddressSanitizer.
9 years ago
Jonathan G Rennison
ce34225b0e
Merge branch 'house_placing' into jgrpp
9 years ago
patch-import
19dcbb1cb9
Import Picking and placing single houses in scenario editor patch
...
Minor whitespace fixes
http://www.tt-forums.net/viewtopic.php?f=33&t=68894&view=unread#p1099696
9 years ago
patch-import
9dfdd8bce8
Import measurement patch
...
http://www.tt-forums.net/viewtopic.php?p=1086160#p1086160
9 years ago
alberth
67366cf03d
(svn r27346) -Feature: Make the object placement gui an independent window.
9 years ago
alberth
4f49d636c1
(svn r27346) -Feature: Make the object placement gui an independent window.
9 years ago
frosch
8767a11d60
(svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad().
10 years ago
frosch
a8080b6256
(svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad().
10 years ago
alberth
b67d483b46
(svn r27084) -Doc: Improve documentation of AllocateWindowDescFront.
10 years ago
alberth
edea2ce96d
(svn r27084) -Doc: Improve documentation of AllocateWindowDescFront.
10 years ago
peter1138
b46e61be63
(svn r26961) -Codechange: GUI-scale for landscape editor terraform window.
10 years ago
peter1138
a573b94867
(svn r26961) -Codechange: GUI-scale for landscape editor terraform window.
10 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
11 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
11 years ago
frosch
5c3b3f84d6
(svn r26422) -Fix [FS#5946]: Some road constructions used the rail sound effect. Rename the enum items to properly reflect their purpose.
11 years ago
frosch
5370613924
(svn r26422) -Fix [FS#5946]: Some road constructions used the rail sound effect. Rename the enum items to properly reflect their purpose.
11 years ago
frosch
173aed1687
(svn r25414) -Codechange: Move handling of global hotkeys to HotkeyList.
11 years ago
frosch
fef30983e6
(svn r25414) -Codechange: Move handling of global hotkeys to HotkeyList.
11 years ago
frosch
303aa2f473
(svn r25412) -Codechange: Make use of Window::OnHotkey
11 years ago
frosch
5cb174c6b8
(svn r25412) -Codechange: Make use of Window::OnHotkey
11 years ago
frosch
1565bb32a0
(svn r25410) -Codechange: Put all hotkeys of a window into a static HotkeyList member.
11 years ago
frosch
1b8b1f3f6c
(svn r25410) -Codechange: Put all hotkeys of a window into a static HotkeyList member.
11 years ago
frosch
55154f91b6
(svn r25408) -Codechange: Simplify hotkeys by removing unused stuff.
11 years ago
frosch
d9e9710cb3
(svn r25408) -Codechange: Simplify hotkeys by removing unused stuff.
11 years ago
frosch
fdd94f7601
(svn r25401) -Fix-ish: Add missing includes with prototypes to functions declared in the cpp file.
11 years ago
frosch
bb308c5e30
(svn r25401) -Fix-ish: Add missing includes with prototypes to functions declared in the cpp file.
11 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
frosch
6e471388e4
(svn r24171) -Fix [FS#4967, FS#5120]: Hide object specs/classes from the GUI, if they will never be available to the user.
13 years ago
frosch
971b3b5fa5
(svn r24171) -Fix [FS#4967, FS#5120]: Hide object specs/classes from the GUI, if they will never be available to the user.
13 years ago
frosch
97608f0814
(svn r24167) -Codechange: Rename NewGRFClass::GetCount() to NewGRFClass::GetClassCount()
13 years ago
frosch
c841a78f69
(svn r24167) -Codechange: Rename NewGRFClass::GetCount() to NewGRFClass::GetClassCount()
13 years ago
truebrain
e054cd36b9
(svn r23547) -Codechange: document and rename widgets to be consistent and understandable
13 years ago
truebrain
e2726ca3f1
(svn r23547) -Codechange: document and rename widgets to be consistent and understandable
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
rubidium
87272273b5
(svn r22405) -Document: some more "random-ish" tidbits
14 years ago
rubidium
1a515e6344
(svn r22405) -Document: some more "random-ish" tidbits
14 years ago
rubidium
cb2c7f871f
(svn r22018) -Cleanup: remove some (now) unneeded includes of functions.h
14 years ago
rubidium
bc3ce1e53b
(svn r22018) -Cleanup: remove some (now) unneeded includes of functions.h
14 years ago
frosch
447f3dbe2c
(svn r21975) -Add: console command to reset the engine pool. It removes the traces of engines which are no longer associated to a NewGRF, and can be used to e.g. 'fix' scenarios which were screwed up by the author. You can only use it when there are no vehicles in the game though.
14 years ago
frosch
915e339d0f
(svn r21975) -Add: console command to reset the engine pool. It removes the traces of engines which are no longer associated to a NewGRF, and can be used to e.g. 'fix' scenarios which were screwed up by the author. You can only use it when there are no vehicles in the game though.
14 years ago
planetmaker
c778568f58
(svn r21929) -Fix [FS#4554]: The town window would not be invalidated in the scenario editor if the ground changed and thus the required cargos for town growth
14 years ago
planetmaker
df8c4bdbfa
(svn r21929) -Fix [FS#4554]: The town window would not be invalidated in the scenario editor if the ground changed and thus the required cargos for town growth
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
alberth
ee189815ec
(svn r21626) -Codechange: Remove more small static functions.
14 years ago
alberth
9a5cce382f
(svn r21626) -Codechange: Remove more small static functions.
14 years ago
alberth
eaf801e174
(svn r21625) -Codechange: Record last started highlight action, and use it in the callback methods.
14 years ago
alberth
62f2771edd
(svn r21625) -Codechange: Record last started highlight action, and use it in the callback methods.
14 years ago
alberth
94fbaf9384
(svn r21624) -Codechange: Remove many small static functions.
14 years ago
alberth
d28d469b7a
(svn r21624) -Codechange: Remove many small static functions.
14 years ago
alberth
8b44c50524
(svn r21623) -Codechange: Remove _terraform_button_proc and _editor_terraform_button_proc arrays.
14 years ago
alberth
d9405a0bcc
(svn r21623) -Codechange: Remove _terraform_button_proc and _editor_terraform_button_proc arrays.
14 years ago
alberth
d5d7a2d88f
(svn r21608) -Codechange: Move diagnonal rectangle dragging detection completely to tile highlighting.
14 years ago
alberth
90780fd25b
(svn r21608) -Codechange: Move diagnonal rectangle dragging detection completely to tile highlighting.
14 years ago
alberth
4caec07b7e
(svn r21539) -Fix [FS#4315]: Show 'plant trees' button lowering of terraform toolbar.
14 years ago