Commit Graph

47050 Commits

Author SHA1 Message Date
Jonathan G Rennison
83a063f51c Add train is in slot conditional order 2018-11-05 04:21:08 +00:00
Jonathan G Rennison
c632539bb7 Prevent adding train slot state conditional orders to non-train vehicles 2018-11-05 04:01:41 +00:00
Jonathan G Rennison
91e08c6cea Merge branch 'cpp-btree' into jgrpp 2018-11-01 18:56:02 +00:00
Jonathan G Rennison
7690fe8572 cpp-btree: Update to match upstream
minor optimization: minimize calls to end()

Minor optimization: increase the chances that the compiler will inline calls to end().
Has been observed to make a difference with gcc 4.9.3.

Fix build and warnings on MSVC (2017)
Uses static_assert, a C++11 feature. Also adds some explicit uses of
static_cast in order to suppress warnings about lossy type conversion.
2018-11-01 18:54:24 +00:00
Jonathan G Rennison
a96428ed13 Fix timetabling of through-load orders 2018-10-30 02:39:11 +00:00
Jonathan G Rennison
3a640af71d Merge branch 'master' into jgrpp
# Conflicts:
#	src/ground_vehicle.cpp
#	src/viewport.cpp
2018-10-29 18:33:15 +00:00
Niels Martin Hansen
50efaa2372 Fix e00908f: Visual C++ 2015 compile error
Microsoft Visual C++ 2015 Update 3 (and possibly other versions) consider a struct member undefined in a
static_assert in the struct body. Moving the static_assert to a member function solves the issue.
2018-10-27 10:30:24 +02:00
Jindrich Makovicka
25ab9c1997 Codechange: Improve (un)zoom performance
When zooming out with a high res display, there can be about 150k sprites
to be sorted before displaying. With the O(n^2) complexity of the sprite
sorter, this can take several seconds.

