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
48,995 Commits 12 Branches 178 Tags 449 MiB
b11852a076
Commit Graph

1188 Commits

Author SHA1 Message Date
glx
2ff10327d7 Fix: projects/generate now keeps the line ending 2019-02-10 12:44:10 +01:00
glx
748d72202a Fix: generate and generate.vbs were sorting differently 2019-02-10 12:44:10 +01:00
glx
0df95811ce Fix: generate.vbs used wrong data for basesets_vs142 2019-02-10 12:44:10 +01:00
Jonathan G Rennison
2142452305 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	Makefile.src.in
#	findversion.sh
#	projects/determineversion.vbs
#	src/gamelog.cpp
#	src/gamelog_internal.h
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/network/core/config.h
#	src/network/network.cpp
#	src/network/network_udp.cpp
#	src/rev.h
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/depot_sl.cpp
#	src/saveload/gamelog_sl.cpp
#	src/saveload/misc_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/table/settings.ini
#	src/viewport.cpp
 2019-02-04 18:32:44 +00:00
Jonathan G Rennison
46b5b0155c Merge branch 'cpp-11' into save_ext 
# Conflicts:
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
 2019-02-04 18:24:38 +00:00
Jonathan G Rennison
09c62d6951 Merge branch 'master' into cpp-11 2019-02-04 18:09:36 +00:00
glx
bf5898018f Fix #7171: incorrect modified status with determineversion.vbs 2019-02-03 19:53:36 +01:00
Niels Martin Hansen
67c6f945fb Change: Include the full raw git revision hash in rev.cpp 2019-02-03 18:00:16 +01:00
Jonathan G Rennison
255b6adfc9 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/vehicle_cmd.cpp
 2019-01-31 02:04:02 +00:00
