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

669 Commits

Author SHA1 Message Date
Jonathan G Rennison
2003a86932 Merge remote-tracking branch 'origin/master' into jgrpp 
# Conflicts:
#	src/string.cpp
 2018-12-10 18:40:05 +00:00
comicsads
b93fad7481 Fix: Spelling in code comment (#6984) 2018-11-28 16:24:01 +01: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
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
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
Oskari Leppäaho
b3b89257f7 Remove: Unused string "STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION" 2018-10-31 19:24:21 +01:00
Jonathan G Rennison
d839526365 Fix bf8d7df: Script/AI construction of rail track and waypoints (#6881) 2018-08-12 09:45:38 +02:00
Jonathan G Rennison
4566699939 Fix script/AI construction of rail track and waypoints 
Broken by increase to 64 rail types (bf8d7df736)
 2018-08-07 23:20:51 +01:00
Jonathan G Rennison
ae15c96c1a Merge branch 'master' into jgrpp 
# Conflicts:
#	docs/landscape.html
#	docs/landscape_grid.html
#	src/bridge_gui.cpp
#	src/bridge_map.h
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/rail_map.h
#	src/rail_type.h
#	src/road_map.h
#	src/saveload/afterload.cpp
#	src/saveload/map_sl.cpp
#	src/saveload/saveload.cpp
#	src/script/api/script_rail.cpp
#	src/station_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp
 2018-07-26 20:54:13 +01:00
Peter Nelson
bf8d7df736 Change: Extend rail types to 64 (6 bit storage) 2018-07-26 13:27:40 +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
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
Pavel Stupnikov
fef8b831a9 Change: Switch town growth rate and counter to actual game ticks (#6763) 2018-05-02 21:01:30 +02:00
J0an Josep
cfb8092397 Fix b4b98e5165: Use FALLTHROUGH attribute with correct indentation. 2018-04-30 21:52:40 +02:00
Joan Josep
944f785be8 Fix: Spelling errors (#6769) 2018-04-30 18:52:32 +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
Pavel Stupnikov
913119487f Feature: Add GS method to question a single client (#6748) 2018-04-28 17:37:59 +02:00
Jonathan G Rennison
1fe0bb76b9 Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp 2018-04-27 02:42:20 +01:00
Pavel Stupnikov
8e4bce58ea Feature: GS methods to scroll viewport for players (#6745) 2018-04-24 19:19:00 +02: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
78838ee2a2 Add freight train load/unload mode: through load 2018-03-26 20:12:50 +01:00
frosch
09d4735679 (svn r27993) -Change: Heading for 1.9 now 2018-03-14 19:36:41 +00:00
Jonathan G Rennison
4a0d949d83 Merge branch 'master' into jgrpp 2018-01-14 23:22:47 +00:00
frosch
b69c0acca2 (svn r27950) -Merge: Documentation updates from 1.7 branch 2017-12-24 12:18:36 +00:00
frosch
54040bd31a (svn r27950) -Merge: Documentation updates from 1.7 branch 2017-12-24 12:18:36 +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
f34833f111 Merge branch 'improved_breakdowns' into jgrpp 
# Conflicts:
#	src/vehiclelist.cpp
 2017-08-15 19:26:26 +01:00
frosch
b4b98e5165 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
frosch
a47fb85cd8 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
Jonathan G Rennison
f3dde49ff8 Prevent AIs/scripts from creating road custom bridge heads. 2017-06-22 19:02:46 +01:00
Jonathan G Rennison
ac69b746ab Merge branch 'master' into jgrpp 
# Conflicts:
#	src/gfxinit.cpp
#	src/saveload/saveload.cpp
 2017-03-12 20:37:26 +00:00
frosch
afcef7faa6 (svn r27780) -Update: Numbers 2017-03-11 20:50:26 +00:00
frosch
ed63b48e76 (svn r27780) -Update: Numbers 2017-03-11 20:50:26 +00:00
frosch
9fa6e3d83a (svn r27776) -Merge: Documentation updates from 1.6 branch 2017-03-11 13:34:01 +00:00
frosch
ffcdd47321 (svn r27776) -Merge: Documentation updates from 1.6 branch 2017-03-11 13:34:01 +00:00
Jonathan G Rennison
a6168dd2f0 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/saveload/company_sl.cpp
 2017-02-28 00:15:45 +00:00
frosch
2bb80d280c (svn r27758) -Change: Increase the maximum number of GameScript texts to 64k, and NewGRF texts to 512k. 2017-02-26 19:41:30 +00:00
frosch
ce32ca4dc6 (svn r27758) -Change: Increase the maximum number of GameScript texts to 64k, and NewGRF texts to 512k. 2017-02-26 19:41:30 +00:00
frosch
fc4c4d080c (svn r27757) -Change: Make StringID 32bit. 2017-02-26 19:41:14 +00:00
frosch
0c1fcc02ec (svn r27757) -Change: Make StringID 32bit. 2017-02-26 19:41:14 +00:00
frosch
a56e2bccd0 (svn r27756) -Codechange: Add StringTab enum 2017-02-26 19:40:53 +00:00
frosch
49b940f69c (svn r27756) -Codechange: Add StringTab enum 2017-02-26 19:40:53 +00:00
frosch
9ad09627ad (svn r27754) -Codechange: Add GetStringTab(), GetStringIndex() and MakeStringID() to access the structure of StringIDs. 2017-02-26 19:39:58 +00:00
frosch
02967c3c08 (svn r27754) -Codechange: Add GetStringTab(), GetStringIndex() and MakeStringID() to access the structure of StringIDs. 2017-02-26 19:39:58 +00:00
Jonathan G Rennison
90cd312428 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/fios.h
 2017-01-17 19:11:09 +00:00
frosch
7b553d255e (svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message. 2017-01-14 18:30:26 +00:00
frosch
050271ed2d (svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message. 2017-01-14 18:30:26 +00:00
Jonathan G Rennison
58381a3ea2 Merge branch 'master' into jgrpp 2016-12-09 00:01:03 +00:00