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 |
|
rubidium42
|
95386dc2b8
|
Codechange: move misc settings to std::string
|
2021-05-13 23:13:17 +02:00 |
|
Peter Nelson
|
1a904590cf
|
Fix: Use unscaled values for padding OSK
(cherry picked from commit 09206be054)
|
2021-05-06 20:11:59 +01:00 |
|
Peter Nelson
|
a469b4f395
|
Fix: Recalculate padding and minimum sizes when GUI or Font zoom is changed.
(cherry picked from commit 4791ff2862)
|
2021-05-06 20:11:55 +01:00 |
|
Peter Nelson
|
7bf0eefd36
|
Codechange: Simplify calling of DrawCharCentered()
(cherry picked from commit 2efa390a7d)
|
2021-05-06 19:59:39 +01:00 |
|
Peter Nelson
|
09206be054
|
Fix: Use unscaled values for padding OSK
|
2021-04-30 17:08:15 +01:00 |
|
Peter Nelson
|
4791ff2862
|
Fix: Recalculate padding and minimum sizes when GUI or Font zoom is changed.
|
2021-04-30 17:08:15 +01:00 |
|
Peter Nelson
|
2efa390a7d
|
Codechange: Simplify calling of DrawCharCentered()
|
2021-04-30 17:08:15 +01:00 |
|
Jonathan G Rennison
|
2e6dbfee05
|
Merge branch 'master' into jgrpp
|
2021-04-05 19:31:34 +01:00 |
|
Peter Nelson
|
b43cc21214
|
Fix: OSK layout not scaled for 2x or 4x GUI scale.
|
2021-03-20 17:55:17 +00:00 |
|
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
|
2021-02-01 17:07:34 +00:00 |
|
Charles Pigott
|
9b800a96ed
|
Codechange: Remove min/max functions in favour of STL variants (#8502)
|
2021-01-08 11:16:18 +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
|
edfd378e93
|
Merge branch 'master' into jgrpp
# Conflicts:
# source.list
# src/blitter/32bpp_anim.cpp
# src/linkgraph/linkgraphjob.cpp
# src/order_cmd.cpp
# src/vehicle.cpp
# src/vehicle_type.h
|
2019-10-05 21:45:54 +01:00 |
|
JMcKiern
|
04f659e768
|
Fix: Some typos found using codespell
|
2019-09-29 21:27:32 +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
|
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 |
|
peter1138
|
317f69c152
|
Codechange: Use override specifier in Window-derived classes.
|
2019-03-24 16:10:04 +01: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 |
|
Charles Pigott
|
f5b1115039
|
Doc: Lots and lots of doxymentation fixes
|
2018-10-31 12:35:54 +01:00 |
|
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
|
2015-08-05 21:24:30 +01:00 |
|
rubidium
|
beb540ec55
|
(svn r26538) -Codechange: remove double accounting of the drivers
|
2014-04-28 21:06:51 +00:00 |
|
rubidium
|
b476086c39
|
(svn r26538) -Codechange: remove double accounting of the drivers
|
2014-04-28 21:06:51 +00:00 |
|
rubidium
|
034735a54c
|
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
|
2014-04-25 15:40:32 +00:00 |
|
rubidium
|
9ed12b0f07
|
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
|
2014-04-25 15:40:32 +00:00 |
|
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
|
2014-04-23 20:13:33 +00:00 |
|
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
|
2014-04-23 20:13:33 +00:00 |
|
michi_cc
|
07cd393f7e
|
(svn r25678) -Codechange: Notify the video driver when an edit box lost (global) focus so it can abort any current input composition.
|
2013-08-05 20:37:02 +00:00 |
|
michi_cc
|
13873d2534
|
(svn r25678) -Codechange: Notify the video driver when an edit box lost (global) focus so it can abort any current input composition.
|
2013-08-05 20:37:02 +00:00 |
|
frosch
|
16feb5c4e9
|
(svn r25290) -Add: Assign string names to notable windows.
|
2013-05-26 19:25:01 +00:00 |
|
frosch
|
8157a8afd8
|
(svn r25290) -Add: Assign string names to notable windows.
|
2013-05-26 19:25:01 +00:00 |
|
frosch
|
25adefca23
|
(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.
|
2013-05-26 19:23:42 +00:00 |
|
frosch
|
56e4a8c4d6
|
(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.
|
2013-05-26 19:23:42 +00:00 |
|
frosch
|
9c23446b2b
|
(svn r25089) -Codechange: Move CharSetFilter from QueryString to Textbuf.
|
2013-03-17 13:04:10 +00:00 |
|
frosch
|
579ee7a592
|
(svn r25089) -Codechange: Move CharSetFilter from QueryString to Textbuf.
|
2013-03-17 13:04:10 +00:00 |
|
frosch
|
a68b7c0068
|
(svn r24774) -Fix: Invert the focus handling of the OSK. Keep the focus at the OSK and close it on losing focus. This makes the editbox in the OSK behave correctly.
|
2012-11-28 21:14:28 +00:00 |
|
frosch
|
5dfd5e58ee
|
(svn r24774) -Fix: Invert the focus handling of the OSK. Keep the focus at the OSK and close it on losing focus. This makes the editbox in the OSK behave correctly.
|
2012-11-28 21:14:28 +00:00 |
|
frosch
|
cffa57c71d
|
(svn r24773) -Fix: Shift in the OSK behaved like capslock.
|
2012-11-28 21:03:34 +00:00 |
|
frosch
|
bfba90f864
|
(svn r24773) -Fix: Shift in the OSK behaved like capslock.
|
2012-11-28 21:03:34 +00:00 |
|
frosch
|
42d27b5e17
|
(svn r24772) -Codechange: Call Window::OnEditboxChanged only when the content changes, not when only moving the cursor.
|
2012-11-28 20:54:56 +00:00 |
|
frosch
|
155a9d784c
|
(svn r24772) -Codechange: Call Window::OnEditboxChanged only when the content changes, not when only moving the cursor.
|
2012-11-28 20:54:56 +00:00 |
|
frosch
|
44d79aa9e5
|
(svn r24746) -Cleanup: Remove weird lowering of editboxes.
|
2012-11-14 22:50:49 +00:00 |
|
frosch
|
aed11012d4
|
(svn r24746) -Cleanup: Remove weird lowering of editboxes.
|
2012-11-14 22:50:49 +00:00 |
|
frosch
|
18dcd2e6a4
|
(svn r24742) -Codechange: Remove QueryStringBaseWindow and store QueryStrings per widget instead.
|
2012-11-14 22:50:35 +00:00 |
|
frosch
|
f5d8ba5d7f
|
(svn r24742) -Codechange: Remove QueryStringBaseWindow and store QueryStrings per widget instead.
|
2012-11-14 22:50:35 +00:00 |
|
frosch
|
838388dcd5
|
(svn r24739) -Codechange: Simplify some code by using Textbuf::Assign.
|
2012-11-14 22:50:21 +00:00 |
|
frosch
|
6653ac6b36
|
(svn r24739) -Codechange: Simplify some code by using Textbuf::Assign.
|
2012-11-14 22:50:21 +00:00 |
|
frosch
|
f1d40ca6f2
|
(svn r24734) -Codechange: Move QueryStringBaseWindow::OnOSKInput to Window::OnEditboxChanged.
|
2012-11-13 21:47:07 +00:00 |
|