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 cd966f3810eec3f4093133829dc6ab768a31bfe3a4278c302bf4394debdc#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
