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

47536 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
911ba8cb8b Merge branch 'master' into jgrpp 2018-02-09 18:10:57 +00:00
translators
dd567c6105 (svn r27968) -Update from Eints: 
korean: 1 change by telk5093
 2018-02-07 18:45:38 +00:00
translators
eec6167155 (svn r27968) -Update from Eints: 
korean: 1 change by telk5093
 2018-02-07 18:45:38 +00:00
Jonathan G Rennison
af41decdf3 Update project files 2018-02-05 18:21:50 +00:00
Jonathan G Rennison
955126efac Improve pathfinder support for multiple docks 
The pathfinder can now find docks other than the Manhattan closest one.

Based on Cirdan commits:
afc7969c13d7ca59afe4dae4bf88122ba8d27df2
4067190dedcd3e5f668ea4f49b1dd8dfed10b2a7
d9be6b712d2ae4fb1b5ae844dde4919dd24c4fb2
 2018-02-05 18:21:05 +00:00
Jonathan G Rennison
ed04845514 Merge branch 'ship_collision_avoidance' into jgrpp 2018-02-04 13:32:37 +00:00
HackaLittleBit
691ce0f1ea An assert could be triggered while looking beyond the map border. 
This patch fixes that.
 2018-02-04 12:49:30 +00:00
HackaLittleBit
fca03da2bb Add wormhole ship detection, one tile only! 2018-02-04 12:48:55 +00:00
HackaLittleBit
9326706eb9 Code cleanup and preparation for ships in wormhole detection 2018-02-04 12:48:02 +00:00
HackaLittleBit
80500f8f08 Rework z position 2018-02-04 12:47:36 +00:00
HackaLittleBit
64c8985cd7 Remove 90 degree comment 2018-02-04 12:47:03 +00:00
Jonathan G Rennison
9f628e7e9a Show stops with timetabled wait time of 0 in departure board 2018-01-31 19:02:59 +00:00
Jonathan G Rennison
ec661d7ae9 Merge branch 'template_train_replacement' into jgrpp 2018-01-30 18:58:34 +00:00
Jonathan G Rennison
4a9df57665 TBTR: Enable autorenew when template replacement active 2018-01-30 18:58:09 +00:00
Jonathan G Rennison
06a2457efc Merge branch 'template_train_replacement' into jgrpp 
# Conflicts:
#	src/vehicle.cpp
 2018-01-29 22:09:40 +00:00
Jonathan G Rennison
64d9f88802 TBTR: Fix bugs when both autoreplace and template replacement active on same vehicle 2018-01-29 22:08:26 +00:00
Jonathan G Rennison
233b0f8e9e TBTR: Add sanity check assertions 2018-01-29 22:05:55 +00:00
Jonathan G Rennison
bb6b8d8cd6 Increase verbosity of some assertion failure messages 2018-01-29 00:18:49 +00:00
Jonathan G Rennison
1615137481 Adjust format of vehicle scope dumping 2018-01-29 00:14:55 +00:00
Jonathan G Rennison
902fd73c47 Merge branch 'ship_collision_avoidance' into jgrpp 2018-01-28 20:58:18 +00:00
Jonathan G Rennison
ab6119cb76 Merge branch 'infrastructure_sharing' into jgrpp 2018-01-28 17:28:12 +00:00
Jonathan G Rennison
2c16800454 Add debug console command to show cargo packet deferred payment stats 2018-01-28 17:26:35 +00:00
Jonathan G Rennison
decc0f210c Fix incorrect comment 2018-01-28 17:24:25 +00:00
Jonathan G Rennison
bcc456ed37 Add debug console command to show inflation multipliers 2018-01-28 16:28:08 +00:00
HackaLittleBit
e4a10e9313 Revert part of collision detection on aqueducts, on aqueducts collision detection will not be done. 2018-01-26 20:07:32 +00:00
Jonathan G Rennison
8c0c9274ea Merge branch 'infrastructure_sharing' into jgrpp 
# Conflicts:
#	src/economy.cpp
#	src/misc.cpp
#	src/openttd.cpp
#	src/saveload/extended_ver_sl.cpp
 2018-01-26 18:47:08 +00:00
