Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-10-31 15:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,770 Commits 12 Branches 178 Tags 449 MiB
8e9d68048a
Commit Graph

312 Commits

Author SHA1 Message Date
Jonathan G Rennison
8e9d68048a Merge branch 'master' into jgrpp 
# Conflicts:
#	src/string.cpp
 2018-06-07 06:49:18 +01:00
Michael Lutz
eec3f40931 Change: [Win32] Use Uniscribe instead of ICU for text caret handling. 
This removes the need for the ICU lib on Windows.
 2018-06-06 21:37:09 +02:00
Michael Lutz
33829dc6ab Change: [Win32/MSVC] Make the Uniscribe text layouter the windows default and remove usage of the deprecated ICU layout libs. 2018-06-06 21:37:09 +02:00
Michael Lutz
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.
 2018-06-06 21:37:09 +02:00
Jonathan G Rennison
03b0931c57 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	src/debug.cpp
#	src/saveload/saveload.cpp
 2018-06-01 23:32:33 +01:00
Jonathan G Rennison
decd749d30 Merge branch 'master' into save_ext 2018-06-01 23:25:12 +01:00
Jonathan G Rennison
159909f4b1 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	src/saveload/saveload.cpp
 2018-05-29 12:23:56 +01:00
Jonathan G Rennison
aae7806d5d Move save/load ReadBuffer and MemoryDumper to separate header 
Add static accessors
 2018-05-29 00:21:39 +01:00
Michael Lutz
a6300fe70b Change: [Win32] Enable DirectMusic driver for Win64. 2018-05-26 22:28:01 +02:00
Jonathan G Rennison
fa304cdb75 Merge branch 'master' into save_ext 
# Conflicts:
#	src/saveload/saveload.cpp
 2018-05-25 19:09:20 +01:00
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
 2018-05-25 18:29:17 +01:00
