dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,076 Commits 1 Branch 0 Tags
f8d6e781bae9d64c5cc76451abc88feca7697e7b
Commit Graph

84 Commits

Author SHA1 Message Date
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
37bc2f8064 Codechange: Use std::string in the driver and blitter selection code. 2020-05-21 20:02:34 +02:00
Jonathan G Rennison
74b6981d97 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/os/macosx/macos.mm
#	src/video/cocoa/cocoa_v.mm
#	src/video/cocoa/fullscreen.mm
#	src/video/cocoa/wnd_quartz.mm
#	src/video/cocoa/wnd_quickdraw.mm
 2020-04-30 23:59:06 +01:00
Michael Lutz
9dd8b3d430 Remove: [OSX] Stuff that is pre-10.7 from the Cocoa/Quartz video driver. 2020-04-12 18:44:43 +02:00
Michael Lutz
0e5be3887c Remove: [OSX] Old fullscreen subdriver for pre 10.7 systems. 
Since the move to C++11, building for pre 10.7 is not possible with the native
Apple tools. Also, due to bitrot, the file doesn't even compile anymore. While
this could be fixed, it shows that this subdriver is basically never used anymore.
 2020-04-12 18:44:43 +02:00
Michael Lutz
a31cbbf67f Remove: [OSX] QuickDraw video subdriver used for OSX versions up to 10.4. 
Since the C++11 move, getting OpenTTD to compile and run for anything
below 10.7 basically requires building a custom compiler and libc++.
Also, the QuickDraw subdriver crashes on more modern OSX version. While this
is fixable, keeping the driver around is probably pointless.
 2020-04-12 18:44:43 +02: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
ca3c72438e Merge branch 'master' into jgrpp 
# Conflicts:
#	Makefile.bundle.in
#	src/os/macosx/string_osx.cpp
#	src/station_cmd.cpp
 2019-11-06 17:49:00 +00:00
Michael Lutz
d5a9bd404a Codechange: [OSX] Use std::unique_ptr with a custom deleter to simply memory management of Core Foundation types. 2019-11-01 22:32:53 +01:00
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
 2019-09-18 01:18:28 +01:00
Michael Lutz
ed6a427fcc Change: [OSX] Recreate backing store if the colour profile of the screen (or the screen) the game window is one changes. 
This will result in changing colours if moving OpenTTD from one screen to another, but should avoid performance problems if the window is moved.
 2019-09-16 19:11:08 +01:00
Jonathan G Rennison
bd2fdde759 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/core/sort_func.hpp
#	src/rail_cmd.cpp
#	src/timetable_cmd.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
 2019-04-23 08:11:52 +01:00
