dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
57,597 Commits 1 Branch 0 Tags
2aa574a48f587eb42a5b46f8a80c3339710bf261
Commit Graph

1283 Commits

Author SHA1 Message Date
Jonathan G Rennison
e24839ed65 Merge branch 'master' into enhanced_viewport_overlay 
Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
  Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw

Conflicts:
	src/clear_cmd.cpp
	src/pbs.cpp
	src/rail_cmd.cpp
	src/toolbar_gui.cpp
	src/train_cmd.cpp
	src/vehicle.cpp
	src/viewport.cpp
	src/viewport_func.h
 2015-08-05 21:25:13 +01:00
patch-import
536a95dfd0 Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch 
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
 2015-08-05 21:24:30 +01:00
Jonathan G Rennison
ce34225b0e Merge branch 'house_placing' into jgrpp 2015-08-03 21:29:22 +01:00
patch-import
19dcbb1cb9 Import Picking and placing single houses in scenario editor patch 
Minor whitespace fixes

http://www.tt-forums.net/viewtopic.php?f=33&t=68894&view=unread#p1099696
 2015-08-03 21:29:13 +01:00
Jonathan G Rennison
5f1b148cf9 Initial minimal working tracerestrict implementation. 
This is a port of the tracerestrict/routing restrictions feature
from TTDPatch.
At present this implements if tests (train length only),
and pathfinder deny and penalty actions.
This requires the use of YAPF. Note that restrictions are only evaluated
within the YAPF lookahead distance.
 2015-07-28 01:36:52 +01:00