Jonathan G Rennison
9000d74f3c Pay all cargo payment incomes when cargo finally delivered 2018-01-26 18:28:57 +00:00
Jonathan G Rennison
ea3948aa2d Merge branch 'cpp-btree' into infrastructure_sharing 2018-01-26 18:26:24 +00:00
Jonathan G Rennison
093bd804cd Merge branch 'save_ext' into infrastructure_sharing 2018-01-26 18:18:46 +00:00
Jonathan G Rennison
5abd7ad788 Merge branch 'cpp-11' into save_ext 2018-01-26 18:18:36 +00:00
HackaLittleBit
354ecfdf3a Handle ship collision detection on aquaducts. 2018-01-25 18:31:11 +00:00
HackaLittleBit
e2d3c95ae1 Enable ships to pass on both sides of other ships. 2018-01-25 18:27:07 +00:00
Jonathan G Rennison
a6a1e67dbc Scale displayed running costs by day length factor 2018-01-25 18:23:15 +00:00
HackaLittleBit
828e9bece2 De-duplicate ship entry to exit direction map table 2018-01-25 18:22:53 +00:00
translators
b36e70cba8 (svn r27967) -Update from Eints: 
portuguese: 2 changes by Samu
 2018-01-23 18:45:40 +00:00
translators
cefedd6923 (svn r27967) -Update from Eints: 
portuguese: 2 changes by Samu
 2018-01-23 18:45:40 +00:00
Jonathan G Rennison
aa1a914d96 Merge branch 'ship_collision_avoidance' into jgrpp 2018-01-23 00:40:48 +00:00
HackaLittleBit
c5888dad9f Changes to ship collision avoidance algorithm 
* Change some names and create a seperate procedure for finding ships.
* Check if destiny tile is buoy. If so, distance checking continues.
* Remove water tile check. It was done before and coast can't have 3 way tracks.
* Add a check for map edges.
* Add speed adjustment related to distance between ships
* Do not detect ships on tiles with parallel tracks
 2018-01-23 00:39:08 +00:00
Jonathan G Rennison
7b811d93a1 Expand comment on why viewport is drawn in chunks 2018-01-23 00:08:05 +00:00
Jonathan G Rennison
ddd0419758 Revert "Don't split viewport draw chunks" 
This reverts commit d82f9b50c6.
 2018-01-23 00:08:05 +00:00
translators
0c43d6903a (svn r27966) -Update from Eints: 
spanish (mexican): 32 changes by Absay
portuguese: 41 changes by Samu
 2018-01-22 18:45:38 +00:00
translators
5fe62ccb3e (svn r27966) -Update from Eints: 
spanish (mexican): 32 changes by Absay
portuguese: 41 changes by Samu
 2018-01-22 18:45:38 +00:00
Jonathan G Rennison
38fb8c1b84 Zoning: Cache expensive zoning overlay values 2018-01-22 17:49:53 +00:00
Jonathan G Rennison
f8193578c1 Blitter: Performance adjustments to 32bpp anim non-SSE blitter 2018-01-22 01:47:55 +00:00
translators
6886b156d2 (svn r27965) -Update from Eints: 
spanish (mexican): 43 changes by Absay
 2018-01-21 18:45:39 +00:00
translators
25c9cc6b11 (svn r27965) -Update from Eints: 
spanish (mexican): 43 changes by Absay
 2018-01-21 18:45:39 +00:00
Jonathan G Rennison
11a10299d1 Blitter: Also use sprite flags for non-SSE 32bpp sprite encoder 2018-01-19 23:24:09 +00:00
Jonathan G Rennison
d730cfd51d Cache sprite sequence bounds for vehicles 2018-01-19 19:13:01 +00:00
Jonathan G Rennison
5b226adc75 TBTR: Whitespace fix 2018-01-19 19:12:11 +00:00
Jonathan G Rennison
cfa8ed747e Add a 16-bit Rect type and conversion function 2018-01-19 19:11:59 +00:00