glx
9195f2337a Codechange: use std::vector for _resolutions 2019-04-18 21:49:34 +02:00
Jonathan G Rennison
674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 2019-04-11 18:14:13 +01:00
Alexander Weiss
3e910a5969 Change: [OSX] Disable macOS Sierra's automatic tab feature 2018-05-27 16:01:08 +02:00
Michael Lutz
e0ae67cefa Fix: [OSX] Compiler warning about an unused NULL argument. 2018-04-21 22:42:14 +02:00
Michael Lutz
6c3902ac41 Codechange: [OSX] Use newer APIs to get resolution information when available. 2018-04-10 23:30:01 +02:00
Michael Lutz
964d310cda Codechange: [OSX] Use non-deprecated API for displaying an alert where supported. 2018-04-10 23:30:01 +02:00
Michael Lutz
74b7f0a9aa Fix: [OSX] Remove some OSX compiler warnings on newer SDKs/compilers. 2018-04-10 23:30:01 +02:00
michi_cc
5a2fd3630b (svn r26818) -Fix [FS#AndyShouldHaveFoundFlySprayByNow] (r26758): [OSX] Line history and scrolling in the console window went on a walk. 2014-09-13 22:00:10 +00:00
michi_cc
2b3b8c93e7 (svn r26758) -Fix [FS#5972]: [OSX] Implement more of the text editing API to prevent crashes and improve IME support. 2014-08-24 10:34:43 +00:00
rubidium
b476086c39 (svn r26538) -Codechange: remove double accounting of the drivers 2014-04-28 21:06:51 +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
781dd48949 (svn r26502) -Fix: OSX compilation error 2014-04-24 18:44:38 +00:00
rubidium
2618d960e3 (svn r26209) -Codechange: remove some template magic and simplify some code 2014-01-02 22:41:58 +00:00
michi_cc
2708aff853 (svn r26023) -Fix [FS#5805] (r25686): [OSX] Checking for a valid NSTextInputContext is supposed to fail on 10.4 according to docs, but somehow didn't, leading to a crash when an edit box lost focus. 2013-11-17 12:05:40 +00:00
michi_cc
8ceef6ec61 (svn r26001) -Fix [FS#5795a] (r25686): [OSX] Clear any pending marked characters from an edit box losing focus. 2013-11-14 23:03:54 +00:00
michi_cc
9b68e4f864 (svn r25962) -Fix (r25951): [OSX] Do the SDK version test the proper way 'round. 2013-11-09 14:47:03 +00:00
michi_cc
a41b8c851d (svn r25951) -Fix [FS#5797]: [OSX] Disable the old fullscreen sub-driver when compiling with SDK versions 10.9+. 2013-11-08 20:18:31 +00:00
michi_cc
a298a62098 (svn r25950) -Codechange: [OSX] Move some functions used by all video sub-drivers into the common source file. 2013-11-08 20:18:27 +00:00
michi_cc
f36396929a (svn r25751) -Fix (r25657): [OSX] Restore fullscreen state also when starting on 10.7+. 2013-08-31 20:17:29 +00:00
fonsinchen
0baa72aff9 (svn r25714) -Fix: explicitly cast some things to silence warnings on GCC 4.0 2013-08-10 12:47:24 +00:00
fonsinchen
a9fde2856c (svn r25710) -Fix: string arguments to NSNotificationCenter::addObserver and NSNotificationCenter::postNotificationName can't be const in certain versions of OSX 2013-08-10 12:47:16 +00:00
michi_cc
b3ecfbb67a (svn r25693) -Add: [OSX] Support the new IME functions introduced with 10.5. 2013-08-05 20:38:02 +00:00
michi_cc
30867c487f (svn r25691) -Add: [OSX] Support for mouse selection in the IME composition string. 2013-08-05 20:37:53 +00:00
michi_cc
e2ec0ddb03 (svn r25690) -Change: [OSX] Position the candidate window at the caret position. 2013-08-05 20:37:48 +00:00
michi_cc
f5e4131492 (svn r25689) -Add: [OSX] Display the IME composition string ourself. 2013-08-05 20:37:44 +00:00
michi_cc
c64e297e0c (svn r25688) -Codechange: [OSX] Make our view aware of text input by IMEs. 2013-08-05 20:37:40 +00:00
michi_cc
643a294e68 (svn r25687) -Codechange: [OSX] Pass text input directly down to the text handling. 2013-08-05 20:37:37 +00:00
michi_cc
e4d48f3a3b (svn r25686) -Codechange: [OSX] Abandon IME input if the edit box lost the focus. 2013-08-05 20:37:33 +00:00
michi_cc
8003da77aa (svn r25665) -Fix [FS#4689]: [OSX] Crash when unhiding the main window. 2013-08-05 20:36:13 +00:00
michi_cc
1ae357e905 (svn r25664) -Add [FS#4847]: [OSX] Bootstrap downloading of a baseset. (Matthieu) 2013-08-05 20:36:10 +00:00
michi_cc
4ec314989d (svn r25660) -Fix: [OSX] The name's OpenTTD, not OTTD. 2013-08-05 20:35:56 +00:00
michi_cc
6d50b10074 (svn r25655) -Fix: [OSX] Mouse cursor wasn't displayed properly after switching to fullscreen on 10.7+. (Based on patch by Maedhros) 2013-08-05 20:35:38 +00:00
rubidium
d5d96ba683 (svn r24877) -Fix: some whitespace "errors" 2013-01-01 10:52:32 +00:00
yexo
1f75f81a41 (svn r24524) -Fix [FS#5296]: fix some compile problems in mac-only code (__ln__) 2012-09-13 18:42:33 +00:00
michi_cc
6dbb050a32 (svn r22999) -Codechange: Allow changing the blitter during the running game. 2011-10-04 21:35:40 +00:00
planetmaker
6a72d64dbe (svn r22943) -Fix: [OSX] Typo broke debug compilation 2011-09-19 05:37:11 +00:00
planetmaker
58f00d786c (svn r22921) -Fix: [OSX] Don't allow the old fullscreen mode also not as fallback on OSX 10.7. Also add a few sprinkles of coding style accross cocoa display drivers 2011-09-11 12:52:44 +00:00