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
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
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
Jonathan G Rennison
2003a86932
Merge remote-tracking branch 'origin/master' into jgrpp
...
# Conflicts:
# src/string.cpp
2018-12-10 18:40:05 +00:00
Michael Lutz
8d7cd6a526
Add: [OSX] Native natural sort implementation.
2018-12-08 20:13:27 +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
Charles Pigott
0c619b7c4b
Add: Fluidsynth music driver support (jmak)
2018-11-01 18:06:38 +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
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
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
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
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
Pavel Stupnikov
6ff81b908e
Feature #6459 : API for querying network clients from GS ( #6736 )
2018-04-22 15:42:29 +02:00
Jonathan G Rennison
0c2f49c08d
Blitter: Change DrawLine to be templated
2018-01-17 02:36:15 +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
4a6ddb2d50
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# config.lib
2017-09-04 01:22:54 +01:00
innocenat
0b8f0e64ec
Scheduled Dispatch feature
...
Code is tested and run well on small-ish train network. Not tested extensively.
2017-05-30 01:37:08 +07:00
Jonathan G Rennison
d1a287d73c
Merge branch 'save_ext' into jgrpp
2017-04-11 18:42:11 +01:00
Jonathan G Rennison
cb9ffe1bd9
Move std::string str_validate to separate header
...
This is to fix compilation of squirrel on MacOS/clang, as squirrel
defines macros which clash with including <string>
2017-04-11 18:39:27 +01:00
Jonathan G Rennison
48bbe0325d
Merge branch 'cpp-11' into save_ext
2017-03-29 19:49:29 +01:00
HackaLittleBit
f173b74e81
Chunnel patch 28398: Codechange: Save Tunnel Pool.
...
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
2017-03-04 11:53:48 +00:00
HackaLittleBit
ad070b91ea
Chunnel patch 28392: Add: Basic tunnel pool. (no save)
...
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
2017-03-04 11:43:53 +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