This patch works around this by sorting the sprites by the xmin coordinate
first using QSort, which later allows an early bailout out of the inner
loop. This is enough to cut down the full unzoom time on a 4k display to a
fraction of second.
2018-10-26 20:22:38 +02:00
translators
47ff673664 Update: Translations from eints
finnish: 25 changes by ln
2018-10-26 19:45:42 +02:00
Samu
eff09c43cd Fix #4109: Add more water checks to the Oil Rig layout
Prevents Oil Rig docking tile from becoming unreachable by ships when spawning next to each other.
2018-10-25 20:09:42 +02:00
Jonathan G Rennison
c00d049057 Scheduled dispatch: Don't show invalid required vehicle estimate 2018-10-24 02:21:56 +01:00
translators
bddf25c36a Update: Translations from eints
portuguese (brazilian): 66 changes by Tucalipe
2018-10-23 19:45:44 +02:00
Jonathan G Rennison
0e3986c39c Extend timetable wait/travel times from 16 to 32 bits wide 2018-10-22 19:12:38 +01:00
Jonathan G Rennison
ee00a28717 Merge branch 'template_train_replacement' into jgrpp
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
2018-10-18 23:57:20 +01:00
Jonathan G Rennison
c4f5c8e789 TBTR: Add option to replace only old vehicles 2018-10-18 23:54:40 +01:00
Miguel Horta
42b00c3b39 Fix #6938: Don't change company value to perform cost estimations (#6939)
These meddling kids dared to play with magic, but the ancients texts
weren't ready for that.
Refactors logic to estimate costs that dated to even before OpenTTD 0.1;
2018-10-13 13:34:57 +02:00
Miguel Horta
e00908f5e9 Fix #6898: Replace atoi() with strtoul()
Normalize type and parsing of generation_seed across all files
Add assert_compile() to ensure correct type
2018-10-11 20:22:31 +01:00
translators
fbfa4eb592 Update: Translations from eints
polish: 3 changes by xaxa
2018-10-08 19:45:44 +02:00
Jonathan G Rennison
2c4d3192c6 Fix trains unnecessarily slowing down when passing waypoints 2018-10-07 11:32:15 +01:00
Jonathan G Rennison
92a5e59165 Zoning: Add modes to show 2x2 and 3x3 town road grids 2018-10-06 13:01:01 +01:00
translators
9cf999bca7 Update: Translations from eints
korean: 2 changes by telk5093
2018-10-03 19:45:41 +02:00
translators
8a70101e7f Update: Translations from eints
vietnamese: 63 changes by myquartz
2018-10-02 19:45:40 +02:00
translators
25a060b4ae Update: Translations from eints
vietnamese: 2 changes by myquartz
2018-10-01 19:45:43 +02:00
Johannes E. Krause
662dcc3c31 Fix #6920: Make 9.8m/s^2 a common constant for TE-calculation 2018-09-30 20:45:41 +02:00
Jonathan G Rennison
79f1c2b97b Zoning: Fix off-by-one in zoning cache rect invalidation (SW edge) 2018-09-26 01:32:32 +01:00
Jonathan G Rennison
cff61bac96 Merge branch 'progsig-sx' into jgrpp
# Conflicts:
#	src/command.cpp
2018-09-26 01:14:42 +01:00
Jonathan G Rennison
e01ea3e629 Change progsig command type from landscape to other management 2018-09-26 01:13:57 +01:00
translators
060248a422 Update: Translations from eints
spanish (mexican): 2 changes by Absay
2018-09-24 19:45:43 +02:00
Stefan Strogin
fec44b0d09 Fix #6854: Compilation with ICU 62 (#6912) 2018-09-20 22:36:45 +02:00
SamuXarick
41fb7cb15e Fix #6892: [Script] CONFIG_RANDOM did not use the full parameter range (#6902) 2018-09-20 22:31:38 +02:00
Jonathan G Rennison
ba8ddda0bc Version: Committing version data for tag: jgrpp-0.27.1 2018-09-20 08:44:20 +01:00
Jonathan G Rennison
6bcc705c7c Merge branch 'master' into jgrpp
# Conflicts:
#	src/saveload/saveload.cpp
2018-09-20 08:32:56 +01:00
translators
59a1614ba0 Update: Translations from eints
czech: 27 changes by djst
croatian: 1 change by VoyagerOne
italian: 1 change by lorenzodv
2018-09-19 19:45:44 +02:00
Max Maton
eed0da60a2 Fix #6622: Fixes empty company name in news when gamescript constructs a town 2018-09-18 18:35:26 +02:00
Samuel Cochran
1a73c39838 Add: BACKSPACE can be mapped as a hotkey 2018-09-16 11:36:25 +02:00
Jonathan G Rennison
6f9f467dbe Fix struct SpriteInfo comparator not being marked const 2018-09-12 08:46:29 +01:00
Charles Pigott
ca5b68145a Fix #6839: OLD_GM_DIR midi search path got lost (#6900) 2018-09-12 09:19:06 +02:00
Jonathan G Rennison
ce4e2ca3c3 Add setting to enable flipping direction of all train types in depot 2018-09-11 06:08:02 +01:00
Jonathan G Rennison
ce6d6db4d5 Fix setting timetable leave early flag of current order 2018-09-10 04:54:56 +01:00
translators
94961732a3 Update: Translations from eints
basque: 4 changes by Thadah
2018-09-07 19:45:44 +02:00
translators
8137d14d33 Update: Translations from eints
russian: 1 change by Lone_Wolf
2018-09-06 19:45:43 +02:00
Niels Martin Hansen
bb086f9240 Fix: Better "temp" path for decoded MPSMIDI files when source filename has no path separators 2018-09-03 21:57:04 +02:00
Niels Martin Hansen
560b01f307 Fix: Check the search paths for standard MIDI files 2018-09-03 21:57:04 +02:00
Michael Lutz
4b0b4e0643 Feature: [NewGRF] Increase size of persistent storage to 256. 2018-09-02 21:31:15 +02:00
frosch
6391d49277 Fix: Variable 0x85 had no bounds checks. 2018-09-02 21:15:54 +02:00
Jonathan G Rennison
a39cfe1854 Version: Committing version data for tag: jgrpp-0.27.0 2018-08-29 02:49:14 +01:00
Jonathan G Rennison
a37e30dfd0 Merge branch 'master' into jgrpp 2018-08-29 02:26:16 +01:00
Jonathan G Rennison
a6596a6e34 Merge branch 'tracerestrict-sx' into jgrpp 2018-08-28 07:26:24 +01:00
Jonathan G Rennison
7877b40699 Fix missing switch-case break in tracerestrict GUI
Fixes #66
2018-08-28 07:26:15 +01:00
Jonathan G Rennison
3d60f2a4cf Merge branch 'crashlog_improvements' into jgrpp 2018-08-26 22:25:26 +01:00