Commit Graph

999 Commits (e7909b4bee7b9c776a9ecdb311fc5d6d63035270)

Author SHA1 Message Date
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 65b9a103ad Initial implementation of two rail types per tile 6 years ago
Jonathan G Rennison c1df63a2eb Merge branch 'master' into jgrpp
# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	src/viewport.cpp
6 years ago
Niels Martin Hansen 68e6b5531a Update: Developer credits 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 f5b1115039 Doc: Lots and lots of doxymentation fixes 6 years ago
Niels Martin Hansen 350395a6c2 Fix: Missing m8 data in console when using Query tool
When map array 8 was added, the Query tool wasn't updated to also
print the value there to the console, in debug builds.
6 years ago
Jonathan G Rennison 3a640af71d Merge branch 'master' into jgrpp
# Conflicts:
#	src/ground_vehicle.cpp
#	src/viewport.cpp
6 years ago
Miguel Horta 42b00c3b39 Fix #6938: Don't change company value to perform cost estimations (#6939)
These meddling kids dared to play with magic, but the ancients texts
weren't ready for that.
Refactors logic to estimate costs that dated to even before OpenTTD 0.1;
6 years ago
Jonathan G Rennison 71450881fc Codechange: Avoid call to memcpy using null pointer in TooltipsWindow constructor
Strictly speaking, calling memcpy with src as a nullptr is undefined behaviour
and the optimiser is entitled to delete any null ptr checks which occur afterwards.
This removes the warning emitted by UndefinedBehaviorSantizer.
6 years ago
Jonathan G Rennison 8e9d68048a Merge branch 'master' into jgrpp
# Conflicts:
#	src/string.cpp
6 years ago
Jonathan G Rennison 18d00ff47e Avoid using memcpy from null pointer in TooltipsWindow constructor 6 years ago
Michael Lutz b91e85003e Fix: Theoretical string overflow when building the cargo acceptance list for the land info window. 6 years ago
Jonathan G Rennison 385a2552e9 Merge branch 'enhanced_viewport_overlay' into jgrpp 7 years ago
Jonathan G Rennison 864d94d2c5 Merge branch 'save_ext' into enhanced_viewport_overlay
# Conflicts:
#	src/industry_cmd.cpp
#	src/vehicle.cpp
7 years ago
frosch ebe6564e8b (svn r27979) -Add: adf88 to readme 7 years ago
frosch 6e19cbf219 (svn r27979) -Add: adf88 to readme 7 years ago
Jonathan G Rennison 2574e46df8 Merge branch 'save_ext' into enhanced_viewport_overlay
# Conflicts:
#	src/smallmap_gui.cpp
7 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 8c4a3cfb64 Add patchpack info and website to about window. 7 years ago
Jonathan G Rennison 668702dc7e Merge branch 'enhanced_viewport_overlay' into jgrpp
# Conflicts:
#	src/misc_gui.cpp
8 years ago
Jonathan G Rennison d94e37d9d1 Fix viewport tooltips not being cleared when scrolling using the keyboard.
Fix documentation typo.
8 years ago
Jonathan G Rennison 13a716980a Chunnel: String text adjustments. 8 years ago
HackaLittleBit 7808370f86 Chunnel patch 28399: debug [modified]
Don't remove other debug outputs

https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
8 years ago
Jonathan G Rennison 54494a0a7c Merge branch 'send_money_company' into jgrpp 8 years ago
Jonathan G Rennison 49e922daa6 Remove stub HandleOnEditText and now unused global variables. 8 years ago
Jonathan G Rennison 0d1e08ed75 Merge branch 'save_ext' into enhanced_viewport_overlay
# Conflicts:
#	src/clear_cmd.cpp
8 years ago
Jonathan G Rennison 478ff2538e Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/english.txt
#	src/lang/korean.txt
8 years ago
frosch 4753097c3d (svn r27686) -Change: List railtype of rail tiles explicitly in the tile info window. 8 years ago
frosch 10293c5fb1 (svn r27686) -Change: List railtype of rail tiles explicitly in the tile info window. 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 4c0423d6d8 Merge branch 'master' into jgrpp 9 years ago
matthijs 91ddd32c20 (svn r27560) -Fix: typos in comments and string 9 years ago
matthijs 53982003ee (svn r27560) -Fix: typos in comments and string 9 years ago
Jonathan G Rennison 19764bb4fb Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 9 years ago
Jonathan G Rennison 388dab7390 Merge branch 'master' into enhanced_viewport_overlay
Conflicts:
	src/road_gui.cpp
	src/widgets/dropdown.cpp
