Commit Graph

868 Commits (2586096ef6bb1880830c4e64e677d46d9a232d02)

Author SHA1 Message Date
frosch e9fea1738a (svn r27545) -Fix: Remove special handling of classes with virtual methods from squirrel_export.awk. It seems to serve no purpose, except to break on 3 classes. 8 years ago
frosch 7e29551ae0 (svn r27544) -Fix-ish: Mark ScriptText::GetEncodedText as not part of any API, instead of relying on the export script to break on '/*'. 8 years ago
frosch 507e7135ec (svn r27544) -Fix-ish: Mark ScriptText::GetEncodedText as not part of any API, instead of relying on the export script to break on '/*'. 8 years ago
frosch 31bd5a09b6 (svn r27543) -Fix (r27379): ScriptExec/TestMode::FinalRelease is not part of the API. 8 years ago
frosch d70da28365 (svn r27543) -Fix (r27379): ScriptExec/TestMode::FinalRelease is not part of the API. 8 years ago
Jonathan G Rennison 54b8eb9b4c Merge branch 'polyline_track_tool' into jgrpp
# Conflicts:
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/viewport.cpp
#	src/viewport_func.h
8 years ago
patch-import 01cf154f51 Import polyline rail tool patch v10b
http://www.tt-forums.net/viewtopic.php?f=33&t=57080
8 years ago
keldorkatarn 5cc56d6ad9 Make 32 instead of 16 rail types possible. by using one free bit of m1 in the map array.
(cherry picked from commit b44843800880cdc186f5183301ee0f42afbb5f84)

Also set non-rail type M3 bits to 0 where applicable.
Change savegame versioning to SLXI format.
8 years ago
Jonathan G Rennison 41a06e698f Merge branch 'house_placing' into jgrpp
# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/town_gui.cpp
8 years ago
patch-import 0fd34a17a5 Update to v4 of house placing patch. 8 years ago
Jonathan G Rennison 57cbecb0e0 Merge branch 'master' into jgrpp 8 years ago
frosch fbd79d88f0 (svn r27518) -Update: Numbers 8 years ago
frosch 0c7c0ada78 (svn r27518) -Update: Numbers 8 years ago
Jonathan G Rennison 14bf956cec Merge branch 'master' into jgrpp 9 years ago
frosch e78a03d7b4 (svn r27463) -Merge: Documentation updates from 1.5 branch 9 years ago
frosch ae1d96cc2f (svn r27463) -Merge: Documentation updates from 1.5 branch 9 years ago
Jonathan G Rennison 19764bb4fb Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 9 years ago
Jonathan G Rennison 388dab7390 Merge branch 'master' into enhanced_viewport_overlay
Conflicts:
	src/road_gui.cpp
	src/widgets/dropdown.cpp
