dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,181 Commits 1 Branch 0 Tags
d4fd7f62d1052fb8633af016e045262fa774adda
Commit Graph

234 Commits

Author SHA1 Message Date
Michael Lutz
baf9229931 Codechange: Replace AutoDeleteSmallVector with direct std::vector use in text layout code. 2019-04-09 22:45:15 +02:00
Michael Lutz
329bb52613 Codechange: Store text layout runs directly as values in a std::vector instead of heap allocated. 
This reduces memory allocations and heap fragmentation.
 2019-04-09 22:45:15 +02:00
Michael Lutz
fbc4cef180 Codechange: Use override specifier for text layout classes. 2019-04-09 22:45:15 +02:00
Jonathan G Rennison
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
 2019-04-09 19:21:39 +01:00
Jonathan G Rennison
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
 2019-04-09 19:06:26 +01:00
Michael Lutz
967b27a2c1 Codechange: C++11 STL has a function for getting the number of CPU cores. 2019-04-06 11:27:39 +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
Henry Wilson
cc62f4163f Cleanup: Remove unused size template parameters from SmallMap and Auto[Free|Delete]SmallVector 2019-03-26 20:15:57 +00:00
Henry Wilson
ab711e6942 Codechange: Replaced SmallVector::[Begin|End]() with std alternatives 2019-03-26 20:15:57 +00:00
Henry Wilson
a0f36a50e6 Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back() 2019-03-26 20:15:57 +00:00
Henry Wilson
097328c3d7 Codechange: Replaced SmallVector::Get() const with std alternatives 2019-03-26 20:15:57 +00:00
Henry Wilson
a690936ed7 Codechange: Replace SmallVector::Length() with std::vector::size() 2019-03-26 20:15:57 +00:00
Henry Wilson
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.
 2019-03-24 16:10:04 +01:00
Jonathan G Rennison
2003a86932 Merge remote-tracking branch 'origin/master' into jgrpp 
# Conflicts:
#	src/string.cpp
 2018-12-10 18:40:05 +00:00
Michael Lutz
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.
 2018-12-08 20:13:27 +01:00
Michael Lutz
4bf216993a Add: [OSX] Native text caret handling. 2018-12-08 20:13:27 +01:00
Michael Lutz
8d7cd6a526 Add: [OSX] Native natural sort implementation. 2018-12-08 20:13:27 +01:00
Jonathan G Rennison
1fe0bb76b9 Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp 2018-04-27 02:42:20 +01:00
Jonathan G Rennison
f42cc19aad Merge branch 'cpp-11' into crashlog_improvements 
# Conflicts:
#	Makefile.src.in
#	src/crashlog.cpp
#	src/crashlog.h
 2018-04-27 00:33:44 +01: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
f670277ff5 Codechange: [OSX] Try to set the thread name for debugger display. 2018-04-10 23:30:01 +02:00
Michael Lutz
4971678f52 Codechange: [OSX] Use 10.10+ API to get the OSX version when available. 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
Jonathan G Rennison
f77a368268 Merge branch 'crashlog_improvements' into jgrpp 2017-09-04 01:23:08 +01:00
Jonathan G Rennison
4a6ddb2d50 Merge branch 'cpp-11' into crashlog_improvements 
# Conflicts:
#	config.lib
 2017-09-04 01:22:54 +01:00
Jonathan G Rennison
2f85326a4a Increase crashlog length limits 2017-09-04 00:56:57 +01:00
Jonathan G Rennison
7d960e28b4 Update crash dialog message to point to forum thread and github 
Instead of bugs.openttd.org
 2017-06-22 19:41:01 +01:00
Jonathan G Rennison
38b446ee0f Merge branch 'crashlog_improvements' into jgrpp 2017-06-22 19:33:52 +01:00
Jonathan G Rennison
3271d69bda Enable crashlogs for emergency or missing NewGRF savegames, in dev mode. 
Factor out common checks for emergency and missing NewGRFs.
 2017-06-22 19:30:37 +01:00
Jonathan G Rennison
56013d3b91 Mac OSX: Disable Mac assert header globally defining common names. 
See: https://groups.google.com/a/chromium.org/forum/#!topic/chromium-reviews/a9hZ094JK68
 2017-04-12 17:54:14 +01:00
michi_cc
94b3965989 (svn r27675) -Fix [FS#6502]: [OSX] Building with 10.11 or 10.12 SDKs. 2016-10-31 19:29:01 +00:00
michi_cc
4436f96f9f (svn r27675) -Fix [FS#6502]: [OSX] Building with 10.11 or 10.12 SDKs. 2016-10-31 19:29:01 +00:00
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) 2014-07-30 20:19:29 +00:00
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) 2014-07-30 20:19:29 +00:00
frosch
ef4c2ce031 (svn r26485) -Codechange: Replace ttd_strlcpy and ttd_strlcat with strecpy and strecat. 2014-04-23 20:44:42 +00:00
frosch
24c7134bff (svn r26485) -Codechange: Replace ttd_strlcpy and ttd_strlcat with strecpy and strecat. 2014-04-23 20:44:42 +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
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
2618d960e3 (svn r26209) -Codechange: remove some template magic and simplify some code 2014-01-02 22:41:58 +00:00
rubidium
4a911754b5 (svn r26209) -Codechange: remove some template magic and simplify some code 2014-01-02 22:41:58 +00:00
michi_cc
dce0951fdc (svn r25913) -Fix: [OSX] Compilation under OSX 10.9. (zydeco) 2013-10-26 17:20:48 +00:00
michi_cc
039b1f692c (svn r25913) -Fix: [OSX] Compilation under OSX 10.9. (zydeco) 2013-10-26 17:20:48 +00:00
michi_cc
8b476de3bf (svn r25666) -Feature [FS#4760]: [OSX] Pinch gesture support for zooming. (Based on patch by leecbaker) 2013-08-05 20:36:17 +00:00
michi_cc
21120665e3 (svn r25666) -Feature [FS#4760]: [OSX] Pinch gesture support for zooming. (Based on patch by leecbaker) 2013-08-05 20:36:17 +00:00
michi_cc
3569a4fe5a (svn r25663) -Fix [FS#4857]: [OSX] Monospace font detection. 2013-08-05 20:36:06 +00:00
michi_cc
3cd7eeb160 (svn r25663) -Fix [FS#4857]: [OSX] Monospace font detection. 2013-08-05 20:36:06 +00:00
planetmaker
1024fd3116 (svn r25643) -Fix (r25480): [OSX] Define version constants before they're used 2013-07-31 18:50:01 +00:00
planetmaker
f613faac19 (svn r25643) -Fix (r25480): [OSX] Define version constants before they're used 2013-07-31 18:50:01 +00:00
michi_cc
0150ab1bb2 (svn r25480) -Codechange: [OSX] OS X SDK versions >= 10.5 always have a non-const iconv declaration. 2013-06-26 21:17:09 +00:00
michi_cc
ac583fc787 (svn r25480) -Codechange: [OSX] OS X SDK versions >= 10.5 always have a non-const iconv declaration. 2013-06-26 21:17:09 +00:00