Commit Graph

24199 Commits

Author SHA1 Message Date
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
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
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
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
Jonathan G Rennison
560a049316 Linkgraph GUI: Replace line visibility detection algorithm
Previous algorithm had excessive false-positive rate
2018-01-18 20:59:14 +00:00
Jonathan G Rennison
29470dba23 LinkGraph: Increase caching of link graph lines/point details 2018-01-18 20:59:14 +00:00
Jonathan G Rennison
8ab6522e7c Add a monotonically incrementing counter to UpdateWindows calls
This is for checking draw cache validity
2018-01-18 20:59:14 +00:00
Jonathan G Rennison
4bad77cdf0 Use new/delete for Viewport info struct 2018-01-18 20:59:01 +00:00
Jonathan G Rennison
d82f9b50c6 Don't split viewport draw chunks
The stated explanation seems unconvincing, and it introduces a performance penalty.
2018-01-18 20:58:06 +00:00
Jonathan G Rennison
83e6cf50a0 Blitter: Adjust line-drawing algorithm to reduce wasted off-screen work 2018-01-17 02:52:40 +00:00
Jonathan G Rennison
2534c2a162 Blitter: Avoid signed overflow when drawing long lines 2018-01-17 02:36:15 +00:00
Jonathan G Rennison
0c2f49c08d Blitter: Change DrawLine to be templated 2018-01-17 02:36:15 +00:00
Jonathan G Rennison
cd68e9fac7 Linkgraph: Do not pre-fill annos set at start of MCF Dijkstra 2018-01-15 22:40:54 +00:00
Jonathan G Rennison
4a420ef864 Linkgraph: Use cached value in capacity annotation comparison 2018-01-15 22:40:54 +00:00
Jonathan G Rennison
e54a7189fd Add debug command line switch to quit after fixed number of days 2018-01-15 21:47:10 +00:00
Jonathan G Rennison
18f2a28715 Fix stray STRING2 in lang/korean.txt 2018-01-15 21:40:00 +00:00
Jonathan G Rennison
0f270e5cb1 Version: Committing version data for tag: jgrpp-0.22.2 2018-01-14 23:43:14 +00:00
Jonathan G Rennison
4a0d949d83 Merge branch 'master' into jgrpp 2018-01-14 23:22:47 +00:00
Jonathan G Rennison
3dbf09888a Merge pull request #30 from kiwitreekor into jgrpp 2018-01-14 23:20:53 +00:00
kiwitreekor
f0d9df359e Add files via upload 2018-01-14 23:20:15 +00:00
kiwitreekor
8d2a3b75d3 Update Korean Translation 2018-01-14 23:20:14 +00:00
Jonathan G Rennison
3a2a316588 Merge branch 'day_length' into jgrpp
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/vehicle_sl.cpp
2018-01-12 01:23:28 +00:00
Jonathan G Rennison
5db5581684 Merge branch 'save_ext' into jgrpp 2018-01-12 01:14:12 +00:00
Jonathan G Rennison
15fea054fb Add function pointer mode to SlXvFeatureTest 2018-01-12 01:13:49 +00:00
Jonathan G Rennison
7b567c9d26 Extend vehicle running ticks to 16 bits to avoid overflow at day length > 3 2018-01-12 00:03:15 +00:00
translators
0842742b91 (svn r27963) -Update from Eints:
norwegian (bokmal): 2 changes by Leifbk
2018-01-11 18:45:39 +00:00
translators
78d80a9968 (svn r27962) -Update from Eints:
spanish (mexican): 1 change by Absay
2018-01-09 18:45:38 +00:00
frosch
9d9e15a747 (svn r27961) -Fix [FS#6654]: The switch-toolbar icon contained pixels from the fire cycle. Replace the whole icon with a new version. (PaulC) 2018-01-07 14:21:09 +00:00
translators
96b3036d4c (svn r27960) -Update from Eints:
spanish (mexican): 2 changes by Absay
2018-01-06 18:45:38 +00:00