Niels Martin Hansen
7c6e10dbfc
Update: Visual Studio 2019 solution file version upgrade (#7135) 2019-01-29 17:18:12 +01:00
Jonathan G Rennison
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
 2019-01-29 02:28:14 +00:00
Niels Martin Hansen
65782af2f4 Add: Visual Studio 2019 project files 2019-01-26 14:56:35 +01:00
Peter Nelson
1334cfb3e5 Change: Always build baseset metadata, instead of including it in the repo. 
This adds a script and project files to generate these files within MSVC.
 2019-01-25 22:28:39 +00:00
glx
255fa6e1a8 Fix: enable DPI-awareness for MINGW builds 2019-01-25 16:59:41 +01:00
Jonathan G Rennison
db924a4681 Codechange: [Blitter] Change DrawLine to be templated 
This is remove per-pixel overheads due to use of the SetPixel virtual
method.
These overheads included:
* expensive virtual method call which prevents inlining
* palette lookup for every pixel
* branch on whether palette animation is enabled on every pixel

Regenerate project files.
 2019-01-24 11:12:06 +00:00
Jonathan G Rennison
9bd98ceeab Blitter: Move DrawLineGeneric to a separate file to fix OSX compilation 2019-01-22 21:16:21 +00:00
Jonathan G Rennison
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
 2019-01-21 19:28:29 +00:00
Jonathan G Rennison
80d6f6c622 Merge branch 'master' into save_ext 
# Conflicts:
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
 2019-01-21 18:37:47 +00:00
Peter Nelson
41d47926b1 Cleanup #6960: Remove parts of generate used only for MSVC pre-2015. 2019-01-21 17:40:44 +00:00
glx
0e0476184e Cleanup: remove useless and outdated 'generate' projects outputs 2019-01-17 23:02:11 +00:00
glx
98308fe260 Fix 7f54c59a6: use some consistency for project dependencies determination 2019-01-17 23:02:11 +00:00
Jonathan G Rennison
e3d167f9f0 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	config.lib
#	src/misc_gui.cpp
#	src/network/network_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/smallmap_gui.h
#	src/station_cmd.cpp
#	src/toolbar_gui.cpp
#	src/vehicle_gui.cpp
#	src/window.cpp
 2019-01-14 00:01:44 +00:00
Jonathan G Rennison
4a162c5502 Merge branch 'cpp-11' into save_ext 2019-01-13 23:30:52 +00:00
Jonathan G Rennison
0bed63b77f Merge branch 'master' into cpp-11 2019-01-13 22:49:55 +00:00
Peter Nelson
806e7d25dd Change: Use GUITimer class instead of bare int/uints. 2019-01-11 11:56:21 +00:00
Jonathan G Rennison
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
 2019-01-06 22:35:57 +00:00
Jonathan G Rennison
0dba091d79 Merge branch 'cpp-11' into save_ext 
# Conflicts:
#	config.lib
#	src/saveload/saveload.cpp
 2019-01-06 22:10:04 +00:00
Jonathan G Rennison
962a9c5430 Merge branch 'master' into cpp-11 
# Conflicts:
#	config.lib
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	src/saveload/saveload.cpp
 2019-01-06 22:07:28 +00:00
glx
c0a655225d Add: [Win32] regression project files 2019-01-05 18:10:14 +01:00
Jonathan G Rennison
4f1d54564e Merge branch 'master' into jgrpp 
# Conflicts:
#	src/debug.cpp
 2019-01-02 16:09:44 +00:00
glx
e902a1cc57 Fix: [WIN32] no need to define WIN32 in project files 2018-12-27 18:09:16 +01:00
glx
3be6ab555c Change: use vcpkg integration in Visual Studio 
Removes the need for us to provide OpenTTD-useful package
 2018-12-26 17:29:11 +01:00
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
 2018-11-19 20:51:16 +00:00
Niels Martin Hansen
476643bfa5 Remove: Visual Studio project files for earlier than 2015 2018-11-18 19:51:51 +01:00
Niels Martin Hansen
86bea59962 Update: Add missing newline at end of some project files 2018-11-18 19:51:51 +01:00
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
 2018-11-05 12:53:36 +00:00
Niels Martin Hansen
81b2ddd0ab Fix: Fluidsynth should not be added to VC project files 2018-11-01 23:20:44 +01:00
Jonathan G Rennison
9490f33a6c Merge branch 'master' into crashlog_improvements 
# Conflicts:
#	src/console_cmds.cpp
#	src/openttd.cpp
#	src/vehicle.cpp
 2018-07-26 20:01:08 +01:00
Jonathan G Rennison
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
 2018-07-24 18:30:42 +01:00
J0an Josep
8975318286 Fix 2a868b9f3b: Expose widgets and windows to scripts and fix documentation. 2018-07-23 20:32:18 +02:00
Niels Martin Hansen
2a868b9f3b Feature: Framerate display window (#6822) 
Frame rate and various game loop/graphics timing measurements and graphs. Accessible via the Help menu, and can print some stats in the console via the fps command.
 2018-07-19 21:17:07 +02:00
Jonathan G Rennison
373ff3dd4e Merge branch 'master' into save_ext 
# Conflicts:
#	src/saveload/saveload.cpp
#	src/table/settings.h.preamble
 2018-07-02 18:41:39 +01:00
Jonathan G Rennison
b48a6ef368 Revert "Revert "Add: [Win32] Uniscribe configure options for MinGW targets."" 
This reverts commit ca4a4869a2.
 2018-06-25 18:39:59 +01:00
Jonathan G Rennison
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 cd966f3810.
This reverts commit eec3f40931.
This reverts commit 33829dc6ab.
This reverts commit 768a31bfe3.
This reverts commit a4278c302b.
This reverts commit f4394debdc.

This is to fix various problems and crashes with text rendering
and font handling on Windows.

See #58.
 2018-06-13 01:46:19 +01:00
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
Patric Stout
eb2603a5e7
Fix: make generate[.vbs] produce the same result on Linux/Windows (#6764) 2018-04-29 21:30:45 +02:00
Patric Stout
aef69443e7 Remove: WinCE support 2018-04-29 15:32:16 +02:00
Patric Stout
85adde7485 Remove: PSP support 2018-04-29 15:32:16 +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
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
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
frosch
192770e6da Change: Non-tag revisions are now named '<commitdate>-<branch>-g<shorthash><modified>'. 2018-04-12 22:26:45 +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
Jonathan G Rennison
5abd7ad788 Merge branch 'cpp-11' into save_ext 2018-01-26 18:18:36 +00:00
Jonathan G Rennison
a93cc441a9 Merge branch 'cpp-11' into jgrpp 2017-10-05 18:20:54 +01:00
Jonathan G Rennison
124d9a753e Merge branch 'master' into cpp-11 
# Conflicts:
#	src/stdafx.h
 2017-10-05 18:16:37 +01:00
frosch
9499e93a67 (svn r27920) -Fix: MSVC 2015 and 2017 project files referenced some MSVC 2010 files 2017-09-24 17:38:03 +00:00
frosch
0d1f88c09a (svn r27920) -Fix: MSVC 2015 and 2017 project files referenced some MSVC 2010 files 2017-09-24 17:38:03 +00:00
frosch
f43f4981e3 (svn r27919) -Fix: MSVC 2015 and 2017 project files referenced some MSVC 2010 files 2017-09-24 17:35:51 +00:00
frosch
6120e69f21 (svn r27919) -Fix: MSVC 2015 and 2017 project files referenced some MSVC 2010 files 2017-09-24 17:35:51 +00:00
frosch
7726f2d330 (svn r27918) -Fix (r27917): Next attempt for MSVC 2017 2017-09-24 16:19:29 +00:00
frosch
b9ed60d307 (svn r27918) -Fix (r27917): Next attempt for MSVC 2017 2017-09-24 16:19:29 +00:00
frosch
28be179d4a (svn r27917) -Add: MSVC 2017 project file generator. Most noticeable, std:c++latest is enabled. 2017-09-24 16:00:29 +00:00
frosch
db3410e196 (svn r27917) -Add: MSVC 2017 project file generator. Most noticeable, std:c++latest is enabled. 2017-09-24 16:00:29 +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
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
509e20406f Merge branch 'master' into cpp-11 2017-09-04 01:22:19 +01:00
Jonathan G Rennison
19e62d089f Merge branch 'master' into save_ext 2017-09-04 00:57:48 +01:00
frosch
30a25f45ce (svn r27897) -Add [FS#6577]: Project file generator for kdevelop 4/5 (adf88) 2017-08-24 14:50:55 +00:00
frosch
a04076ba41 (svn r27897) -Add [FS#6577]: Project file generator for kdevelop 4/5 (adf88) 2017-08-24 14:50:55 +00: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
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
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
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
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