frosch
42630dfa01 (svn r27316) -Doc: Improve documentation on ScriptCargo::GetCargoLabel 2015-06-21 18:53:23 +00:00
frosch
de3bb62e9e (svn r27316) -Doc: Improve documentation on ScriptCargo::GetCargoLabel 2015-06-21 18:53:23 +00:00
alberth
ada765a7e1 (svn r27287) -Doc: Clarify radius and semantics of the industry producing/accepting tile functions. 2015-05-16 14:40:45 +00:00
alberth
514da346bd (svn r27287) -Doc: Clarify radius and semantics of the industry producing/accepting tile functions. 2015-05-16 14:40:45 +00:00
alberth
ad8a7aee30 (svn r27286) -Fix-ish(r27140): Also fix typo in the documentation. 2015-05-16 12:08:06 +00:00
alberth
10adedce5f (svn r27286) -Fix-ish(r27140): Also fix typo in the documentation. 2015-05-16 12:08:06 +00:00
frosch
108aa4e7af (svn r27258) -Fix [FS#6287]: ScriptList::RemoveList failed to remove a list from itself. 2015-04-27 19:28:22 +00:00
frosch
eb25d9e275 (svn r27258) -Fix [FS#6287]: ScriptList::RemoveList failed to remove a list from itself. 2015-04-27 19:28:22 +00:00
frosch
2edbc72ebd (svn r27192) -Change: heading for 1.6 now 2015-03-17 20:33:44 +00:00
frosch
6477356dd2 (svn r27192) -Change: heading for 1.6 now 2015-03-17 20:33:44 +00:00
alberth
da9721ffd6 (svn r27174) -Feature[FS#6236]: Display relative offset changes in the sprite aligner (juzza1). 2015-03-01 08:17:14 +00:00
alberth
a5843149b5 (svn r27174) -Feature[FS#6236]: Display relative offset changes in the sprite aligner (juzza1). 2015-03-01 08:17:14 +00:00
frosch
74b0e2b73e (svn r27166) -Codechange: Optimise ScriptList by making use of iterators instead of looking up map-items multiple times per API call. 2015-02-22 23:04:02 +00:00
frosch
fece468d96 (svn r27166) -Codechange: Optimise ScriptList by making use of iterators instead of looking up map-items multiple times per API call. 2015-02-22 23:04:02 +00:00
alberth
cd36ff1bfe (svn r27164) -Add: [NoGo] Game scripts can point to a location, station, industry, or town when publishing news. 2015-02-22 17:25:29 +00:00
alberth
0143f486f2 (svn r27164) -Add: [NoGo] Game scripts can point to a location, station, industry, or town when publishing news. 2015-02-22 17:25:29 +00:00
frosch
4b39e3d98c (svn r27152) -Fix: Generated files. 2015-02-15 14:56:21 +00:00
frosch
83a02da380 (svn r27152) -Fix: Generated files. 2015-02-15 14:56:21 +00:00
frosch
bf714413a2 (svn r27123) -Fix [FS#5371] [FS#6214]: API docs (krinn) 2015-01-20 19:11:31 +00:00
frosch
a55a5bff24 (svn r27123) -Fix [FS#5371] [FS#6214]: API docs (krinn) 2015-01-20 19:11:31 +00:00
alberth
39d6562158 (svn r27111) -Doc: Extend script documentation with Save and Load functions. 2015-01-04 15:14:13 +00:00
alberth
7023819d49 (svn r27111) -Doc: Extend script documentation with Save and Load functions. 2015-01-04 15:14:13 +00:00
rubidium
65f836f677 (svn r27104) -Fix [FS#6194]: support 64 bits integere in the ScriptLists as well 2015-01-01 21:08:19 +00:00
rubidium
14f197c6ff (svn r27104) -Fix [FS#6194]: support 64 bits integere in the ScriptLists as well 2015-01-01 21:08:19 +00:00
rubidium
978d4e4eaa (svn r27102) -Fix [FS#6194]: money values would end up wrong in strings when outside of the bounds of a 32 bits integer 2015-01-01 20:50:43 +00:00
rubidium
730773f5f1 (svn r27102) -Fix [FS#6194]: money values would end up wrong in strings when outside of the bounds of a 32 bits integer 2015-01-01 20:50:43 +00:00
rubidium
a0f58d54dc (svn r27032) -Merge: documentation updates from 1.4 branch 2014-10-23 09:47:15 +00:00
rubidium
e3791822b2 (svn r27032) -Merge: documentation updates from 1.4 branch 2014-10-23 09:47:15 +00:00
rubidium
c017c18c26 (svn r27026) -Fix: some (older-ish) GCC compiler warnings 2014-10-21 16:58:15 +00:00
rubidium
d1429cd936 (svn r27026) -Fix: some (older-ish) GCC compiler warnings 2014-10-21 16:58:15 +00:00
rubidium
0c2f4bdc2b (svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces) 2014-10-15 18:31:37 +00:00
rubidium
d534c80e94 (svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces) 2014-10-15 18:31:37 +00:00
rubidium
660a95e5d2 (svn r27003) -Cleanup: fix the use of spaces and asterices "around" some comments 2014-10-12 18:41:53 +00:00
rubidium
771dcf3b7b (svn r27003) -Cleanup: fix the use of spaces and asterices "around" some comments 2014-10-12 18:41:53 +00:00
frosch
fc36231cdf (svn r26915) -Fix: API docs 2014-09-24 16:45:20 +00:00
frosch
1c6705ba34 (svn r26915) -Fix: API docs 2014-09-24 16:45:20 +00:00
fonsinchen
df1971fbde (svn r26894) -Feature: Swap method for script lists 2014-09-21 16:25:15 +00:00
fonsinchen
1a5b2f0e17 (svn r26894) -Feature: Swap method for script lists 2014-09-21 16:25:15 +00:00
fonsinchen
d206b436aa (svn r26893) -Feature: ScriptStationList_Cargo for sorting cargo by from and via 2014-09-21 16:20:48 +00:00
fonsinchen
2128f1e929 (svn r26893) -Feature: ScriptStationList_Cargo for sorting cargo by from and via 2014-09-21 16:20:48 +00:00
fonsinchen
b6833fc6ef (svn r26892) -Feature: Script API for retrieving planned flow 2014-09-21 16:20:14 +00:00
fonsinchen
73d273ffd6 (svn r26892) -Feature: Script API for retrieving planned flow 2014-09-21 16:20:14 +00:00
rubidium
fa193ece85 (svn r26885) -Feature-ish: user interface for limiting the maximum height of a map 2014-09-21 12:25:04 +00:00
rubidium
c72d362840 (svn r26885) -Feature-ish: user interface for limiting the maximum height of a map 2014-09-21 12:25:04 +00:00
alberth
f24aa8807d (svn r26811) -Fix[FS#6108]: Fixed spelling error in widget name. 2014-09-11 17:10:38 +00:00