Jonathan G Rennison
17257b9620 Add: 32bpp SSE2 blitter palette animator (#6795) 
Create a new blitter mode: 32bpp-sse2-anim, which is 32bpp-anim + this.
32bpp-sse2-anim is now used by default where 32bpp-anim would have been.
Also use this with the 32bpp-sse4-anim blitter.

See issue #6469.
 2018-05-23 09:55:04 +01:00
Owen Rudge
7bd2fa3516 Feature: Add XAudio2 driver 2018-05-17 15:06:37 +01:00
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
 2018-05-03 23:54:51 +01:00
Niels Martin Hansen
b902e01e10 Change #6685: Replace Win32 music driver with one not depending on MCI 
MCI MIDI is poorly supported on newer versions of Windows and can cause large
delays at the beginning of tracks.

The new driver is based on a from-scratch reader for Standard MIDI Files. This
should be re-usable in other music drivers too, and can allow for finer control
of playback in general.

It also provides a better framework for reading MIDI data from other formats
than just SMF.
 2018-05-01 22:29:53 +02: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
4bcd05a620 Merge branch 'cpp-11' into save_ext 
# Conflicts:
#	findversion.sh
 2018-04-27 01:33:39 +01:00
Jonathan G Rennison
b90c5b9618 Merge branch 'master' into cpp-11 
# Conflicts:
#	src/stdafx.h
 2018-04-26 23:59:13 +01:00
ZehMatt
e7cc53ed62 Add: post build events to VS projects to copy the output into 'bin' 2018-04-22 19:24:07 +02:00
Pavel Stupnikov
6ff81b908e Feature #6459: API for querying network clients from GS (#6736) 2018-04-22 15:42:29 +02:00
Ricardo N Feliciano
e8de33a61f Cleanup: Use new filename for README file. (#6738) 2018-04-21 11:05:38 +02:00
Michael Lutz
afa3e15afe Change: [Win32] Declare in the app manifest that all current Windows versions are natively supported. 
The main effect of this is currently a proper OS version in the crashlog.
 2018-04-10 21:07:27 +02:00
Jonathan G Rennison
af41decdf3 Update project files 2018-02-05 18:21:50 +00:00
keldorkatarn
1d3cf59d8a Allow building multiple docks per station. 
(cherry picked from commit 0110c4a35d383e0be2cbb53cbe9cbe6784abb3e9)

# Conflicts:
#	src/station_cmd.cpp
 2017-09-20 19:11:48 +01:00
Jonathan G Rennison
f3a0aace0c Merge branch 'master' into cpp-11 
# Conflicts:
#	src/stdafx.h
 2017-08-15 18:44:17 +01:00
Jonathan G Rennison
48bbe0325d Merge branch 'cpp-11' into save_ext 2017-03-29 19:49:29 +01:00
Jonathan G Rennison
33cd1569f4 Merge branch 'chunnel' into jgrpp 2017-03-19 12:30:26 +00:00
Jonathan G Rennison
4af4cbc2a4 Chunnel: Update project files 2017-03-19 12:30:14 +00:00
Jonathan G Rennison
b3fd11efd2 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_anim_sse4.cpp
 2017-03-19 12:27:24 +00:00
Jonathan G Rennison
fae4ac1a5d Merge branch 'master' into save_ext 
# Conflicts:
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
 2017-03-19 12:12:52 +00:00
michi_cc
cb2e84454f (svn r27791) -Fix (r27790) [FS#6366]: Try #2. Now also for Visual Studio 2010. 2017-03-13 21:56:38 +00:00
michi_cc
9a62317dfc (svn r27791) -Fix (r27790) [FS#6366]: Try #2. Now also for Visual Studio 2010. 2017-03-13 21:56:38 +00:00
michi_cc
ac735cfaac (svn r27790) -Fix [FS#6366]: [Win32] Mark OpenTTD as DPI-aware to avoid OS window scaling that breaks mouse input. 2017-03-13 20:21:40 +00:00
michi_cc
2d45d55925 (svn r27790) -Fix [FS#6366]: [Win32] Mark OpenTTD as DPI-aware to avoid OS window scaling that breaks mouse input. 2017-03-13 20:21:40 +00:00
Jonathan G Rennison
df3c10c523 Merge branch 'infrastructure_sharing' into jgrpp 
# Conflicts:
#	src/infrastructure.cpp
#	src/order_cmd.cpp
 2017-02-22 20:58:39 +00:00
Jonathan G Rennison
f3b1059930 Fix order removal due to shared-infra company deletion. 
Order totals were not updated correctly, implicit orders not handled
properly, etc.
Create generic function for vehicle order filtering.
Use for station deletion and infra sharing company deletion.
 2017-02-22 20:58:24 +00:00
Jonathan G Rennison
a67ecb4f6e Merge branch 'cpp-11' into jgrpp 2017-02-08 22:03:52 +00:00
Jonathan G Rennison
8f3e0c4fe5 Add a custom arena allocator utility. 2017-02-08 21:46:50 +00:00
Jonathan G Rennison
76de8f9b13 Merge branch 'cpp-btree' into jgrpp 
# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	source.list
 2017-02-07 22:29:44 +00:00
Jonathan G Rennison
3d0ed3547b Update source.list and project files with btree headers. 2017-02-07 19:16:20 +00:00
Jonathan G Rennison
f82feb160f Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	source.list
#	src/misc.cpp
#	src/openttd.cpp
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/saveload.cpp
#	src/signal.cpp
#	src/train_cmd.cpp
#	src/tunnelbridge_map.h
 2016-09-18 20:07:48 +01:00
Jonathan G Rennison
556594f2f0 Extend bridge signal simulation to support an unlimited no. of signals. 
This is instead of the previous limit of 16, all stored in M2.
 2016-09-18 20:06:59 +01:00
Jonathan G Rennison
888cd1be07 Merge branch 'cpp-11' into signal_tunnels_bridges 
# Conflicts:
#	src/saveload/saveload.cpp
 2016-09-11 13:16:54 +01:00
Jonathan G Rennison
5e67582a64 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	config.lib
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/saveload.cpp
 2016-09-07 22:02:57 +01:00
Jonathan G Rennison
a6e0b1ac7d Merge branch 'cpp-11' into save_ext 2016-09-05 23:17:02 +01:00
Jonathan G Rennison
6e9ea59ab5 Add a simple scope guard include file. 2016-09-05 23:16:47 +01:00
Jonathan G Rennison
e6c7134935 Merge branch 'master' into save_ext 
# Conflicts:
#	src/saveload/saveload.cpp
 2016-09-02 22:21:28 +01:00
Jonathan G Rennison
f3e0da1e63 Update project files. 2016-07-01 18:33:27 +01:00
Jonathan G Rennison
80e3af6bf5 Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/lang/english.txt
#	src/saveload/extended_ver_sl.cpp
#	src/tracerestrict.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
 2016-06-30 20:25:22 +01:00
Jonathan G Rennison
e4b932d53a Merge branch 'tracerestrict' into tracerestrict-sx 2016-06-30 20:15:27 +01:00