Rubidium
|
f0a1ddd81c
|
Codechange: let FiosBrowseTo return a bool
|
2023-04-29 13:23:34 +02:00 |
|
Jonathan G Rennison
|
6d4474b84e
|
Merge tag '13.0-beta2' into jgrpp
# Conflicts:
# src/cheat_gui.cpp
# src/company_gui.cpp
# src/console_gui.cpp
# src/depot_gui.cpp
# src/error_gui.cpp
# src/gfx.cpp
# src/graph_gui.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/lang/korean.txt
# src/lang/polish.txt
# src/misc_gui.cpp
# src/network/network_content_gui.h
# src/newgrf_debug_gui.cpp
# src/order_gui.cpp
# src/rail_gui.cpp
# src/road_gui.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/station_gui.cpp
# src/subsidy_gui.cpp
# src/table/settings/gui_settings.ini
# src/timetable_gui.cpp
# src/town_gui.cpp
# src/train_cmd.cpp
# src/vehicle_gui.cpp
# src/viewport.cpp
# src/water_cmd.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
|
2022-12-04 20:43:11 +00:00 |
|
Jonathan G Rennison
|
02e19521bc
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/build_vehicle_gui.cpp
# src/cheat_gui.cpp
# src/company_gui.cpp
# src/error_gui.cpp
# src/fios_gui.cpp
# src/gfx_func.h
# src/graph_gui.cpp
# src/group_gui.cpp
# src/misc_gui.cpp
# src/newgrf_debug_gui.cpp
# src/order_gui.cpp
# src/road_gui.cpp
# src/roadveh_gui.cpp
# src/settings_gui.cpp
# src/ship_gui.cpp
# src/station_gui.cpp
# src/statusbar_gui.cpp
# src/subsidy_gui.cpp
# src/timetable_gui.cpp
# src/town_gui.cpp
# src/train_gui.cpp
# src/tree_gui.cpp
# src/vehicle_gui.cpp
# src/widget.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
|
2022-12-04 13:53:44 +00:00 |
|
Peter Nelson
|
890b2666d3
|
Change: Use scaled WidgetDimensions.
|
2022-11-12 18:28:39 +00:00 |
|
Peter Nelson
|
6f95e04005
|
Change: Use Rect helpers for widget drawing.
This replaces repetitive and sometimes unwieldy use of constants.
|
2022-11-12 18:28:39 +00:00 |
|
Jonathan G Rennison
|
6459e62fff
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/lang/english.txt
# src/map_type.h
# src/network/network_command.cpp
# src/object_cmd.cpp
# src/rail_cmd.cpp
# src/road_cmd.cpp
# src/road_func.h
# src/saveload/afterload.cpp
# src/saveload/saveload.h
# src/settings_gui.cpp
# src/string.cpp
# src/table/road_land.h
# src/table/settings/game_settings.ini
# src/table/settings/world_settings.ini
# src/tbtr_template_gui_main.h
# src/train_cmd.cpp
|
2022-11-05 19:24:44 +00:00 |
|
Rubidium
|
d5aafaee15
|
Codechange: rename and move some strings to make them more consistent with the rest of the strings
|
2022-11-02 17:58:44 +01:00 |
|
Jonathan G Rennison
|
0a9c44d1a2
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/airport_gui.cpp
# src/blitter/32bpp_anim_sse4.cpp
# src/console_cmds.cpp
# src/linkgraph/linkgraph_gui.cpp
# src/newgrf_object.h
# src/road_gui.cpp
# src/widgets/road_widget.h
# src/window.cpp
|
2022-10-16 20:14:13 +01:00 |
|
Peter Nelson
|
e8edecf6b1
|
Change: Adjust layout of file windows to fix overlapping widgets.
|
2022-10-11 08:36:59 +01:00 |
|
Jonathan G Rennison
|
23b974fb39
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/fontcache.cpp
# src/openttd.cpp
# src/os/macosx/font_osx.cpp
# src/os/unix/font_unix.cpp
# src/os/windows/font_win32.cpp
# src/strings.cpp
|
2022-10-03 20:32:26 +01:00 |
|
PeterN
|
607ef09fa5
|
Fix: File list mouse hover behaviour. (#10040)
Hover highlight was visible even if the mouse pointer was in a different
window. Resolved by using OnMouseOver() instead of OnMouseLoop().
|
2022-09-21 12:08:11 +01:00 |
|
Michael Lutz
|
13528bfcd0
|
Codechange: Un-bitstuff all remaining commands.
|
2021-12-16 22:28:32 +01:00 |
|
Michael Lutz
|
0f64ee5ce1
|
Codechange: Template DoCommandP to automagically reflect the parameters of the command proc.
When finished, this will allow each command handler to take individually
different parameters, obliviating the need for bit-packing.
|
2021-12-16 22:28:32 +01:00 |
|
Michael Lutz
|
549caca39c
|
Codechange: Move command arguments to the back of the networked command function calls.
|
2021-12-16 22:28:32 +01:00 |
|
Jonathan G Rennison
|
62afd94b47
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# src/company_cmd.cpp
# src/economy.cpp
# src/lang/swedish.txt
# src/network/network_command.cpp
# src/news_gui.cpp
# src/saveload/saveload.h
# src/script/api/script_list.cpp
# src/video/cocoa/cocoa_v.mm
# src/video/sdl2_v.cpp
|
2021-11-01 18:54:43 +00:00 |
|
Jonathan G Rennison
|
fd605e3cf3
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# .github/workflows/commit-checker.yml
# src/company_cmd.cpp
# src/console_cmds.cpp
# src/crashlog.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/indonesian.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/swedish.txt
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/mcf.cpp
# src/network/core/tcp.cpp
# src/network/core/tcp.h
# src/network/core/tcp_game.h
# src/network/core/udp.h
# src/network/network.cpp
# src/network/network_admin.cpp
# src/network/network_admin.h
# src/network/network_chat_gui.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_func.h
# src/network/network_internal.h
# src/network/network_server.cpp
# src/network/network_server.h
# src/newgrf.cpp
# src/newgrf_station.cpp
# src/order_gui.cpp
# src/rail_cmd.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_type.h
# src/station_cmd.cpp
# src/stdafx.h
# src/table/currency_settings.ini
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/table/settings.ini
# src/terraform_cmd.cpp
# src/timetable_gui.cpp
# src/train_cmd.cpp
# src/tree_cmd.cpp
# src/water_cmd.cpp
|
2021-09-27 22:47:23 +01:00 |
|
Jonathan G Rennison
|
da1ac73c02
|
Merge commit 'f1dfa661a1898cde06a38ab4cb230c95912b245b' into jgrpp-beta
# Conflicts:
# src/lang/estonian.txt
# src/lang/hungarian.txt
# src/network/core/game_info.cpp
# src/network/core/game_info.h
# src/network/core/packet.h
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/openttd.cpp
# src/string_func.h
|
2021-09-18 22:10:04 +01:00 |
|
Rubidium
|
281a65b3e1
|
Cleanup: simplify some boolean expressions
|
2021-06-17 16:18:30 +02:00 |
|
glx22
|
5799402f7a
|
Codechange: Rename window related DeleteXXX to match new behaviour
|
2021-05-29 21:08:25 +02:00 |
|
glx22
|
994bf19aef
|
Fix f6d5c01: Delay deletion when closing windows
|
2021-05-29 21:08:25 +02:00 |
|
rubidium42
|
c73d64adf9
|
Codechange: move passwords in settings to std::string
|
2021-05-13 23:13:17 +02:00 |
|
rubidium42
|
6bca9e090d
|
Codechange: add SetDParamStr that accepts std::string&
|
2021-05-06 21:45:36 +02:00 |
|
PeterN
|
9d72eb02f5
|
Cleanup: Remove old FiosList helper methods. (#9139)
(cherry-picked from commit f018471b36)
|
2021-05-06 19:35:57 +01:00 |
|
PeterN
|
f018471b36
|
Cleanup: Remove old FiosList helper methods. (#9139)
|
2021-04-29 22:46:42 +01:00 |
|
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
|
2021-01-31 01:08:35 +00:00 |
|
Jonathan G Rennison
|
15fd63b1b8
|
Fix: Assert fail when using restart command after opening save/load GUI
|
2020-12-30 00:57:09 +01:00 |
|
Michael Lutz
|
65f65ad2ad
|
Codechange: Convert some more FIO functions to take std::string.
|
2020-12-27 13:19:25 +01:00 |
|
Michael Lutz
|
f3326d34e7
|
Codechange: Use std::string in FIO search path handling.
|
2020-12-27 13:19:25 +01:00 |
|
Michael Lutz
|
dd138fc460
|
Codechange: Stringify config file paths.
|
2020-12-27 13:19:25 +01:00 |
|
Jonathan G Rennison
|
530a3a2f4d
|
Fix assert fail when using restart command after opening save/load GUI
|
2020-11-30 19:20:11 +00:00 |
|
Jonathan G Rennison
|
5db169b76f
|
Clear debug data in LoadCheckData::Clear
|
2020-08-27 19:24:33 +01:00 |
|
Jonathan G Rennison
|
f8d6e781ba
|
Merge branch 'master' into jgrpp
# Conflicts:
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj.filters
# src/base_consist.h
# src/company_base.h
# src/newgrf_config.cpp
# src/newgrf_config.h
# src/openttd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/station_sl.cpp
# src/settings.cpp
# src/signs_base.h
# src/string.cpp
# src/string_func.h
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/town_cmd.cpp
# src/vehicle.cpp
# src/vehicle_cmd.cpp
# src/video/cocoa/cocoa_v.mm
# src/video/null_v.cpp
|
2020-05-21 22:24:01 +01:00 |
|
Michael Lutz
|
63ccb36ef3
|
Codechange: Use std::string for most of the user-settable custom names.
|
2020-05-21 20:02:34 +02: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 |
|
Niels Martin Hansen
|
ac3bc30a30
|
Add: Highlight item under mouse in file browser
|
2020-01-05 23:50:00 +01:00 |
|
Niels Martin Hansen
|
838117b05e
|
Doc: Missing member description
|
2020-01-05 23:50:00 +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
|
a30638bc4a
|
Merge branch 'jgrpp' into jgrpp-nrt
|
2019-09-16 22:28:35 +01:00 |
|
Jonathan G Rennison
|
6792495705
|
Add -K switch to write savegame debug data and exit
|
2019-09-15 00:34:32 +01:00 |
|
Jonathan G Rennison
|
6562937899
|
Merge branch 'master' into jgrpp-nrt
# Conflicts:
# src/console_cmds.cpp
# src/script/api/script_order.cpp
# src/station_cmd.cpp
# src/statusbar_gui.cpp
# src/town_gui.cpp
|
2019-08-24 11:00:41 +01:00 |
|
Juriy Petrochenkov
|
d986f01d07
|
Codechange: Reduced indentation in SaveLoadWindow::OnClick
|
2019-08-17 10:39:46 +01:00 |
|
Jonathan G Rennison
|
0d93ecb6bf
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/core/alloc_type.hpp
# src/group_gui.cpp
# src/newgrf.cpp
# src/saveload/economy_sl.cpp
# src/saveload/map_sl.cpp
# src/station_cmd.cpp
|
2019-04-16 18:03:08 +01:00 |
|
glx
|
5b77102b63
|
Codechange: use std::sort() to sort file lists
|
2019-04-13 12:49:18 +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
|
ab711e6942
|
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
|
2019-03-26 20:15:57 +00:00 |
|