dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,725 Commits 1 Branch 0 Tags
d5a316e3652f27fcbbfa2b0423eb3324fd6ee16c
Commit Graph

23725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
7f66d4bc6a Merge branch 'cpp-btree' into jgrpp 2017-02-28 21:25:50 +00:00
Jonathan G Rennison
344f39196f cpp-btree: Remove remaining uses of ssize_t 
This is due to issues building on Windows
 2017-02-28 21:23:52 +00:00
Jonathan G Rennison
deb6a4f5c1 Merge branch 'template_train_replacement' into jgrpp 2017-02-28 19:32:36 +00:00
Jonathan G Rennison
939a350864 TBTR: Assume that virtual vehicles are on a suitably powered railtype. 2017-02-28 19:32:29 +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
Jonathan G Rennison
8cf0f354d9 Merge branch 'tracerestrict-sx' into jgrpp 2017-02-27 18:51:37 +00:00
translators
9071d5f07f (svn r27761) -Update from Eints: 
croatian: 3 changes by VoyagerOne
italian: 5 changes by lorenzodv
english (us): 4 changes by Supercheese
latin: 4 changes by Supercheese
 2017-02-27 18:45:37 +00:00
Jonathan G Rennison
87f583fd99 Merge branch 'tracerestrict' into tracerestrict-sx 2017-02-27 17:42:41 +00:00
Jonathan G Rennison
b6e001f20e Fix evaluation of PBS entry signal conditional after reserve through. 2017-02-27 15:02:52 +00:00
Jonathan G Rennison
13f8de58c3 Add instruction move up/down buttons to GUI. 
Has block and individual instruction move modes, depending on ctrl.
 2017-02-26 23:52:15 +00:00
Jonathan G Rennison
f10c32de53 Fix removal of double-length conditional instructions (PBS entry signal). 2017-02-26 22:51:18 +00:00
Jonathan G Rennison
a2a8f7f7b7 Change goto signal button in GUI to have push-button behaviour. 2017-02-26 22:37:38 +00:00
Jonathan G Rennison
f192865c27 Allow shallow-removing conditional blocks by use of ctrl+click. 2017-02-26 21:39:04 +00:00
Jonathan G Rennison
0ebfcc23a5 Implement instruction scroll-to for PBS entry signal conditional in GUI. 2017-02-26 20:37:57 +00:00
frosch
60f7168c22 (svn r27760) -Change: Enable realisitic train and road vehicle acceleration by default. 2017-02-26 20:31:02 +00:00
frosch
40eee1e3a2 (svn r27759) -Fix: strgen compilation 2017-02-26 20:10:41 +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
0c1fcc02ec (svn r27757) -Change: Make StringID 32bit. 2017-02-26 19:41:14 +00:00
frosch
49b940f69c (svn r27756) -Codechange: Add StringTab enum 2017-02-26 19:40:53 +00:00
frosch
b54a79f13e (svn r27755) -Codechange: Move TAB_SIZE to strings_type.h and use it consistently. 2017-02-26 19:40:32 +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
translators
d5c6760c85 (svn r27753) -Update from Eints: 2017-02-26 18:45:43 +00:00
alberth
fa81e20390 (svn r27752) -Cleanup: Remove obsolete strings from other languages as well. 2017-02-26 15:34:57 +00:00
alberth
34ca88c098 (svn r27751) -Feature: Display cargo suffix of accepted cargoes in industry view based on cb37 result type. 
Industry-sets that have no stockpiling get better control over the displayed accepted cargo information.
- result 0401 only prints the accepted cargo
- results 0800-0BFF prints the accepted cargo and a string (but not the amount)
 2017-02-26 15:34:15 +00:00
alberth
5bcca41ace (svn r27750) -Codechange: Add cb37 result type to the cargo suffix. 2017-02-26 15:33:39 +00:00
alberth
c9a8360419 (svn r27749) -Codechange: Fold cb37 cargo suffix text in a structure. 2017-02-26 15:30:25 +00:00
translators
04040a6a6d (svn r27748) -Update from Eints: 
polish: 1 change by wojteks86
 2017-02-25 18:45:38 +00:00
Jonathan G Rennison
c080a3c42c Version: Committing version data for tag: jgrpp-0.17.2 2017-02-22 21:32:16 +00:00
Jonathan G Rennison
bdc5820836 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/road_cmd.cpp
 2017-02-22 21:13:04 +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
091c30e254 Merge branch 'custom_bridgeheads' into jgrpp 2017-02-22 02:54:01 +00:00
Jonathan G Rennison
3278051913 Fix crash when removing secondary road type from tunnel. 2017-02-22 02:53:38 +00:00
Jonathan G Rennison
c6fa52f1f1 Fix wrong calculation of road tunnel infrastructure counts. 2017-02-22 02:53:37 +00:00
Jonathan G Rennison
adb4463e5e Add console command to check caches. 2017-02-22 02:51:25 +00:00
Jonathan G Rennison
3813b3ca09 Dump infrastructure totals when mismatch detected in CheckCaches. 2017-02-22 02:51:25 +00:00
Jonathan G Rennison
e11f295b29 Change console command to unblock heliports to be unlisted. 2017-02-21 21:50:31 +00:00
Jonathan G Rennison
2fbeb29277 Merge branch 'crashlog_improvements' into jgrpp 
# Conflicts:
#	src/misc.cpp
#	src/openttd.cpp
 2017-02-21 21:50:08 +00:00
Jonathan G Rennison
349ddd90b7 Maintain a circular buffer of recent commands, add to crashlog. 
Add console command to dump command log.
Increase max crashlog size.
 2017-02-21 21:49:56 +00:00
Jonathan G Rennison
3884ea5da1 Add option for console commands to be unlisted. 2017-02-21 20:54:38 +00:00
Jonathan G Rennison
3ba859727c Increase verbosity of asserts in OrderList::DebugCheckSanity. 2017-02-19 14:44:38 +00:00
Jonathan G Rennison
fe150d097d Merge branches 'cpp-btree' and 'progsig-sx' into jgrpp 2017-02-19 13:57:13 +00:00
Jonathan G Rennison
e459ebe2ad Remove assert.h include from progsig, as this overrides OpenTTD's assert 2017-02-19 13:57:02 +00:00
Jonathan G Rennison
418e9f4158 Remove assert.h include from btree.h, as this overrides OpenTTD's assert 2017-02-19 13:55:31 +00:00
Jonathan G Rennison
064a36b319 Merge branch 'crashlog_improvements' into jgrpp 2017-02-19 12:57:55 +00:00
Jonathan G Rennison
102405e082 Fix recursive faults in Window crash logger due to message box event loop. 2017-02-19 12:56:56 +00:00
Jonathan G Rennison
018cc59079 Add scope logging for IndividualRoadVehicleController. 2017-02-19 12:47:22 +00:00
Jonathan G Rennison
bac7fe5542 Increase maximum permitted group name length. 2017-02-19 11:52:27 +00:00
translators
9eff17e66b (svn r27747) -Update from Eints: 
korean: 7 changes by telk5093
 2017-02-17 18:45:37 +00:00
Jonathan G Rennison
987e752cee Fix articulated trams decoupling when turning around 
In the case where the front of the tram starts turning due to a
non-waitable dead-end, and before the next vehicle part can turn
the dead-end is removed.
 2017-02-16 22:11:41 +00:00