9 years ago
michi_cc 44918010df (svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists. 9 years ago
michi_cc 2b8bb12d62 (svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists. 9 years ago
frosch 63aa9f4ea8 (svn r27379) -Codechange: Do not throw in the destructors of ScriptTest/ExecMode. 9 years ago
frosch e5d105900d (svn r27379) -Codechange: Do not throw in the destructors of ScriptTest/ExecMode. 9 years ago
Jonathan G Rennison 7ed93f9211 Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
town_gui.cpp updated due to struct CommandContainer change.

Conflicts:
	src/command.cpp
	src/command_type.h
	src/gfxinit.cpp
	src/openttd.cpp
	src/pbs.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/stdafx.h
	src/train_cmd.cpp
	src/viewport_type.h
	src/window_type.h
9 years ago
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
9 years ago
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
9 years ago
Jonathan G Rennison ce34225b0e Merge branch 'house_placing' into jgrpp 9 years ago
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
9 years ago
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.
9 years ago
frosch 42630dfa01 (svn r27316) -Doc: Improve documentation on ScriptCargo::GetCargoLabel 9 years ago
frosch de3bb62e9e (svn r27316) -Doc: Improve documentation on ScriptCargo::GetCargoLabel 9 years ago
alberth ada765a7e1 (svn r27287) -Doc: Clarify radius and semantics of the industry producing/accepting tile functions. 9 years ago
alberth 514da346bd (svn r27287) -Doc: Clarify radius and semantics of the industry producing/accepting tile functions. 9 years ago
alberth ad8a7aee30 (svn r27286) -Fix-ish(r27140): Also fix typo in the documentation. 9 years ago
alberth 10adedce5f (svn r27286) -Fix-ish(r27140): Also fix typo in the documentation. 9 years ago
frosch 108aa4e7af (svn r27258) -Fix [FS#6287]: ScriptList::RemoveList failed to remove a list from itself. 9 years ago
frosch eb25d9e275 (svn r27258) -Fix [FS#6287]: ScriptList::RemoveList failed to remove a list from itself. 9 years ago
frosch 2edbc72ebd (svn r27192) -Change: heading for 1.6 now 9 years ago
frosch 6477356dd2 (svn r27192) -Change: heading for 1.6 now 9 years ago
alberth da9721ffd6 (svn r27174) -Feature[FS#6236]: Display relative offset changes in the sprite aligner (juzza1). 9 years ago
alberth a5843149b5 (svn r27174) -Feature[FS#6236]: Display relative offset changes in the sprite aligner (juzza1). 9 years ago
frosch 74b0e2b73e (svn r27166) -Codechange: Optimise ScriptList by making use of iterators instead of looking up map-items multiple times per API call. 9 years ago
frosch fece468d96 (svn r27166) -Codechange: Optimise ScriptList by making use of iterators instead of looking up map-items multiple times per API call. 9 years ago
alberth cd36ff1bfe (svn r27164) -Add: [NoGo] Game scripts can point to a location, station, industry, or town when publishing news. 9 years ago
alberth 0143f486f2 (svn r27164) -Add: [NoGo] Game scripts can point to a location, station, industry, or town when publishing news. 9 years ago
frosch 4b39e3d98c (svn r27152) -Fix: Generated files. 10 years ago
frosch 83a02da380 (svn r27152) -Fix: Generated files. 10 years ago
frosch bf714413a2 (svn r27123) -Fix [FS#5371] [FS#6214]: API docs (krinn) 10 years ago
frosch a55a5bff24 (svn r27123) -Fix [FS#5371] [FS#6214]: API docs (krinn) 10 years ago
alberth 39d6562158 (svn r27111) -Doc: Extend script documentation with Save and Load functions. 10 years ago
alberth 7023819d49 (svn r27111) -Doc: Extend script documentation with Save and Load functions. 10 years ago
rubidium 65f836f677 (svn r27104) -Fix [FS#6194]: support 64 bits integere in the ScriptLists as well 10 years ago
rubidium 14f197c6ff (svn r27104) -Fix [FS#6194]: support 64 bits integere in the ScriptLists as well 10 years ago
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 10 years ago
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 10 years ago
rubidium a0f58d54dc (svn r27032) -Merge: documentation updates from 1.4 branch 10 years ago
rubidium e3791822b2 (svn r27032) -Merge: documentation updates from 1.4 branch 10 years ago
rubidium c017c18c26 (svn r27026) -Fix: some (older-ish) GCC compiler warnings 10 years ago
rubidium d1429cd936 (svn r27026) -Fix: some (older-ish) GCC compiler warnings 10 years ago
rubidium 0c2f4bdc2b (svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces) 10 years ago
rubidium d534c80e94 (svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces) 10 years ago
rubidium 660a95e5d2 (svn r27003) -Cleanup: fix the use of spaces and asterices "around" some comments 10 years ago
rubidium 771dcf3b7b (svn r27003) -Cleanup: fix the use of spaces and asterices "around" some comments 10 years ago
frosch fc36231cdf (svn r26915) -Fix: API docs 10 years ago
frosch 1c6705ba34 (svn r26915) -Fix: API docs 10 years ago
fonsinchen df1971fbde (svn r26894) -Feature: Swap method for script lists 10 years ago
fonsinchen 1a5b2f0e17 (svn r26894) -Feature: Swap method for script lists 10 years ago
fonsinchen d206b436aa (svn r26893) -Feature: ScriptStationList_Cargo for sorting cargo by from and via 10 years ago
fonsinchen 2128f1e929 (svn r26893) -Feature: ScriptStationList_Cargo for sorting cargo by from and via 10 years ago
fonsinchen b6833fc6ef (svn r26892) -Feature: Script API for retrieving planned flow 10 years ago
fonsinchen 73d273ffd6 (svn r26892) -Feature: Script API for retrieving planned flow 10 years ago
rubidium fa193ece85 (svn r26885) -Feature-ish: user interface for limiting the maximum height of a map 10 years ago
rubidium c72d362840 (svn r26885) -Feature-ish: user interface for limiting the maximum height of a map 10 years ago
alberth f24aa8807d (svn r26811) -Fix[FS#6108]: Fixed spelling error in widget name. 10 years ago
alberth 22b967676e (svn r26811) -Fix[FS#6108]: Fixed spelling error in widget name. 10 years ago
alberth aa2078a40e (svn r26805) -Feature: Allow hiding of non-interesting engines in the autoreplace GUI. 10 years ago
alberth b4a87e7f45 (svn r26805) -Feature: Allow hiding of non-interesting engines in the autoreplace GUI. 10 years ago
alberth cb3f69f746 (svn r26804) -Feature: Allow hiding of non-interesting engines in the build vehicle GUI. 10 years ago
alberth a49744b50c (svn r26804) -Feature: Allow hiding of non-interesting engines in the build vehicle GUI. 10 years ago
alberth 5d38e0f24b (svn r26800) -Feature[FS#1640]: Vehicle sorting in autoreplace GUI. 10 years ago
alberth 81d2bdbf47 (svn r26800) -Feature[FS#1640]: Vehicle sorting in autoreplace GUI. 10 years ago
rubidium 5f8b37047a (svn r26797) -Codechange: rewrite the UTF8 reading code to make use of already existing functions instead of partially trying to implemented them 10 years ago
rubidium 876cc82f33 (svn r26797) -Codechange: rewrite the UTF8 reading code to make use of already existing functions instead of partially trying to implemented them 10 years ago
rubidium 9cbdd45751 (svn r26796) -Fix: reading of high byte of "ASCII" files yielded a negative int8, then casted to an uint32 which caused the Squirrel lexer to bail out. Regardless... the file isn't actually ASCII, but that's beyond the point for now 10 years ago
rubidium 385d3d3947 (svn r26796) -Fix: reading of high byte of "ASCII" files yielded a negative int8, then casted to an uint32 which caused the Squirrel lexer to bail out. Regardless... the file isn't actually ASCII, but that's beyond the point for now 10 years ago
rubidium be23e13e33 (svn r26785) -Fix [Squirrel]: loading a value saved as boolean caused it to be of type integer instead of boolean 10 years ago
rubidium 08cbf11539 (svn r26785) -Fix [Squirrel]: loading a value saved as boolean caused it to be of type integer instead of boolean 10 years ago
rubidium 00e1e69187 (svn r26784) -Codechange [Squirrel]: use WChar for the lexer 10 years ago
rubidium f41b4a8e1b (svn r26784) -Codechange [Squirrel]: use WChar for the lexer 10 years ago
rubidium 4506858a83 (svn r26782) -Fix (r26781): was in the wrong folder when commiting 10 years ago
rubidium b5f5e88d57 (svn r26782) -Fix (r26781): was in the wrong folder when commiting 10 years ago
rubidium a106bd1dd5 (svn r26776) -Codechange: use safe string functions in script/squirrel*.cpp 10 years ago
rubidium 962c1a3242 (svn r26776) -Codechange: use safe string functions in script/squirrel*.cpp 10 years ago
rubidium a7044da533 (svn r26775) -Cleanup [Squirrel]: "resolve" several of the unicode wrapper defines 10 years ago
rubidium e63ca12ab8 (svn r26775) -Cleanup [Squirrel]: "resolve" several of the unicode wrapper defines 10 years ago
rubidium 65cab46a84 (svn r26774) -Cleanup [Squirrel]: remove _SC macro 10 years ago
rubidium 33ab505567 (svn r26774) -Cleanup [Squirrel]: remove _SC macro 10 years ago
rubidium 95549e6da5 (svn r26771) -Cleanup: remove OTTD2SQ and SQ2OTTD 10 years ago
rubidium 7c4e9dd71d (svn r26771) -Cleanup: remove OTTD2SQ and SQ2OTTD 10 years ago
rubidium e874be7691 (svn r26769) -Codechange [Squirrel]: remove the difference between some platforms having wchar for SQChar and others just char; always use char (and UTF-8) like in the rest of (internal) OpenTTD 10 years ago
rubidium 7a00d2e849 (svn r26769) -Codechange [Squirrel]: remove the difference between some platforms having wchar for SQChar and others just char; always use char (and UTF-8) like in the rest of (internal) OpenTTD 10 years ago