dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,083 Commits 1 Branch 0 Tags
ceae4516ca66c55434e4288faca7145a8df1a3e9
Commit Graph

47083 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
ceae4516ca Add remappable properties for station min bridge height and bridge menu icon 2018-11-11 11:28:10 +00:00
Jonathan G Rennison
06c458cb19 Merge branch 'newgrf-property-mapping' into jgrpp 
# Conflicts:
#	docs/newgrf-additions.html
#	src/newgrf.cpp
 2018-11-11 11:27:41 +00:00
Jonathan G Rennison
9a6a66a054 Add general NewGRF Action 0 property mapping scheme to Action 14 2018-11-11 11:26:05 +00:00
Jonathan G Rennison
2dda1c4351 Documentation: Add docs on NewGRF spec additions 2018-11-10 18:54:38 +00:00
Jonathan G Rennison
cb459132ac Merge branch 'master' into newgrf-feature-detection 2018-11-10 12:24:53 +00:00
Jonathan G Rennison
c10f6f9abb Fix incorrect method documentation of ChangeGRFFeatureSetPlatformVarBit 2018-11-10 12:24:32 +00:00
translators
16cc482d57 Update: Translations from eints 
croatian: 2 changes by VoyagerOne
 2018-11-08 19:45:43 +01:00
Greg-21
4ba73dac95 Doc: Changed several files to unificate them... (#6964) 
...with those from release 1.8 branch.
 2018-11-06 00:38:42 +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
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
translators
ccd9d77b94 Update: Translations from eints 
italian: 2 changes by lorenzodv
 2018-11-04 19:45:42 +01:00
Niels Martin Hansen
9b560eaa51 Fix: Industry chain window layout no more unnecessarily large when the number of cargoes in/out isn't large either 2018-11-03 21:43:54 +01:00
Niels Martin Hansen
e66cec8f86 Add: NewGRF support for 16-in-16-out industries 2018-11-03 21:43:54 +01:00
Niels Martin Hansen
8859381d30 Add: Industries can produce and accept up to 16 different cargoes 2018-11-03 21:43:54 +01:00
translators
32b9ee7063 Update: Translations from eints 
latvian: 3 changes by krixis02
 2018-11-03 19:45:42 +01: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
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
Charles Pigott
0c619b7c4b Add: Fluidsynth music driver support (jmak) 2018-11-01 18:06:38 +01:00
Samu
1e68b9b3e6 Add: AI/GS GetMonthlyMaintenanceCost (#6897) 
API addition which allows AI/GS scripts to retrieve the monthly maintenance cost of an airport type.
 2018-11-01 18:06:08 +01:00
SamuXarick
4703cd433d Fix #6460: [AI] Add start_date parameter for Random AIs on new game 2018-11-01 17:56:09 +01:00
Oskari Leppäaho
b3b89257f7 Remove: Unused string "STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION" 2018-10-31 19:24:21 +01:00
Joost Hopmans
5029cd6f28 Fix: Only possible to build station next to competitors by using CTRL+click 
Fix by checking only for stations owned by the current company when
inspecting if there are multiple adjoining stations to the one being built.

When building next to 2 or more owned stations we don't know which
station should be extended. For other companies' stations that's not a
problem since our station won't merge with theirs anyway.

Calling to BuildStationPart should never have another company's station
as a parameter to attach to unless the client is malicious, so just returning
a generic error in that case.
 2018-10-31 19:24:21 +01:00
frosch
18ca3e8660 Fix: [NewGRF] Make VA2 operator 11 (ror) behave well-defined when rotating by 0 bits. 2018-10-31 14:35:46 +01:00
Alexander Weiss
b3dc90af58 Change: Clone tool in depot window now behaves like clone button in vehicle window. Keep the tool active when share-cloning. Open the vehicle GUI when copy-cloning. (#6754) 2018-10-31 12:51:10 +01:00
SamuXarick
264e60529f Change: Gradually slow down aircraft speed on breakdown (#6932) 2018-10-31 12:45:23 +01:00
Charles Pigott
bb7353c02a Codechange: Some more null checks 2018-10-31 12:41:49 +01:00
Charles Pigott
1778b2d66e Codechange: Merge some duplicated functions 2018-10-31 12:41:49 +01:00
Charles Pigott
ca5f73b196 Codechange: Turn a define into a constant 2018-10-31 12:41:49 +01:00
Charles Pigott
b5028efc1f Fix: Protect against a few out of bounds or uninitialised usage errors 2018-10-31 12:41:49 +01:00
Charles Pigott
52ed3bcbaa Remove: A few bits of dead code 2018-10-31 12:41:49 +01:00
Charles Pigott
e0c0394e37 Fix: Remove various dead or unnecessary assignments 2018-10-31 12:41:49 +01:00
Charles Pigott
f5b1115039 Doc: Lots and lots of doxymentation fixes 2018-10-31 12:35:54 +01:00
Charles Pigott
b9273cbe07 Update: Doxyfile 2018-10-31 12:35:54 +01:00
Niels Martin Hansen
f3dbb3f676 Fix #6951: Ensure RailTypes bitfield is always treated as 64 bit 
Some compilers (like VC++ 2015) will otherwise narrow it in some contexts where it should not be.
 2018-10-30 21:46:28 +01:00
Niels Martin Hansen
350395a6c2 Fix: Missing m8 data in console when using Query tool 
When map array 8 was added, the Query tool wasn't updated to also
print the value there to the console, in debug builds.
 2018-10-30 16:33:07 +01: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