Jonathan G Rennison
46b5b0155c
Merge branch 'cpp-11' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
# src/saveload/saveload.h
6 years ago
Jonathan G Rennison
09c62d6951
Merge branch 'master' into cpp-11
6 years ago
glx
bf5898018f
Fix #7171 : incorrect modified status with determineversion.vbs
6 years ago
Niels Martin Hansen
67c6f945fb
Change: Include the full raw git revision hash in rev.cpp
6 years ago
Jonathan G Rennison
255b6adfc9
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/vehicle_cmd.cpp
6 years ago
Niels Martin Hansen
7c6e10dbfc
Update: Visual Studio 2019 solution file version upgrade ( #7135 )
6 years ago
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
6 years ago
Niels Martin Hansen
65782af2f4
Add: Visual Studio 2019 project files
6 years ago
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.
6 years ago
glx
255fa6e1a8
Fix: enable DPI-awareness for MINGW builds
6 years ago
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.
6 years ago
Jonathan G Rennison
9bd98ceeab
Blitter: Move DrawLineGeneric to a separate file to fix OSX compilation
6 years ago
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
6 years ago
Jonathan G Rennison
80d6f6c622
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
# src/saveload/saveload.h
6 years ago
Peter Nelson
41d47926b1
Cleanup #6960 : Remove parts of generate used only for MSVC pre-2015.
6 years ago
glx
0e0476184e
Cleanup: remove useless and outdated 'generate' projects outputs
6 years ago
glx
98308fe260
Fix 7f54c59a6: use some consistency for project dependencies determination
6 years ago
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
6 years ago
Jonathan G Rennison
4a162c5502
Merge branch 'cpp-11' into save_ext
6 years ago
Jonathan G Rennison
0bed63b77f
Merge branch 'master' into cpp-11
6 years ago
Peter Nelson
806e7d25dd
Change: Use GUITimer class instead of bare int/uints.
6 years ago
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
6 years ago
Jonathan G Rennison
0dba091d79
Merge branch 'cpp-11' into save_ext
...
# Conflicts:
# config.lib
# src/saveload/saveload.cpp
6 years ago
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
6 years ago
glx
c0a655225d
Add: [Win32] regression project files
6 years ago
Jonathan G Rennison
4f1d54564e
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
6 years ago
glx
e902a1cc57
Fix: [WIN32] no need to define WIN32 in project files
6 years ago
glx
3be6ab555c
Change: use vcpkg integration in Visual Studio
...
Removes the need for us to provide OpenTTD-useful package
6 years ago
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
6 years ago
Niels Martin Hansen
476643bfa5
Remove: Visual Studio project files for earlier than 2015
6 years ago
Niels Martin Hansen
86bea59962
Update: Add missing newline at end of some project files
6 years ago
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
6 years ago
Niels Martin Hansen
81b2ddd0ab
Fix: Fluidsynth should not be added to VC project files
6 years ago
Jonathan G Rennison
9490f33a6c
Merge branch 'master' into crashlog_improvements
...
# Conflicts:
# src/console_cmds.cpp
# src/openttd.cpp
# src/vehicle.cpp
6 years ago
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
6 years ago
J0an Josep
8975318286
Fix 2a868b9f3b8e3b5f8b9e5f728f628ec88fd5e3ad: Expose widgets and windows to scripts and fix documentation.
6 years ago
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.
6 years ago
Jonathan G Rennison
373ff3dd4e
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
# src/table/settings.h.preamble
6 years ago
Jonathan G Rennison
b48a6ef368
Revert "Revert "Add: [Win32] Uniscribe configure options for MinGW targets.""
...
This reverts commit ca4a4869a2
.
6 years ago
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 .
6 years ago
Jonathan G Rennison
8e9d68048a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/string.cpp
6 years ago
Michael Lutz
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
Michael Lutz
33829dc6ab
Change: [Win32/MSVC] Make the Uniscribe text layouter the windows default and remove usage of the deprecated ICU layout libs.
6 years ago
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.
6 years ago
Jonathan G Rennison
03b0931c57
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/debug.cpp
# src/saveload/saveload.cpp
6 years ago
Jonathan G Rennison
decd749d30
Merge branch 'master' into save_ext
6 years ago
Jonathan G Rennison
159909f4b1
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/saveload/saveload.cpp
6 years ago
Jonathan G Rennison
aae7806d5d
Move save/load ReadBuffer and MemoryDumper to separate header
...
Add static accessors
6 years ago
Michael Lutz
a6300fe70b
Change: [Win32] Enable DirectMusic driver for Win64.
6 years ago
Jonathan G Rennison
fa304cdb75
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
6 years ago
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
6 years ago
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 .
6 years ago
Owen Rudge
7bd2fa3516
Feature: Add XAudio2 driver
6 years ago
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
6 years ago
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.
6 years ago
Patric Stout
eb2603a5e7
Fix: make generate[.vbs] produce the same result on Linux/Windows ( #6764 )
6 years ago
Patric Stout
aef69443e7
Remove: WinCE support
6 years ago
Patric Stout
85adde7485
Remove: PSP support
6 years ago
Jonathan G Rennison
1fe0bb76b9
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
7 years ago
Jonathan G Rennison
4bcd05a620
Merge branch 'cpp-11' into save_ext
...
# Conflicts:
# findversion.sh
7 years ago
Jonathan G Rennison
f42cc19aad
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# Makefile.src.in
# src/crashlog.cpp
# src/crashlog.h
7 years ago
Jonathan G Rennison
b90c5b9618
Merge branch 'master' into cpp-11
...
# Conflicts:
# src/stdafx.h
7 years ago
ZehMatt
e7cc53ed62
Add: post build events to VS projects to copy the output into 'bin'
7 years ago
Pavel Stupnikov
6ff81b908e
Feature #6459 : API for querying network clients from GS ( #6736 )
7 years ago
Ricardo N Feliciano
e8de33a61f
Cleanup: Use new filename for README file. ( #6738 )
7 years ago
frosch
192770e6da
Change: Non-tag revisions are now named '<commitdate>-<branch>-g<shorthash><modified>'.
7 years ago
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.
7 years ago
Jonathan G Rennison
af41decdf3
Update project files
7 years ago
Jonathan G Rennison
5abd7ad788
Merge branch 'cpp-11' into save_ext
7 years ago
Jonathan G Rennison
a93cc441a9
Merge branch 'cpp-11' into jgrpp
7 years ago
Jonathan G Rennison
124d9a753e
Merge branch 'master' into cpp-11
...
# Conflicts:
# src/stdafx.h
7 years ago
frosch
9499e93a67
(svn r27920) -Fix: MSVC 2015 and 2017 project files referenced some MSVC 2010 files
7 years ago
frosch
0d1f88c09a
(svn r27920) -Fix: MSVC 2015 and 2017 project files referenced some MSVC 2010 files
7 years ago
frosch
f43f4981e3
(svn r27919) -Fix: MSVC 2015 and 2017 project files referenced some MSVC 2010 files
7 years ago
frosch
6120e69f21
(svn r27919) -Fix: MSVC 2015 and 2017 project files referenced some MSVC 2010 files
7 years ago
frosch
7726f2d330
(svn r27918) -Fix (r27917): Next attempt for MSVC 2017
7 years ago
frosch
b9ed60d307
(svn r27918) -Fix (r27917): Next attempt for MSVC 2017
7 years ago
frosch
28be179d4a
(svn r27917) -Add: MSVC 2017 project file generator. Most noticeable, std:c++latest is enabled.
7 years ago
frosch
db3410e196
(svn r27917) -Add: MSVC 2017 project file generator. Most noticeable, std:c++latest is enabled.
7 years ago
keldorkatarn
1d3cf59d8a
Allow building multiple docks per station.
...
(cherry picked from commit 0110c4a35d383e0be2cbb53cbe9cbe6784abb3e9)
# Conflicts:
# src/station_cmd.cpp
7 years ago
Jonathan G Rennison
f77a368268
Merge branch 'crashlog_improvements' into jgrpp
7 years ago
Jonathan G Rennison
4a6ddb2d50
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# config.lib
7 years ago
Jonathan G Rennison
509e20406f
Merge branch 'master' into cpp-11
7 years ago
Jonathan G Rennison
19e62d089f
Merge branch 'master' into save_ext
7 years ago
frosch
30a25f45ce
(svn r27897) -Add [FS#6577]: Project file generator for kdevelop 4/5 (adf88)
7 years ago
frosch
a04076ba41
(svn r27897) -Add [FS#6577]: Project file generator for kdevelop 4/5 (adf88)
7 years ago
Jonathan G Rennison
f3a0aace0c
Merge branch 'master' into cpp-11
...
# Conflicts:
# src/stdafx.h
7 years ago
Jonathan G Rennison
48bbe0325d
Merge branch 'cpp-11' into save_ext
8 years ago
Jonathan G Rennison
33cd1569f4
Merge branch 'chunnel' into jgrpp
8 years ago
Jonathan G Rennison
4af4cbc2a4
Chunnel: Update project files
8 years ago
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
8 years ago
Jonathan G Rennison
fae4ac1a5d
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/company_sl.cpp
# src/saveload/saveload.cpp
8 years ago
michi_cc
9a62317dfc
(svn r27791) -Fix (r27790) [FS#6366]: Try #2 . Now also for Visual Studio 2010.
8 years ago
michi_cc
cb2e84454f
(svn r27791) -Fix (r27790) [FS#6366]: Try #2 . Now also for Visual Studio 2010.
8 years ago
michi_cc
2d45d55925
(svn r27790) -Fix [FS#6366]: [Win32] Mark OpenTTD as DPI-aware to avoid OS window scaling that breaks mouse input.
8 years ago
michi_cc
ac735cfaac
(svn r27790) -Fix [FS#6366]: [Win32] Mark OpenTTD as DPI-aware to avoid OS window scaling that breaks mouse input.
8 years ago
Jonathan G Rennison
df3c10c523
Merge branch 'infrastructure_sharing' into jgrpp
...
# Conflicts:
# src/infrastructure.cpp
# src/order_cmd.cpp
8 years ago
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.
8 years ago
Jonathan G Rennison
a67ecb4f6e
Merge branch 'cpp-11' into jgrpp
8 years ago
Jonathan G Rennison
8f3e0c4fe5
Add a custom arena allocator utility.
8 years ago