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
4a162c5502
Merge branch 'cpp-11' into save_ext
6 years ago
0bed63b77f
Merge branch 'master' into cpp-11
6 years ago
806e7d25dd
Change: Use GUITimer class instead of bare int/uints.
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
0dba091d79
Merge branch 'cpp-11' into save_ext
...
# Conflicts:
# config.lib
# src/saveload/saveload.cpp
6 years ago
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
c0a655225d
Add: [Win32] regression project files
6 years ago
4f1d54564e
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
6 years ago
e902a1cc57
Fix: [WIN32] no need to define WIN32 in project files
6 years ago
3be6ab555c
Change: use vcpkg integration in Visual Studio
...
Removes the need for us to provide OpenTTD-useful package
6 years ago
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
476643bfa5
Remove: Visual Studio project files for earlier than 2015
6 years ago
86bea59962
Update: Add missing newline at end of some project files
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
81b2ddd0ab
Fix: Fluidsynth should not be added to VC project files
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
8975318286
Fix 2a868b9f3b8e3b5f8b9e5f728f628ec88fd5e3ad: Expose widgets and windows to scripts and fix documentation.
6 years ago
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
373ff3dd4e
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
# src/table/settings.h.preamble
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
33829dc6ab
Change: [Win32/MSVC] Make the Uniscribe text layouter the windows default and remove usage of the deprecated ICU layout libs.
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
03b0931c57
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/debug.cpp
# src/saveload/saveload.cpp
6 years ago
decd749d30
Merge branch 'master' into save_ext
6 years ago
159909f4b1
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/saveload/saveload.cpp
6 years ago
aae7806d5d
Move save/load ReadBuffer and MemoryDumper to separate header
...
Add static accessors
6 years ago
a6300fe70b
Change: [Win32] Enable DirectMusic driver for Win64.
6 years ago
fa304cdb75
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
6 years ago
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
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
7bd2fa3516
Feature: Add XAudio2 driver
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
6 years ago
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
eb2603a5e7
Fix: make generate[.vbs] produce the same result on Linux/Windows ( #6764 )
6 years ago
aef69443e7
Remove: WinCE support
6 years ago
85adde7485
Remove: PSP support
6 years ago
1fe0bb76b9
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
6 years ago
4bcd05a620
Merge branch 'cpp-11' into save_ext
...
# Conflicts:
# findversion.sh
6 years ago
f42cc19aad
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# Makefile.src.in
# src/crashlog.cpp
# src/crashlog.h
6 years ago
b90c5b9618
Merge branch 'master' into cpp-11
...
# Conflicts:
# src/stdafx.h
6 years ago
e7cc53ed62
Add: post build events to VS projects to copy the output into 'bin'
6 years ago
6ff81b908e
Feature #6459 : API for querying network clients from GS ( #6736 )
6 years ago
e8de33a61f
Cleanup: Use new filename for README file. ( #6738 )
6 years ago
192770e6da
Change: Non-tag revisions are now named '<commitdate>-<branch>-g<shorthash><modified>'.
6 years ago
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.
6 years ago
af41decdf3
Update project files
7 years ago
5abd7ad788
Merge branch 'cpp-11' into save_ext
7 years ago
a93cc441a9
Merge branch 'cpp-11' into jgrpp
7 years ago
124d9a753e
Merge branch 'master' into cpp-11
...
# Conflicts:
# src/stdafx.h
7 years ago
9499e93a67
(svn r27920) -Fix: MSVC 2015 and 2017 project files referenced some MSVC 2010 files
7 years ago
0d1f88c09a
(svn r27920) -Fix: MSVC 2015 and 2017 project files referenced some MSVC 2010 files
7 years ago
f43f4981e3
(svn r27919) -Fix: MSVC 2015 and 2017 project files referenced some MSVC 2010 files
7 years ago
6120e69f21
(svn r27919) -Fix: MSVC 2015 and 2017 project files referenced some MSVC 2010 files
7 years ago
7726f2d330
(svn r27918) -Fix (r27917): Next attempt for MSVC 2017
7 years ago
b9ed60d307
(svn r27918) -Fix (r27917): Next attempt for MSVC 2017
7 years ago
28be179d4a
(svn r27917) -Add: MSVC 2017 project file generator. Most noticeable, std:c++latest is enabled.
7 years ago
db3410e196
(svn r27917) -Add: MSVC 2017 project file generator. Most noticeable, std:c++latest is enabled.
7 years ago
1d3cf59d8a
Allow building multiple docks per station.
...
(cherry picked from commit 0110c4a35d383e0be2cbb53cbe9cbe6784abb3e9)
# Conflicts:
# src/station_cmd.cpp
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
509e20406f
Merge branch 'master' into cpp-11
7 years ago
19e62d089f
Merge branch 'master' into save_ext
7 years ago
30a25f45ce
(svn r27897) -Add [FS#6577]: Project file generator for kdevelop 4/5 (adf88)
7 years ago
a04076ba41
(svn r27897) -Add [FS#6577]: Project file generator for kdevelop 4/5 (adf88)
7 years ago
f3a0aace0c
Merge branch 'master' into cpp-11
...
# Conflicts:
# src/stdafx.h
7 years ago
48bbe0325d
Merge branch 'cpp-11' into save_ext
7 years ago
33cd1569f4
Merge branch 'chunnel' into jgrpp
7 years ago
4af4cbc2a4
Chunnel: Update project files
7 years ago
b3fd11efd2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_anim_sse4.cpp
7 years ago
fae4ac1a5d
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/company_sl.cpp
# src/saveload/saveload.cpp
7 years ago
9a62317dfc
(svn r27791) -Fix (r27790) [FS#6366]: Try #2 . Now also for Visual Studio 2010.
7 years ago
cb2e84454f
(svn r27791) -Fix (r27790) [FS#6366]: Try #2 . Now also for Visual Studio 2010.
7 years ago
2d45d55925
(svn r27790) -Fix [FS#6366]: [Win32] Mark OpenTTD as DPI-aware to avoid OS window scaling that breaks mouse input.
7 years ago
ac735cfaac
(svn r27790) -Fix [FS#6366]: [Win32] Mark OpenTTD as DPI-aware to avoid OS window scaling that breaks mouse input.
7 years ago
df3c10c523
Merge branch 'infrastructure_sharing' into jgrpp
...
# Conflicts:
# src/infrastructure.cpp
# src/order_cmd.cpp
7 years ago
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.
7 years ago
a67ecb4f6e
Merge branch 'cpp-11' into jgrpp
8 years ago
8f3e0c4fe5
Add a custom arena allocator utility.
8 years ago
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
8 years ago
3d0ed3547b
Update source.list and project files with btree headers.
8 years ago
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
8 years ago
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.
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
a6e0b1ac7d
Merge branch 'cpp-11' into save_ext
8 years ago
6e9ea59ab5
Add a simple scope guard include file.
8 years ago
e6c7134935
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
8 years ago
f3e0da1e63
Update project files.
8 years ago
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
8 years ago
e4b932d53a
Merge branch 'tracerestrict' into tracerestrict-sx
8 years ago
b11d48b431
Update project files
8 years ago
74ff8b9e8e
Merge branch 'crashlog_improvements' into jgrpp
...
# Conflicts:
# Makefile.src.in
8 years ago
0951cb320c
Show ./configure invocation in crash log.
8 years ago
eac2f0720c
Merge branch 'master' into jgrpp
8 years ago
b21e13a2a4
(svn r27553) -Update: Project files
8 years ago
Jonathan G Rennison
Peter Nelson
glx
Niels Martin Hansen
J0an Josep
Michael Lutz
Owen Rudge
Patric Stout
ZehMatt
Pavel Stupnikov
Ricardo N Feliciano
frosch
keldorkatarn
michi_cc