Commit Graph

34674 Commits

Author SHA1 Message Date
Jonathan G Rennison
e6e5a96ed3 Fix performance penalty when scrolling viewport map with show scrolling viewport enabled 2018-05-26 09:09:18 +01:00
Jonathan G Rennison
8f2c595378 Merge branch 'template_train_replacement' into jgrpp
# Conflicts:
#	src/vehicle_gui.cpp
2018-05-25 19:17:12 +01:00
Jonathan G Rennison
45d2726379 TBTR: Add 'all rail types' option to rail type dropdown, use by default 2018-05-25 19:16:37 +01:00
Jonathan G Rennison
cecbf257bc Merge branch 'save_ext' into template_train_replacement
# Conflicts:
#	src/saveload/saveload.cpp
#	src/vehicle_gui.cpp
2018-05-25 19:12:10 +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
Alexander Weiss
e1a164b531 Change: [OSX] Setting mouse-wheel to scroll the map does not disable pinch to zoom 2018-05-24 21:31:37 +02:00
Alexander Weiss
6df7ced343 Change: [OSX] Reversed pinch to zoom behaviour.
Made pinch out zoom in and pinch in zoom out, as virtually all macOS
applications do.
2018-05-24 21:31:37 +02: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
translators
306b999cf4 Update: Translations from eints
polish: 5 changes by xaxa
2018-05-22 19:45:44 +02:00
PeterN
a07394a63a Change: Remove direction parameter from Vehicle::UpdateDeltaXY. (#6792)
The value is either unused or always the same as this->direction.
2018-05-22 18:43:34 +01:00
PeterN
4cebebcf68 Change: Add CargoTypes type for cargo masks. (#6790) 2018-05-21 22:08:39 +01:00
PeterN
42b43c9983 Change: Available railtypes is always calculated on load, so no need to load value for old savegames (#6782) 2018-05-19 22:31:46 +01:00
PeterN
cad47bbefe Fix: Tractive effort was slightly too high as per NewGRF spec. (#6785) 2018-05-19 22:05:51 +01:00
PeterN
8a7de36463 Change [#6689]: Tweak HashTable hash calculation to reduce collisions. (kernigh2) (#6786) 2018-05-19 22:04:25 +01:00
Owen Rudge
7bd2fa3516 Feature: Add XAudio2 driver 2018-05-17 15:06:37 +01:00
Jonathan G Rennison
38779254e5 Check cargo action count consistencies on load
Add scope info logging to AfterLoadVehicles
2018-05-13 18:56:31 +01:00
Jonathan G Rennison
a60eff174d Merge branch 'template_train_replacement' into jgrpp
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
2018-05-13 15:01:29 +01:00
Jonathan G Rennison
5877cd0f9b TBTR: Fix display of vehicle sprites for some NewGRFs, fix issues in large UI modes
Slight code, GUI layout, and savegame format tidying
2018-05-13 15:00:26 +01:00
translators
fb54dd04a1 Update: Translations from eints
greek: 8 changes by Jubilee
2018-05-12 19:45:40 +02:00
Jonathan G Rennison
6342099c4d Allow 256 NewGRFs in multiplayer
Add extended network format for server info
Add general UDP packet fragmentation system
Fix map dimensions >= 64k
Increase length of server revision string
Maintain backwards compatibility with trunk for advertisement/server listing
2018-05-12 09:11:41 +01:00
translators
d738e980d0 Update: Translations from eints
dutch: 1 change by mrLeopold
2018-05-11 19:45:40 +02:00
Jonathan G Rennison
793a446062 Zoning: Ensure that screen is refreshed when necessary in authority overlay 2018-05-11 00:03:49 +01:00
Jonathan G Rennison
f373a67610 Fix display of zoning overlay sprites on half-tile foundations
Partly based on commit 598b781259a5c1ad25cf3de85807b9c79e9f08fe
2018-05-10 23:10:04 +01:00
translators
7935ac16d1 Update: Translations from eints
dutch: 1 change by mrLeopold
2018-05-10 19:45:39 +02:00
Jonathan G Rennison
a08a79a9d8 Fix handling of refit with train through-load 2018-05-08 06:58:37 +01:00
Jonathan G Rennison
8353a4d095 Merge branch 'cpp-btree' into jgrpp 2018-05-06 12:16:52 +01:00
Jonathan G Rennison
133ccabf42 btree: Use static_assert instead of workaround macro 2018-05-06 12:15:54 +01:00
Jonathan G Rennison
53e943386e Rename Polyline struct due to name collision on Windows 2018-05-06 09:17:42 +01:00
Jonathan G Rennison
71852c3f37 Fix timetable auto-separation with go via station orders 2018-05-04 00:21:43 +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
Jonathan G Rennison
98ade153d2 Fix colour definition for conditional order invalid slot string 2018-05-02 20:56:54 +01:00
Pavel Stupnikov
fef8b831a9 Change: Switch town growth rate and counter to actual game ticks (#6763) 2018-05-02 21:01:30 +02:00
translators
61515c9abd Update: Translations from eints
belarusian: 10 changes by KorneySan
russian: 6 changes by KorneySan
spanish (mexican): 10 changes by Absay
2018-05-02 19:45:41 +02:00
Niels Martin Hansen
52655b5849 Change: [Win32 MIDI] Reset pitch bend range controllers on song change
Some songs (at least one in OpenMSX) use the MIDI pitch bend range controllers
but don't reset these at the end. This causes all subsequent songs to sound
wrong.
2018-05-01 22:29:53 +02:00
Niels Martin Hansen
99a39c842c Change: [Win32 MIDI] Send Roland reverb control message like TTD DOS does 2018-05-01 22:29:53 +02: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
Michael Lutz
9959cd9522 Fix 0165fe1: Native OSX doesn't have a __BYTE_ORDER macro but defines a differently named macro. 2018-04-30 23:57:28 +02:00
Michael Lutz
bb5584c835 Fix 74b7f0a: [OSX] Mouse cursor getting occasionally stuck. 2018-04-30 23:57:28 +02:00
J0an Josep
cfb8092397 Fix b4b98e5165: Use FALLTHROUGH attribute with correct indentation. 2018-04-30 21:52:40 +02:00
translators
3f40cd505d Update: Translations from eints
croatian: 10 changes by VoyagerOne
italian: 4 changes by lorenzodv
french: 7 changes by glx
2018-04-30 19:45:40 +02:00
J0anJosep
79a551a83c Codechange: Use TileAddBy(Diag)Dir when possible. 2018-04-30 18:55:04 +02:00
Joan Josep
944f785be8 Fix: Spelling errors (#6769) 2018-04-30 18:52:32 +02:00
Jonathan G Rennison
1cc545c816 Fix iterator invalidation issues in CargoPacketList actions
See: #48
2018-04-30 16:55:07 +01:00
Jonathan G Rennison
e0126a1fbc Merge branch 'signal_tunnels_bridges' into jgrpp
# Conflicts:
#	src/train_cmd.cpp
2018-04-30 15:39:55 +01:00
Jonathan G Rennison
0dd3ff23de Fix signalled tunnel/bridge entrance not being marked dirty when reservation cleared 2018-04-30 15:39:33 +01:00
keldorkatarn
c2678b896e Fix clearing of train reservations in tunnels and on bridges.
(cherry picked from commit e2c4fb517d1064b163d8f2b0627506d785ffb3ed)

See: #46
2018-04-30 15:23:40 +01:00
Matthijs Kooijman
fa87212a76 Fix: Some spelling errors in printed messages 2018-04-30 13:38:58 +02:00
Joan Josep
a6b18f0d92 Fix #6090: And (svn r27822). Run scripts for widgets. (#6765)
Fix 19f5a6cbb0, Fix 19d56a33e8: Run scripts to update GS for new widgets (#6765)
2018-04-30 12:25:11 +01:00
translators
a806424ec1 Update: Translations from eints
italian: 6 changes by lorenzodv
french: 6 changes by glx
russian: 9 changes by Lone_Wolf
2018-04-29 19:45:58 +02:00