Commit Graph

1023 Commits (74681f70d9a557add1d8727b840716ecc69fc277)

Author SHA1 Message Date
Peter Nelson c693463c29 Fix: Always draw dirty blocks, else fast-forward is super fast. 6 years ago
Peter Nelson 806e7d25dd Change: Use GUITimer class instead of bare int/uints. 6 years ago
Peter Nelson 59fe4f28c8 Change: Animate text effects by real time instead of game ticks. 6 years ago
Peter Nelson ead9c9eab5 Change: Switch various window timers to real time instead of game ticks. 6 years ago
Peter Nelson 2a8fa5fef9 Change: Split up Window::OnTick into OnGameTick and OnRealtimeTick. Adjust timers to work with milliseconds instead of ticks. 6 years ago
Jonathan G Rennison 0e7519f33e Merge branch 'more_cond_orders-sx' into jgrpp
# Conflicts:
#	config.lib
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	src/order_gui.cpp
#	src/order_type.h
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
6 years ago
Juanjo 9e30054de9 Codechange: Use window class as expected. 6 years ago
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
6 years ago
Charles Pigott ca5f73b196 Codechange: Turn a define into a constant 6 years ago
Charles Pigott b5028efc1f Fix: Protect against a few out of bounds or uninitialised usage errors 6 years ago
Charles Pigott f5b1115039 Doc: Lots and lots of doxymentation fixes 6 years ago
Jonathan G Rennison f59535c0b7 Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
#	src/train_cmd.cpp
6 years ago
Jonathan G Rennison 60cc1a48ac Refresh trace restrict slots window as with the train list window 6 years ago
Jonathan G Rennison 035f5622b9 Merge branch 'master' into jgrpp
# Conflicts:
#	src/console_cmds.cpp
#	src/landscape.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/openttd.cpp
#	src/roadveh_cmd.cpp
#	src/toolbar_gui.cpp
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/viewport.cpp
#	src/window_type.h
6 years ago
Niels Martin Hansen 2a868b9f3b Feature: Framerate display window (#6822)
Frame rate and various game loop/graphics timing measurements and graphs. Accessible via the Help menu, and can print some stats in the console via the fps command.
6 years ago
Jonathan G Rennison 6573a67b69 Change window allocation/destruction to avoid undefined behaviour
Create a new window base class which holds the front/back pointers
and the window class.
This fixes the voluminous warning spam about deleted windows when using
UndefinedBehaviorSanitizer.
6 years ago
Jonathan G Rennison 03b0931c57 Merge branch 'save_ext' into jgrpp
# Conflicts:
#	src/debug.cpp
#	src/saveload/saveload.cpp
6 years ago
Alexander Weiss 2406500140 Fix: [OSX] Minor 2D scrolling fixes (#6793)
* Codechange: Check for scrollwheel_scrolling first when scrolling viewport instead of first setting normal values and then overwriting them.

* Fix #6558: [OSX] Reset 2D scrolling values when not scrolling to prevent unintended window focus changes

* Change: [OSX] Include initial scrolling movement when using 2D scrolling to make it more responsive

* Fix: [OSX] 2D scrolling not working when setting viewport scroll behaviour to use left mouse button
6 years ago
Jonathan G Rennison fe1e0a9d59 Merge branch 'enhanced_viewport_overlay' into jgrpp 6 years ago
Jonathan G Rennison 64815c0d8a Improve performance of show scrolling viewport on map 6 years ago
Jonathan G Rennison 56be293107 Merge branch 'master' into jgrpp
# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_anim_sse2.cpp
#	src/blitter/32bpp_base.cpp
#	src/blitter/32bpp_base.hpp
#	src/ground_vehicle.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/newgrf_house.cpp
#	src/newgrf_house.h
#	src/town_cmd.cpp
#	src/vehicle_base.h
#	src/viewport_gui.cppp
6 years ago
Alexander Weiss e1a164b531 Change: [OSX] Setting mouse-wheel to scroll the map does not disable pinch to zoom 6 years ago
Jonathan G Rennison ad1c402ad8 Merge branch 'master' into jgrpp
# Conflicts:
#	src/debug.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/settings_type.h
#	src/town_cmd.cpp
#	src/window.cpp
6 years ago
PeterN cfe6a8ea4f
Add: Replace independment map scrolling GUI settings with single option, and add choice to not lock cursor position when scrolling. (#6756) 6 years ago
Jonathan G Rennison 864d94d2c5 Merge branch 'save_ext' into enhanced_viewport_overlay
# Conflicts:
#	src/industry_cmd.cpp
#	src/vehicle.cpp
6 years ago
Jonathan G Rennison 8ab6522e7c Add a monotonically incrementing counter to UpdateWindows calls
This is for checking draw cache validity
7 years ago
Jonathan G Rennison 740e4543c3 Merge branch 'master' into jgrpp
# Conflicts:
#	src/industry_cmd.cpp
7 years ago
michi_cc e856e3cca8 (svn r27934) -Fix (r27900): Warning about unsigned unary minus. 7 years ago
michi_cc 43aa179586 (svn r27934) -Fix (r27900): Warning about unsigned unary minus. 7 years ago
Jonathan G Rennison 5282394b04 Do not attempt to perform viewport scrolling in game bootstrap mode.
Do not increase date in bootstrap mode
7 years ago
Jonathan G Rennison f77a368268 Merge branch 'crashlog_improvements' into jgrpp 7 years ago
Jonathan G Rennison 4a6ddb2d50 Merge branch 'cpp-11' into crashlog_improvements
# Conflicts:
#	config.lib
7 years ago
Jonathan G Rennison 2574e46df8 Merge branch 'save_ext' into enhanced_viewport_overlay
# Conflicts:
#	src/smallmap_gui.cpp
7 years ago
frosch 3e2ec8a545 (svn r27901) -Codechange: GetWindowZPriority only needs a WindowClass; this way it can also be used for WindowDesc before a Window instance is created. (3298) 7 years ago
frosch 09abccd316 (svn r27901) -Codechange: GetWindowZPriority only needs a WindowClass; this way it can also be used for WindowDesc before a Window instance is created. (3298) 7 years ago
frosch 5aecfd11f0 (svn r27900) -Change [FS#6568]: Remove the gap between windows when positioning them after opening.
-Fix: Make automatic window-positioning RTL-aware.
-Fix: Automatic window-positioning now uses GUI-scale/style dependent sizes/distances instead of fixed pixel values.
7 years ago
frosch 80dffae130 (svn r27900) -Change [FS#6568]: Remove the gap between windows when positioning them after opening.
-Fix: Make automatic window-positioning RTL-aware.
-Fix: Automatic window-positioning now uses GUI-scale/style dependent sizes/distances instead of fixed pixel values.
7 years ago
Jonathan G Rennison f34833f111 Merge branch 'improved_breakdowns' into jgrpp
# Conflicts:
#	src/vehiclelist.cpp
7 years ago
frosch a47fb85cd8 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 7 years ago
frosch b4b98e5165 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 7 years ago
Jonathan G Rennison 8317eac918 Merge branch 'save_ext' into jgrpp
# Conflicts:
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/traditional_chinese.txt
#	src/window.cpp
7 years ago
Jonathan G Rennison 83091f55da Merge branch 'vehicle_group_info' into jgrpp 7 years ago
peter1138 95cab27381 (svn r27826) -Fix (r27825): Wrong code style 7 years ago
peter1138 65d77ff317 (svn r27826) -Fix (r27825): Wrong code style 7 years ago
peter1138 0e68f9db70 (svn r27825) -Feature [FS#4950]: Add option to close windows with right click (Flamefire) 7 years ago
peter1138 d934ef9b00 (svn r27825) -Feature [FS#4950]: Add option to close windows with right click (Flamefire) 7 years ago
peter1138 48b9cbbb76 (svn r27816) -Fix [FS#6421]: Do not search directories when opening ini files as we already have their full path. 7 years ago
peter1138 73ea8cdb21 (svn r27816) -Fix [FS#6421]: Do not search directories when opening ini files as we already have their full path. 7 years ago
Jonathan G Rennison 064a36b319 Merge branch 'crashlog_improvements' into jgrpp 7 years ago
Jonathan G Rennison 102405e082 Fix recursive faults in Window crash logger due to message box event loop. 7 years ago
Jonathan G Rennison 5c7f36ef4b Merge branch 'enhanced_viewport_overlay' into jgrpp
Further fixes for viewport lines/marker for multiplayer clients.

# Conflicts:
#	src/lang/russian.txt
8 years ago
Jonathan G Rennison 0d1e08ed75 Merge branch 'save_ext' into enhanced_viewport_overlay
# Conflicts:
#	src/clear_cmd.cpp
8 years ago
frosch dbe969087d (svn r27712) -Codechange: Reduce recursions in DrawOverlappedWindow by limiting the area to the window bounds first. (adf88) 8 years ago
frosch 3419bff4ed (svn r27712) -Codechange: Reduce recursions in DrawOverlappedWindow by limiting the area to the window bounds first. (adf88) 8 years ago
Jonathan G Rennison c20cf31514 Merge branch 'cpp-11' into enhanced_viewport_overlay
# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/smallmap_gui.cpp
8 years ago
Jonathan G Rennison 761463d134 Merge branch 'template_train_replacement-sx' into jgrpp
# Conflicts:
#	src/window.cpp
8 years ago
frosch 0e3e4eeb53 (svn r27628) -Codechange: Prepare for drawing cursors consisting of multiple sprites. 8 years ago
frosch 3cb7d9703b (svn r27628) -Codechange: Prepare for drawing cursors consisting of multiple sprites. 8 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 51e274a523 (svn r27579) -Change [FS#6402]: Performance improvement for dedicated servers by skipping drawing calls earlier in the process. (JGR) 8 years ago
frosch cade383f9b (svn r27579) -Change [FS#6402]: Performance improvement for dedicated servers by skipping drawing calls earlier in the process. (JGR) 8 years ago
Jonathan G Rennison 54b8eb9b4c Merge branch 'polyline_track_tool' into jgrpp
# Conflicts:
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/viewport.cpp
#	src/viewport_func.h
8 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
Jonathan G Rennison ea3198cc25 Merge branch 'save_ext' into enhanced_viewport_overlay-sx 9 years ago
Jonathan G Rennison 8d19727c93 Merge branch 'save_ext' into jgrpp
Conflicts:
	src/pathfinder/follow_track.hpp
9 years ago
frosch c74ffeecd1 (svn r27425) -Fix [FS#5842]: Crash when switching to or taking over companies, when an order window of a vehicle of the new company was opened. Now close those windows. 9 years ago
frosch 44d1fc4253 (svn r27425) -Fix [FS#5842]: Crash when switching to or taking over companies, when an order window of a vehicle of the new company was opened. Now close those windows. 9 years ago
Jonathan G Rennison e24839ed65 Merge branch 'master' into enhanced_viewport_overlay
Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
  Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw

Conflicts:
	src/clear_cmd.cpp
	src/pbs.cpp
	src/rail_cmd.cpp
	src/toolbar_gui.cpp
	src/train_cmd.cpp
	src/vehicle.cpp
	src/viewport.cpp
	src/viewport_func.h
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 7cb07acd86 (svn r27185) -Fix: prevent the compiler from optimizing an assignment away which caused GCC 5 to actually crash 9 years ago
rubidium 06d7d63216 (svn r27185) -Fix: prevent the compiler from optimizing an assignment away which caused GCC 5 to actually crash 9 years ago
frosch 5ebc0c9934 (svn r27147) -Fix: Scale (non-custom) default window sizes according to GUI zoom. 10 years ago
frosch 1cf09f804b (svn r27147) -Fix: Scale (non-custom) default window sizes according to GUI zoom. 10 years ago
frosch abe22e594d (svn r27146) -Fix: Make statusbar and chat-entry window use the same width as the toolbar. Otherwise they lack a size definition. 10 years ago
frosch e113f5e4a1 (svn r27146) -Fix: Make statusbar and chat-entry window use the same width as the toolbar. Otherwise they lack a size definition. 10 years ago
peter1138 2655de52d7 (svn r26990) -Feature: Add option to choose normal, double or quad-size interface. 10 years ago
peter1138 253c91b17d (svn r26990) -Feature: Add option to choose normal, double or quad-size interface. 10 years ago
planetmaker 035fedd30b (svn r26815) -Change: Allow to set the granularity of the tooltip hover time in milliseconds instead of seconds. New default value is 250ms 10 years ago
planetmaker 61e129cc22 (svn r26815) -Change: Allow to set the granularity of the tooltip hover time in milliseconds instead of seconds. New default value is 250ms 10 years ago
alberth ac23e46713 (svn r26610) -Feature: Select an editable preset name for saving. 10 years ago
alberth 8755c26793 (svn r26610) -Feature: Select an editable preset name for saving. 10 years ago
rubidium beb540ec55 (svn r26538) -Codechange: remove double accounting of the drivers 10 years ago
rubidium b476086c39 (svn r26538) -Codechange: remove double accounting of the drivers 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 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
alberth 20b9015d74 (svn r26392) -Fix[FS#5933] No need to call OnFocus twice (MJP) 10 years ago
alberth aee9444c1b (svn r26392) -Fix[FS#5933] No need to call OnFocus twice (MJP) 10 years ago
rubidium 4a911754b5 (svn r26209) -Codechange: remove some template magic and simplify some code 11 years ago
rubidium 2618d960e3 (svn r26209) -Codechange: remove some template magic and simplify some code 11 years ago
rubidium 115877a111 (svn r26122) -Fix-ish: remove essentially dead code; if nested_array were NULL there, it would segfault in RaiseWidget 11 years ago
rubidium 79ccf48636 (svn r26122) -Fix-ish: remove essentially dead code; if nested_array were NULL there, it would segfault in RaiseWidget 11 years ago
frosch f16b78eb81 (svn r25884) -Fix: Resizing the window did not properly resize the viewport window, resulting in the link graph glitching. 11 years ago
frosch c08259fe92 (svn r25884) -Fix: Resizing the window did not properly resize the viewport window, resulting in the link graph glitching. 11 years ago
michi_cc 164aba8732 (svn r25692) -Add: Replacement of a part of the edit box text with a new string. 11 years ago
michi_cc d15c1c5d4a (svn r25692) -Add: Replacement of a part of the edit box text with a new string. 11 years ago
michi_cc e34fe220e2 (svn r25691) -Add: [OSX] Support for mouse selection in the IME composition string. 11 years ago
michi_cc 30867c487f (svn r25691) -Add: [OSX] Support for mouse selection in the IME composition string. 11 years ago
michi_cc 4dbe823a5f (svn r25690) -Change: [OSX] Position the candidate window at the caret position. 11 years ago
michi_cc e2ec0ddb03 (svn r25690) -Change: [OSX] Position the candidate window at the caret position. 11 years ago
michi_cc 88a71979dd (svn r25689) -Add: [OSX] Display the IME composition string ourself. 11 years ago
michi_cc f5e4131492 (svn r25689) -Add: [OSX] Display the IME composition string ourself. 11 years ago
michi_cc d442d97cf1 (svn r25684) -Change: [Win32] Draw the composition string ourselves if possible. 11 years ago
michi_cc 0883cf76e3 (svn r25684) -Change: [Win32] Draw the composition string ourselves if possible. 11 years ago
michi_cc fa7a779cf7 (svn r25681) -Change: [Win32] Position the IME composition window at the caret position. 11 years ago
michi_cc da09fd3077 (svn r25681) -Change: [Win32] Position the IME composition window at the caret position. 11 years ago
michi_cc 1880c36405 (svn r25679) -Codechange: [Win32] Get the result string of an IME input directly without a trip through the window messaging system. 11 years ago
michi_cc 7422120014 (svn r25679) -Codechange: [Win32] Get the result string of an IME input directly without a trip through the window messaging system. 11 years ago
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. 11 years ago
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. 11 years ago
michi_cc be50bc410f (svn r25671) -Codechange: Pass character and key code separately to the keyboard handler. 11 years ago
michi_cc 019984a14f (svn r25671) -Codechange: Pass character and key code separately to the keyboard handler. 11 years ago
michi_cc d5590fa8f2 (svn r25670) -Codechange: Pass UCS-4 characters to the edit box key handler. 11 years ago
michi_cc 270d8aa639 (svn r25670) -Codechange: Pass UCS-4 characters to the edit box key handler. 11 years ago
michi_cc 4b9fdb9ec4 (svn r25667) -Fix: [Win32] Only forward key presses to the IME system if an edit box has the input focus. 11 years ago
michi_cc 923eb009e8 (svn r25667) -Fix: [Win32] Only forward key presses to the IME system if an edit box has the input focus. 11 years ago
frosch 1234bef985 (svn r25647) -Add: If an editbox is configured to be cleared with ESC, but the editbox is already empty, unselect the editbox instead. 11 years ago
frosch a3efc99034 (svn r25647) -Add: If an editbox is configured to be cleared with ESC, but the editbox is already empty, unselect the editbox instead. 11 years ago
frosch 3716b3b892 (svn r25413) -Fix-ish: Suppress focussing editboxes which are not visible. 11 years ago
frosch ee4e68bd5e (svn r25413) -Fix-ish: Suppress focussing editboxes which are not visible. 11 years ago
frosch 611c5aabe0 (svn r25411) -Add: Window::OnHotkey 11 years ago
frosch 6291383823 (svn r25411) -Add: Window::OnHotkey 11 years ago
frosch dd5be60322 (svn r25402) -Fix-ish: Prevent copying of BasePool and WindowDesc, since they register in static vectors. 11 years ago
frosch 18ae9c78bc (svn r25402) -Fix-ish: Prevent copying of BasePool and WindowDesc, since they register in static vectors. 11 years ago
frosch a4ff810a47 (svn r25297) -Fix (r25291): 32bit compilation. 11 years ago
frosch dd826ecbdf (svn r25297) -Fix (r25291): 32bit compilation. 11 years ago
frosch 4518e16da7 (svn r25295) -Feature: Allow saving window sizes as default sizes. 11 years ago
frosch 05c472f08a (svn r25295) -Feature: Allow saving window sizes as default sizes. 11 years ago
frosch 13badddd75 (svn r25294) -Feature: Add another button to window title bars to resize the window to its default size. 11 years ago
frosch 4e4e635916 (svn r25294) -Feature: Add another button to window title bars to resize the window to its default size. 11 years ago
frosch b734305ce2 (svn r25292) -Feature: Save stickyness of windows when Ctrl+Clicking the sticky button. 11 years ago
frosch ed851034f5 (svn r25292) -Feature: Save stickyness of windows when Ctrl+Clicking the sticky button. 11 years ago
frosch b172ed3578 (svn r25291) -Add: WindowDesc ability to load and store information in a config file. 11 years ago
frosch 23ba42b66c (svn r25291) -Add: WindowDesc ability to load and store information in a config 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 aecb5c30ed (svn r25289) -Codechange: Store width of statusbar and main toolbar directly in the WindowDesc. 11 years ago
frosch 8c4714ad90 (svn r25289) -Codechange: Store width of statusbar and main toolbar directly in the WindowDesc. 11 years ago
frosch 8a98b24891 (svn r25288) -Codechange: No need to copy the WindowDesc flags if the WindowDesc is directly accessible. 11 years ago
frosch b6d76c4d4c (svn r25288) -Codechange: No need to copy the WindowDesc flags if the WindowDesc is directly accessible. 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 337460249d (svn r25092) -Codechange: Deduplicate keyboard handling between console and editboxes. 11 years ago
frosch c2c50b0c50 (svn r25092) -Codechange: Deduplicate keyboard handling between console and editboxes. 11 years ago
planetmaker f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
planetmaker c24374f99c (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
glx 00f7ea5927 (svn r24780) -Fix [FS#5378]: passing an int to a function expecting a byte can have side effects when MSVC optimises it 12 years ago
glx 5d74b679e6 (svn r24780) -Fix [FS#5378]: passing an int to a function expecting a byte can have side effects when MSVC optimises it 12 years ago
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. 12 years ago
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. 12 years ago
frosch 42d27b5e17 (svn r24772) -Codechange: Call Window::OnEditboxChanged only when the content changes, not when only moving the cursor. 12 years ago