9 years ago
michi_cc 44918010df (svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists. 9 years ago
michi_cc 2b8bb12d62 (svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists. 9 years ago
Jonathan G Rennison 7ed93f9211 Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
town_gui.cpp updated due to struct CommandContainer change.

Conflicts:
	src/command.cpp
	src/command_type.h
	src/gfxinit.cpp
	src/openttd.cpp
	src/pbs.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/stdafx.h
	src/train_cmd.cpp
	src/viewport_type.h
	src/window_type.h
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
Jonathan G Rennison 9fc308b70e Update land info window to indicate if signal tile is restricted. 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
frosch 18a1131e9f (svn r27131) -Fix: Dropdown- and tooltip-windows should not steal the focus. 10 years ago
frosch c9114af706 (svn r27131) -Fix: Dropdown- and tooltip-windows should not steal the focus. 10 years ago
rubidium 988b387f14 (svn r27037) -Fix [FS#6150] (r26878): m6 was moved from Tile To TileExtended, but it wasn't properly removed from Tile (patch by Juanjo) 10 years ago
rubidium 8739a7b7d0 (svn r27037) -Fix [FS#6150] (r26878): m6 was moved from Tile To TileExtended, but it wasn't properly removed from Tile (patch by Juanjo) 10 years ago
peter1138 ca4f7b0eca (svn r27023) -Codechange: Scale tooltip size by UI scale. 10 years ago
peter1138 3730ed67cb (svn r27023) -Codechange: Scale tooltip size by UI scale. 10 years ago
peter1138 d408cabca7 (svn r26924) -Codechange: Fit YES/NO query window buttons to window, instead of unaligned. 10 years ago
peter1138 ffe820c792 (svn r26924) -Codechange: Fit YES/NO query window buttons to window, instead of unaligned. 10 years ago
rubidium 337af973b0 (svn r26873) -Change: split type_height into a type and height array (ic111) 10 years ago
rubidium 04e2324b8f (svn r26873) -Change: split type_height into a type and height array (ic111) 10 years ago
planetmaker cd084721b4 (svn r26709) -Fix (r15892 and others) [FS#6069]: [OSX] Compilation fails with some lzo2 versions if we define __LP64__ as 0 instead of checking whether it is defined (kernigh2) 10 years ago
planetmaker bcb9c64ac8 (svn r26709) -Fix (r15892 and others) [FS#6069]: [OSX] Compilation fails with some lzo2 versions if we define __LP64__ as 0 instead of checking whether it is defined (kernigh2) 10 years ago
rubidium 034735a54c (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 11 years ago
rubidium 9ed12b0f07 (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 11 years ago
rubidium 6ecc602050 (svn r26486) -Codechange: replace a number of snprintfs with seprintf 11 years ago
rubidium 5b82822c12 (svn r26486) -Codechange: replace a number of snprintfs with seprintf 11 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 2ce5034005 (svn r26277) -Add [FS#5849]: Display speed limit also for road bridges in the TileInfo window. 11 years ago
frosch f0e7f9982a (svn r26277) -Add [FS#5849]: Display speed limit also for road bridges in the TileInfo window. 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 931bbd7191 (svn r25683) -Add: Support for a marked/selected range to the textbuf. 11 years ago
michi_cc 64d2fc4d1e (svn r25683) -Add: Support for a marked/selected range to the textbuf. 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 872acc5287 (svn r25668) -Codechange: Pass proper Unicode UCS-4 characters instead of just UCS-2 to the window key press handlers. 11 years ago
michi_cc b911f4a452 (svn r25668) -Codechange: Pass proper Unicode UCS-4 characters instead of just UCS-2 to the window key press handlers. 11 years ago
fonsinchen 3c6220c350 (svn r25375) -Update: add fonsinchen to credits 11 years ago
fonsinchen f9b08b1aec (svn r25375) -Update: add fonsinchen to credits 11 years ago
frosch 16feb5c4e9 (svn r25290) -Add: Assign string names to notable windows. 12 years ago
frosch 8157a8afd8 (svn r25290) -Add: Assign string names to notable windows. 12 years ago
frosch 25adefca23 (svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction. 12 years ago
frosch 56e4a8c4d6 (svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction. 12 years ago
frosch 337460249d (svn r25092) -Codechange: Deduplicate keyboard handling between console and editboxes. 12 years ago
frosch c2c50b0c50 (svn r25092) -Codechange: Deduplicate keyboard handling between console and editboxes. 12 years ago
frosch 9c23446b2b (svn r25089) -Codechange: Move CharSetFilter from QueryString to Textbuf. 12 years ago
frosch 579ee7a592 (svn r25089) -Codechange: Move CharSetFilter from QueryString to Textbuf. 12 years ago
rubidium c62cbe04a4 (svn r25011) -Codechange: allow vehicle transfer and profit text effects to be shown at the same time (fonsinchen) 12 years ago
rubidium 446d50f658 (svn r25011) -Codechange: allow vehicle transfer and profit text effects to be shown at the same time (fonsinchen) 12 years ago
rubidium b1ae655ddc (svn r24960) -Fix [FS#5423]: inconsistencies in the "thanks to" lists 12 years ago
rubidium e65a710986 (svn r24960) -Fix [FS#5423]: inconsistencies in the "thanks to" lists 12 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
frosch 18b97fa062 (svn r24785) -Add: Various methods to open the OSK. (based on patch by Eagle_rainbow) 12 years ago
frosch 5b2da98ca3 (svn r24785) -Add: Various methods to open the OSK. (based on patch by Eagle_rainbow) 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