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

23433 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
7f10d83a4a Merge branch 'template_train_replacement' into jgrpp 
# Conflicts:
#	src/linkgraph/linkgraphjob.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/train_cmd.cpp
#	src/vehicle_base.h
 2016-11-01 23:00:48 +00:00
Jonathan G Rennison
92254acf8d TBTR: Savegame and API changes to support multiple sprites per vehicle. 2016-11-01 20:27:30 +00:00
Jonathan G Rennison
d204062300 Merge branch 'master' into template_train_replacement 2016-11-01 19:43:35 +00:00
michi_cc
4436f96f9f (svn r27675) -Fix [FS#6502]: [OSX] Building with 10.11 or 10.12 SDKs. 2016-10-31 19:29:01 +00:00
michi_cc
221c84be66 (svn r27674) -Fix (r27673): Mingw... 2016-10-30 19:27:07 +00:00
michi_cc
36cbb54a9d (svn r27673) -Add: [Win32] Thread names for windows debuggers. 2016-10-30 18:22:55 +00:00
frosch
a08df612be (svn r27672) -Doc [FS#6489]: Fix comment. (Yho) 2016-10-30 18:04:20 +00:00
frosch
77b790cd5a (svn r27671) -Codechange: Replace magic numbers in the toolbar with the already existing WID_TN_xxx. (Wolf01) 2016-10-30 17:36:57 +00:00
frosch
3f75b8bca2 (svn r27670) -Add: [FS#6471] Assign descriptive names to (GNU pthread) threads. (JGR) 2016-10-30 17:29:33 +00:00
Jonathan G Rennison
de26cf78e5 Merge branch 'infrastructure_sharing' into jgrpp 2016-10-24 18:29:09 +01:00
Jonathan G Rennison
15dc498c79 Fix wrong calculation of infra sharing track deletion train repayment. 
Head pointer was being used for vehicle value on iteration of
train vehicles.
 2016-10-24 18:29:02 +01:00
translators
f8f2c9d3a5 (svn r27669) -Update from Eints: 
thai: 11 changes by angelix
 2016-10-19 17:45:35 +00:00
frosch
ba566e9126 (svn r27668) -Feature: [NewGRF] Allow composing vehicles from multiple sprites. 2016-10-16 14:59:44 +00:00
frosch
a37bb32fd6 (svn r27667) -Codechange: Add VehicleSpriteSeq::GetBounds and Draw. 2016-10-16 14:58:38 +00:00
frosch
f36539837e (svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq. 2016-10-16 14:57:56 +00:00
frosch
8321c2d0fa (svn r27665) -Fix: When dragging crashed vehicles, also draw them as crashed at the mouse cursor. 2016-10-16 14:57:13 +00:00
frosch
fe12488232 (svn r27664) -Codechange: Deduplicate code for animating effect vehicles. 2016-10-16 14:56:52 +00:00
frosch
2a1e955fee (svn r27663) -Codechange: Deduplicate code when rotating crashed vehicles. 2016-10-16 14:56:33 +00:00
frosch
3b9cc70553 (svn r27662) -Codechange: Deduplicate code using GetSingleVehicleWidth. 2016-10-16 14:56:05 +00:00
Jonathan G Rennison
d61344e96a Version: Committing version data for tag: jgrpp-0.15.1 2016-10-12 22:29:02 +01:00
Jonathan G Rennison
13694c30cf Merge branch 'master' into jgrpp 
# Conflicts:
#	src/clear_cmd.cpp
 2016-10-12 22:26:23 +01:00
Jonathan G Rennison
6bac8bbd48 Merge branch 'departure-boards' into jgrpp 2016-10-12 20:42:06 +01:00
Jonathan G Rennison
d226495d3b Fix main pane of departure boards window not being mouse-wheel scrollable. 2016-10-12 20:41:17 +01:00
Jonathan G Rennison
bebed03c7e Merge branch 'enhanced_viewport_overlay' into jgrpp 
# Conflicts:
#	src/viewport.cpp
 2016-10-12 20:27:46 +01:00
Jonathan G Rennison
5d07d4d515 Refactor drawing of vehicle route lines. 
De-duplicate lines to be drawn.
Avoid repeated scanning of order list.
Simplify handling of dirtying old drawn lines.
 2016-10-12 20:26:23 +01:00
Jonathan G Rennison
3975305f04 Limit number of vehicle route step markers for a single station to 10. 
If more than 10, draw an overflow marker instead.
Minor refactoring.
 2016-10-12 20:26:23 +01:00
translators
8c1bf8f16d (svn r27661) -Update from Eints: 
portuguese: 1 change by Samu
 2016-10-12 17:45:36 +00:00
Jonathan G Rennison
55e98d1182 Merge branch 'cargo_type_order' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
 2016-10-11 19:02:03 +01:00
Jonathan G Rennison
4c74bda0af Fix extended order info not being saved for vehicle current order. 
This fixes desync and related issues when loading savegames where
extended order info is used.
 2016-10-11 19:01:16 +01:00
Jonathan G Rennison
1778fda01e Merge branch 'day_length' into jgrpp 2016-10-11 00:45:01 +01:00
Jonathan G Rennison
6288a67fe1 Fix savegame load check overwriting date tick skip counter. 2016-10-11 00:43:52 +01:00
Jonathan G Rennison
8e6569c11f Include tick skip counter in all desync debug output. 
Change message format to make field identification easier.
Update desync message reader to support tick skip counter.
 2016-10-10 19:02:05 +01:00
translators
b080b86574 (svn r27660) -Update from Eints: 
portuguese: 7 changes by Samu
 2016-10-10 17:45:36 +00:00
translators
3ee07f37d8 (svn r27659) -Update from Eints: 
portuguese: 25 changes by Samu
 2016-10-09 17:45:39 +00:00
translators
169468a857 (svn r27658) -Update from Eints: 
danish: 1 change by Knogle
 2016-10-06 17:45:36 +00:00
frosch
db38de3b7e (svn r27657) -Change: Replace another occurence of the ancient tilehash function with the newer one. This time to make rough land appear more random. 2016-10-02 13:41:56 +00:00
Jonathan G Rennison
489e6aced6 Version: Committing version data for tag: jgrpp-0.15.0 2016-09-27 01:22:40 +01:00
Jonathan G Rennison
f1999edbf0 Merge branch 'cpp-11' into jgrpp 2016-09-27 01:06:05 +01:00
Jonathan G Rennison
06f9c01986 Fix CPU pointer width detection in configure script. 2016-09-27 01:05:42 +01:00
Jonathan G Rennison
c83903ddb0 Merge branch 'master' into jgrpp 2016-09-26 23:15:22 +01:00
Jonathan G Rennison
3af2f0e923 When building tunnels, open new viewports at the far end of the tunnel. 
Loosely based on https://www.tt-forums.net/viewtopic.php?f=33&t=72639
 2016-09-24 22:19:01 +01:00
Jonathan G Rennison
675b88b391 Merge branch 'cargo_type_order' into jgrpp 2016-09-24 21:36:33 +01:00
Jonathan G Rennison
08fb60d314 Fix cargo drop-down boxes being too narrow, resulting in variable sizing. 2016-09-24 21:34:53 +01:00
Jonathan G Rennison
2dba3aff72 Add override annotations to classes in order_gui.cpp 2016-09-22 00:38:58 +01:00
Jonathan G Rennison
16ce37ad14 Show vehicle route markers when cargo load by type window focused. 2016-09-22 00:38:44 +01:00
Jonathan G Rennison
662d0e94ab When a focused drop-down window is closed, focus the parent. 
This fixes vehicle route line focusing then using the drop-down
menus in the order GUI.
 2016-09-21 23:31:06 +01:00
Jonathan G Rennison
f0bcec77fb Import patch for random town road reconstruction. 
From https://www.tt-forums.net/viewtopic.php?f=33&t=36438

Change scale from 0-100 to 0-1000
Adjust strings, settings GUI placement, etc.
 2016-09-19 23:07:09 +01:00
Jonathan G Rennison
d0657a587e Document more rail types patch in landscape HTML docs. 2016-09-18 22:02:20 +01:00
Jonathan G Rennison
11f64c5294 Document programmable signal map bits in lanscape HTML doc. 2016-09-18 20:23:59 +01:00
Jonathan G Rennison
f82feb160f Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	source.list
#	src/misc.cpp
#	src/openttd.cpp
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/saveload.cpp
#	src/signal.cpp
#	src/train_cmd.cpp
#	src/tunnelbridge_map.h
 2016-09-18 20:07:48 +01:00