8715574c4a
Merge branch 'crashlog_improvements' into jgrpp
6 years ago
73c8715eb6
Add LLDB self debug to OSX
6 years ago
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
6 years ago
f5747bf753
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/genworld_gui.cpp
# src/group_gui.cpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/widgets/dropdown.cpp
# src/widgets/dropdown_type.h
6 years ago
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
6 years ago
f887b12be2
Add 3rd party mingw-std-threads headers to fix MinGW compilation
6 years ago
baf9229931
Codechange: Replace AutoDeleteSmallVector with direct std::vector use in text layout code.
6 years ago
329bb52613
Codechange: Store text layout runs directly as values in a std::vector instead of heap allocated.
...
This reduces memory allocations and heap fragmentation.
6 years ago
fbc4cef180
Codechange: Use override specifier for text layout classes.
6 years ago
d5ee9d34da
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# Makefile.src.in
# projects/determineversion.vbs
# source.list
# src/crashlog.cpp
# src/misc.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/rev.h
# src/thread/thread.h
# src/thread/thread_morphos.cpp
# src/thread/thread_none.cpp
# src/thread/thread_os2.cpp
# src/thread/thread_pthread.cpp
# src/thread/thread_win32.cpp
6 years ago
361758b516
Merge branches 'crashlog_improvements', 'save_ext' into jgrpp
...
# Conflicts:
# Makefile.src.in
# 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/core/smallstack_type.hpp
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/linkgraphjob.h
# src/misc.cpp
# src/network/network_udp.cpp
# src/openttd.cpp
# src/saveload/saveload.cpp
6 years ago
3e608afa6c
Fix: [Windows] OpenTTD window may be inactive when an error happens ( #7482 )
6 years ago
967b27a2c1
Codechange: C++11 STL has a function for getting the number of CPU cores.
6 years ago
ae748166d0
Codechange: Use platform independent C++11 function for sleeping on a thread.
6 years ago
05bc2ed7cb
Codechange: Replace custom thread code with C++11 thread objects.
...
We assume a conforming C++11 compiler environment that has a valid <thread>-header.
Failure to run a real thread is handled gracefully.
6 years ago
44c8696b2a
Fix Win32 compilation with WITH_DBGHELP on non-MSVC
6 years ago
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
6 years ago
66dd7c3879
Fix: MSVC warnings ( #7423 )
6 years ago
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
6 years ago
a065d4623e
Codechange: Move 2 constants into the ifdef where they're used
6 years ago
cc62f4163f
Cleanup: Remove unused size template parameters from SmallMap and Auto[Free|Delete]SmallVector
6 years ago
ab711e6942
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
6 years ago
2bc2de9034
Codechange: Replaced SmallVector::Find() with std::find()
6 years ago
a0f36a50e6
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
6 years ago
097328c3d7
Codechange: Replaced SmallVector::Get() const with std alternatives
6 years ago
a690936ed7
Codechange: Replace SmallVector::Length() with std::vector::size()
6 years ago
af7d9020a1
Codechange: Use override specifer for overriding member declarations
...
This is a C++11 feature that allows the compiler to check that a virtual
member declaration overrides a base-class member with the same signature.
Also src/blitter/32bpp_anim_sse4.hpp +38 is no longer erroneously marked
as virtual despite being a template.
6 years ago
5e6d283463
Merge branch 'master' into jgrpp
...
Remove the viewport sign cache as this is now superseded by the kd tree
implementation
# Conflicts:
# src/crashlog.cpp
# src/lang/english.txt
# src/misc.cpp
# src/pathfinder/follow_track.hpp
# src/pbs.cpp
# src/rail_cmd.cpp
# src/saveload/vehicle_sl.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/ship_cmd.cpp
# src/station.cpp
# src/station_base.h
# src/station_cmd.cpp
# src/table/settings.ini
# src/thread/thread_morphos.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/viewport.cpp
# src/waypoint.cpp
6 years ago
f58db44ff2
Remove: BeOS support (deprecated by Haiku)
...
In 10 years there is no commit to change how BeOS works, and we
have no active maintainer for it. It is unlikely it works in its
current state (but not impossible).
With the arrival of SDL2 (and removal of SDL), BeOS is no longer
support. SDL2 suggests to use Haiku instead of BeOS.
6 years ago
7784d77713
Remove: MorphOS / AmigaOS support
...
In 10 years there is no commit to change how MorphOS works, and we
have no active maintainer for it. It is unlikely it works in its
current state (but not impossible).
With the arrival of SDL2 (and removal of SDL), MorphOS is no longer
support. There is an SDL2 port for MorphOS, but it is not maintained
by upstream SDL2, and nobody can currently test it out.
If anyone wants to re-add MorphOS, please do (revert this patch,
fix the problems, and create a Pull Request). If you need any help
doing so, let us know! It is not that we don't like MorphOS, it is
that we don't have anyone fixing the problems :(
6 years ago
7ff252c58d
Merge branch 'master' into jgrpp
...
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/aircraft_cmd.cpp
# src/lang/dutch.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/order_cmd.cpp
# src/settings_gui.cpp
# src/smallmap_gui.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/water_map.h
6 years ago
a67ee02529
Change: Heading for 1.10 now ( #7319 )
6 years ago
3099d6c2c6
Fix compilation on MinGW
...
See: 255fa6e1a8
6 years ago
9d3b77c5a2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fios_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
6 years ago
fa53abe864
Doc: Yearly increment.
6 years ago
281d346fe2
Merge branch 'master' into jgrpp
...
# Conflicts:
# bin/baseset/no_sound.obs
# bin/baseset/orig_dos.obg
# bin/baseset/orig_dos.obs
# bin/baseset/orig_dos_de.obg
# bin/baseset/orig_win.obg
# bin/baseset/orig_win.obm
# bin/baseset/orig_win.obs
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.cpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.cpp
# src/blitter/8bpp_base.hpp
# src/blitter/common.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.cpp
# src/saveload/saveload.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/viewport_func.h
6 years ago
255fa6e1a8
Fix: enable DPI-awareness for MINGW builds
6 years ago
191afd93c1
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/settings.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/vehicle_base.h
# src/widgets/dropdown.cpp
6 years ago
fe8c24e081
Codechange: Remove unnecessarily defined functions under MinGW
6 years ago
2d981a4b2c
Fix: A few minor compile warnings under MinGW
6 years ago
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
92d3358db5
Fix: [Win32] don't mess with std[out|err|in] if we can't allocate a console
6 years ago
2003a86932
Merge remote-tracking branch 'origin/master' into jgrpp
...
# Conflicts:
# src/string.cpp
6 years ago
32ce1ce347
Add: [OSX] Text layout using the native CoreText API.
...
By default, the native API will be used instead of ICU, but if ICU is
forced in using configure, it will take precedence.
6 years ago
4bf216993a
Add: [OSX] Native text caret handling.
6 years ago
8d7cd6a526
Add: [OSX] Native natural sort implementation.
6 years ago
3b8db31a49
Fix: [Win32] Align sprite glyphs to the font baseline when using Uniscribe text layout.
6 years ago
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
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
9490f33a6c
Merge branch 'master' into crashlog_improvements
...
# Conflicts:
# src/console_cmds.cpp
# src/openttd.cpp
# src/vehicle.cpp
6 years ago
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
63898f61b0
Codechange: Rearrange struct packing defines and make MinGW use _Pragma pack style
6 years ago
b48a6ef368
Revert "Revert "Add: [Win32] Uniscribe configure options for MinGW targets.""
...
This reverts commit ca4a4869a2
6 years ago
ca4a4869a2
Revert "Add: [Win32] Uniscribe configure options for MinGW targets."
...
Revert "Change: [Win32] Use Uniscribe instead of ICU for text caret handling."
Revert "Change: [Win32/MSVC] Make the Uniscribe text layouter the windows default and remove usage of the deprecated ICU layout libs."
Revert "Add: [Win32] Text layout using the native Windows Uniscribe library."
Revert "Codechange: Move ParagraphLayouter-specific functions into factory classes instead of relying on overloads."
Revert "Add: [Win32] Native natural sort implementation."
This reverts commit cd966f3810eec3f4093133829dc6ab768a31bfe3a4278c302bf4394debdc#58 .
6 years ago
8e9d68048a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/string.cpp
6 years ago
eec3f40931
Change: [Win32] Use Uniscribe instead of ICU for text caret handling.
...
This removes the need for the ICU lib on Windows.
6 years ago
768a31bfe3
Add: [Win32] Text layout using the native Windows Uniscribe library.
...
Uniscribe is sometimes producing different results compared to ICU, especially
when RTL and LTR content is mixed. Comparing the results to other programs
(like editors or web browsers) leads me to believe that the result are at least
not worse than ICU and possibly better.
6 years ago
f4394debdc
Add: [Win32] Native natural sort implementation.
6 years ago
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
7 years ago
aef69443e7
Remove: WinCE support
7 years ago
85adde7485
Remove: PSP support
7 years ago
1fe0bb76b9
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
7 years ago
f42cc19aad
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# Makefile.src.in
# src/crashlog.cpp
# src/crashlog.h
7 years ago
192770e6da
Change: Non-tag revisions are now named '<commitdate>-<branch>-g<shorthash><modified>'.
7 years ago
6c3902ac41
Codechange: [OSX] Use newer APIs to get resolution information when available.
7 years ago
f670277ff5
Codechange: [OSX] Try to set the thread name for debugger display.
7 years ago
4971678f52
Codechange: [OSX] Use 10.10+ API to get the OSX version when available.
7 years ago
74b7f0a9aa
Fix: [OSX] Remove some OSX compiler warnings on newer SDKs/compilers.
7 years ago
09d4735679
(svn r27993) -Change: Heading for 1.9 now
7 years ago
385a2552e9
Merge branch 'enhanced_viewport_overlay' into jgrpp
7 years ago
91464af737
(svn r27980) -Doc: Yearly increment
7 years ago
b1592787eb
(svn r27980) -Doc: Yearly increment
7 years ago
f77a368268
Merge branch 'crashlog_improvements' into jgrpp
7 years ago
4a6ddb2d50
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# config.lib
7 years ago
2f85326a4a
Increase crashlog length limits
7 years ago
acea2e83fe
Merge branch 'crashlog_improvements' into jgrpp
7 years ago
fd9a2e680c
Fix using crash abort reason string as printf format string
7 years ago
7d960e28b4
Update crash dialog message to point to forum thread and github
...
Instead of bugs.openttd.org
7 years ago
38b446ee0f
Merge branch 'crashlog_improvements' into jgrpp
7 years ago
3271d69bda
Enable crashlogs for emergency or missing NewGRF savegames, in dev mode.
...
Factor out common checks for emergency and missing NewGRFs.
7 years ago
56013d3b91
Mac OSX: Disable Mac assert header globally defining common names.
...
See: https://groups.google.com/a/chromium.org/forum/#!topic/chromium-reviews/a9hZ094JK68
8 years ago
ac69b746ab
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/gfxinit.cpp
# src/saveload/saveload.cpp
8 years ago
afcef7faa6
(svn r27780) -Update: Numbers
8 years ago
ed63b48e76
(svn r27780) -Update: Numbers
8 years ago
15032bd765
(svn r27777) -Doc: Yearly increment
8 years ago
bc61ff380a
(svn r27777) -Doc: Yearly increment
8 years ago
064a36b319
Merge branch 'crashlog_improvements' into jgrpp
8 years ago
102405e082
Fix recursive faults in Window crash logger due to message box event loop.
8 years ago
7f10d83a4a
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/linkgraph/linkgraphjob.cpp
# src/saveload/extended_ver_sl.cpp
# src/train_cmd.cpp
# src/vehicle_base.h
8 years ago
94b3965989
(svn r27675) -Fix [FS#6502]: [OSX] Building with 10.11 or 10.12 SDKs.
8 years ago
4436f96f9f
(svn r27675) -Fix [FS#6502]: [OSX] Building with 10.11 or 10.12 SDKs.
8 years ago
51052f4961
(svn r27674) -Fix (r27673): Mingw...
8 years ago
221c84be66
(svn r27674) -Fix (r27673): Mingw...
8 years ago
c83306391e
(svn r27673) -Add: [Win32] Thread names for windows debuggers.
8 years ago
36cbb54a9d
(svn r27673) -Add: [Win32] Thread names for windows debuggers.
8 years ago
f7774415f2
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# src/stdafx.h
8 years ago
5e67582a64
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/saveload/extended_ver_sl.cpp
# src/saveload/saveload.cpp
8 years ago
95bb103a23
(svn r27643) -Codechange: FiosGetDrives function also takes a destination file list.
8 years ago
f618c0d0a5
(svn r27643) -Codechange: FiosGetDrives function also takes a destination file list.
8 years ago
74ff8b9e8e
Merge branch 'crashlog_improvements' into jgrpp
...
# Conflicts:
# Makefile.src.in
8 years ago
Jonathan G Rennison
Henry Wilson
Michael Lutz
glx22
Charles Pigott
Patric Stout
frosch
Peter Nelson
glx
frosch
michi_cc
alberth