Commit Graph

17770 Commits (7aab49e28249f6b750c2856d2909c47dc02296b7)

Author SHA1 Message Date
peter1138 f17d38598a (svn r27838) -Fix: Small news window's fake caption (r19943) was not sized to fit its text. 8 years ago
Jonathan G Rennison 85c7c4b307 Merge branch 'signal_tunnels_bridges' into jgrpp 8 years ago
Jonathan G Rennison ab595bf67c Fix bridge/tunnel exit PBS signals never being set to green. 8 years ago
Jonathan G Rennison f4b5efd67d Merge branch 'template_train_replacement' into jgrpp 8 years ago
Jonathan G Rennison 753fc2ab67 TBTR: Fix virtual rail engines not havign build year set. 8 years ago
Jonathan G Rennison 3084cac654 Merge branch 'enhanced_viewport_overlay' into jgrpp 8 years ago
Jonathan G Rennison f3ed6765a5 Add Ctrl+Click to scroll to plan. 8 years ago
Jonathan G Rennison a3d21411e7 Add a 'Show All' button to plans GUI. 8 years ago
Jonathan G Rennison b9e6ad1c6d Plans GUI: Fix various alignment issues.
Visibility button clicking, double mode, RTL mode, vertical alignment.
8 years ago
Jonathan G Rennison ac8b67ba9c Merge branch 'measurement_tool' into jgrpp 8 years ago
Jonathan G Rennison 0172f3acab Fix height above sea-level in measurement tool. 8 years ago
HackaLittleBit eddd635f00 Chunnel: Make error reporting consistent with tunnel length reporting at cursor.
Error reporting should be in tune with occurrence of events.
8 years ago
Jonathan G Rennison 0772236986 Add a release slot at front of train slot action.
Distinguish from release slot at back.
Fix slot release and acquire at front when passing PBS from back.
8 years ago
Jonathan G Rennison 870216d27c Show manage slots in veh/group window drop down even when no vehicles. 8 years ago
Jonathan G Rennison 7dbf99fa33 Add UI setting to hide adv tracerestrict features from GUI
Hide wait at PBS and slot features.
8 years ago
Jonathan G Rennison 9d0f0967f9 Enabled loading non-SLXI version 2002 tracerestrict savegames. 8 years ago
Jonathan G Rennison 19e5964b31 Bump tracerestrict version due to wait at PBS and slot features. 8 years ago
peter1138 60d4d1db3f (svn r27837) -Fix (r26969): Black remap did nothing in 8bpp-simple blitter. 8 years ago
Jonathan G Rennison 927323dcb1 Add trace restrict slot membership conditional. 8 years ago
Jonathan G Rennison 6417fb16c3 Initial implementation of trace restrict slots 8 years ago
Jonathan G Rennison 688ee9ac11 Add string control code to consume an argument. 8 years ago
translators a39bdc14a0 (svn r27836) -Update from Eints:
catalan: 2 changes by juanjo
8 years ago
Jonathan G Rennison 7194e19380 Merge branch 'save_ext' into tracerestrict-sx 8 years ago
Jonathan G Rennison 48bbe0325d Merge branch 'cpp-11' into save_ext 8 years ago
Jonathan G Rennison 4e9d4dd80a Add a PreCleanPool() static method to pool item types.
(cherry picked from commit 87142ed840)
8 years ago
Jonathan G Rennison a3034891a1 Add missing include guard for dyn arena alloc header. 8 years ago
Jonathan G Rennison dd0666c5f4 Add support for save/loading std::strings. 8 years ago
Jonathan G Rennison 2fb822d392 Fix includes and header guards of container functions. 8 years ago
translators 4d3d43a70e (svn r27835) -Update from Eints:
norwegian (bokmal): 37 changes by eirik174
8 years ago
peter1138 5bcc54e021 (svn r27834) -Change: Parse extmidi command string for parameters to pass on. 8 years ago
peter1138 4f3c7e74e7 (svn r27833) -Change: Trackdir maps directly to TrackdirBits 8 years ago
Jonathan G Rennison f58fe00294 Merge branch 'master' into save_ext 8 years ago
Jonathan G Rennison 0430502faa Merge branch 'tracerestrict' into tracerestrict-sx 8 years ago
Jonathan G Rennison 5a2d482c28 Tracerestrict: Add wait at PBS signal action. 8 years ago
peter1138 065a0547e2 (svn r27832) -Fix: Missing or incorrect colour codes in translations 8 years ago
Jonathan G Rennison c882082467 Chunnel: Fix swap of vehicle chunnel flag when reversing consist. 8 years ago
peter1138 348607aa89 (svn r27831) -Fix (r24577): Misaligned resize icon (due to widget bounds being inclusive) 8 years ago
translators 485c64fcbe (svn r27830) -Update from Eints:
catalan: 6 changes by juanjo
italian: 1 change by lorenzodv
russian: 6 changes by Lone_Wolf
8 years ago
peter1138 01c8ba0d5d (svn r27829) -Fix (r27821): Occasional crash caused by mixing int/uint arithmetic. 8 years ago
translators 7659ec05af (svn r27828) -Update from Eints:
croatian: 2 changes by VoyagerOne
italian: 6 changes by lorenzodv
english (us): 15 changes by Supercheese
latin: 15 changes by Supercheese
8 years ago
frosch 98673c94b8 (svn r27827) -Codechange (r27819): Deduplicate code. (adf88) 8 years ago
Jonathan G Rennison 612c825bb6 Chunnel: Minor whitespace/scope changes, rename function. 8 years ago
HackaLittleBit 2549def764 Chunnel: Use separate container function for chunnel related conditions. 8 years ago
peter1138 95cab27381 (svn r27826) -Fix (r27825): Wrong code style 8 years ago
peter1138 0e68f9db70 (svn r27825) -Feature [FS#4950]: Add option to close windows with right click (Flamefire) 8 years ago
translators 6ceb8a0d28 (svn r27824) -Update from Eints:
catalan: 7 changes by juanjo
croatian: 4 changes by VoyagerOne
korean: 15 changes by telk5093
scottish gaelic: 54 changes by GunChleoc
8 years ago
peter1138 4255e2e136 (svn r27823) -Fix: Vehicle viewport is not user scrollable so flag window as such. 8 years ago
peter1138 0887289e3d (svn r27822) -Feature: Vehicle Group Info: Add profits and occupancy display to group vehicle list (mtm, JGR) 8 years ago
peter1138 2c0ef5c659 (svn r27821) -Change: Draw images in centre of buttons (inspired by Juanjo) 8 years ago
Jonathan G Rennison 0d4bf16f57 Merge branch 'custom_bridgeheads' into jgrpp 8 years ago
Jonathan G Rennison 57a5f08687 Fix handling of custom bridge heads on steep slopes. 8 years ago
peter1138 6da57ed3e8 (svn r27820) -Fix: Allow dropdown to be drawn above origin widget even with scrollbar (Juanjo) 8 years ago
peter1138 abcab89af3 (svn r27819) -Fix (r26990): Update viewport sign dimensions when changing GUI zoom level. 8 years ago
translators b54d144b28 (svn r27818) -Update from Eints:
greek: 36 changes by kyrm
8 years ago
translators ccf94e8108 (svn r27817) -Update from Eints:
greek: 39 changes by kyrm
croatian: 7 changes by VoyagerOne
8 years ago
peter1138 48b9cbbb76 (svn r27816) -Fix [FS#6421]: Do not search directories when opening ini files as we already have their full path. 8 years ago
Jonathan G Rennison efe30c4299 Merge branch 'tracerestrict-sx' into jgrpp 8 years ago
Jonathan G Rennison 88a524717b Merge branch 'tracerestrict' into tracerestrict-sx
# Conflicts:
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
8 years ago
Jonathan G Rennison 58d8a791e4 Merge branch 'save_ext' into tracerestrict-sx 8 years ago
Jonathan G Rennison 2af2a49887 Revert "(svn r27811) -Change: Remove unused parameters in FreeTrainTrackReservation"
This reverts commit 166e504c13.

These parameters are used for tracerestrict functionality.
8 years ago
Jonathan G Rennison f9f2d37a8e Merge branch 'master' into tracerestrict
# Conflicts:
#	src/saveload/saveload.cpp
8 years ago
Jonathan G Rennison fc60857b66 Merge branches 'adjacent_crossings' and 'zoning' into jgrpp 8 years ago
Jonathan G Rennison 0c42b384bc Merge branch 'save_ext' into adjacent_crossings
# Conflicts:
#	src/train_cmd.cpp
8 years ago
translators 712dbeda33 (svn r27815) -Update from Eints:
russian: 7 changes by Lone_Wolf
8 years ago
Jonathan G Rennison c4e06808a2 Merge branch 'master' into save_ext 8 years ago
Jonathan G Rennison 6f07639c34 Merge branch 'master' into zoning
# Conflicts:
#	src/station_cmd.cpp
8 years ago
peter1138 5baf52b938 (svn r27814) -Change: Remove _roadveh_depot_exit_trackdir
_roadveh_depot_exit_trackdir was just a copy of
DiagDirToDiagTrackdir. (cirdan)
8 years ago
peter1138 c03ccdb36b (svn r27813) -Change: Remove _road_enter_dir_to_reachable_trackdirs
_road_enter_dir_to_reachable_trackdirs was just a copy of
DiagdirReachesTrackdirs. (cirdan)
8 years ago
peter1138 380e1a240f (svn r27812) -Fix: Road tunnel/bridge heads have no trackbits wrt catenary drawing
Road tunnels and bridges do not have any rail, so do not treat them
as if they had when drawing a catenary. (cirdan)
8 years ago
peter1138 166e504c13 (svn r27811) -Change: Remove unused parameters in FreeTrainTrackReservation
FreeTrainTrackReservation is always called with INVALID_TILE
and INVALID_TRACKDIR as second and third arguments, so remove
them and just use those constants instead. (cirdan)
8 years ago
peter1138 4107f78eae (svn r27810) -Change: Factor out reservation-handling code in station_cmd.cpp
Code dealing with freeing and restoring track reservations is
duplicated in CmdBuildRailStation and RemoveFromRailBaseStation;
make separate functions for it. (cirdan)
8 years ago
peter1138 040df26e9e (svn r27809) -Codechange: Improve check in UpdateLevelCrossing
In UpdateLevelCrossing, checking if a level crossing is reserved is
cheaper than finding trains on it or approaching it, so do it first. (cirdan)
8 years ago
peter1138 e3a1ae2be5 (svn r27808) -Codechange: Adjust the size of _track_crosses_trackdirs
_track_crosses_trackdirs is indexed by a Track, not a
Trackdir, so adjust its size accordingly. (cirdan)
8 years ago
peter1138 80303515c1 (svn r27807) -Codechange: Remove _ship_leave_depot_offs
There is already TileOffsByDiagDir for that. (cirdan)
8 years ago
peter1138 54ec06258a (svn r27806) -Codechange: Remove function ShipGetNewDirection
ShipGetNewDirection has no side effects and its return value
is ignored by its only caller, so do away with it.

Also remove now unused _new_vehicle_direction_table. (cirdan)
8 years ago
peter1138 f0062f94d6 (svn r27805) -Codechange: Remove function ShipGetNewDirectionFromTiles
The only user of ShipGetNewDirectionFromTiles can be better
served by DiagdirBetweenTiles, so remove the former. (cirdan)
8 years ago
translators bf30576255 (svn r27804) -Update from Eints:
italian: 7 changes by lorenzodv
luxembourgish: 11 changes by Phreeze
french: 7 changes by glx
8 years ago
Jonathan G Rennison b3fd11efd2 Merge branch 'master' into jgrpp
# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_anim_sse4.cpp
8 years ago
Jonathan G Rennison fae4ac1a5d Merge branch 'master' into save_ext
# Conflicts:
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
8 years ago
alberth 17b46109ad (svn r27803) -Change: Remove obsolete aircraft preview strings from other languages 8 years ago
alberth 1f70279419 (svn r27802) -Add: Display aircraft type in engine preview window (patch by Samu) 8 years ago
alberth 119965125d (svn r27801) -Change: Also rename long aircraft preview window strings of other languages 8 years ago
alberth b110c9c259 (svn r27800) -Change: Rename long aircraft string names of the preview window 8 years ago
alberth fa5fd39c23 (svn r27799) -Add: Display aircraft type in buy window (patch by Samu) 8 years ago
alberth 7c3004c785 (svn r27798) -Change: Also remove obsolete string from the other languages 8 years ago
alberth e2e9bd0b25 (svn r27797) -Add: Display aircraft type in its vehicle window (patch by Samu) 8 years ago
frosch 206a0838e9 (svn r27796) -Fix [FS#6545]: 32bpp-anim blitters assumed that pitch and width of the screen were equal. 8 years ago
translators 5c7f97aff2 (svn r27795) -Update from Eints:
luxembourgish: 3 changes by Phreeze
8 years ago
peter1138 36837a070c (svn r27794) -Fix [FS#6526]: Chat text background overflowed due to missing padding. 8 years ago
peter1138 57745b1c74 (svn r27793) -Fix [FS#6450]: Use of uninitialised variable cause lzo to fail. Add check for error status. 8 years ago
translators 9169ab6ce2 (svn r27789) -Update from Eints:
polish: 3 changes by wojteks86
greek: 1 change by kyrm
8 years ago
peter1138 a77044f185 (svn r27788) -Fix [FS#6536]: Get vehicle load amount after executing new cargo trigger. 8 years ago
Jonathan G Rennison ac69b746ab Merge branch 'master' into jgrpp
# Conflicts:
#	src/gfxinit.cpp
#	src/saveload/saveload.cpp
8 years ago
Jonathan G Rennison c1a26459d8 Merge branch 'chunnel' into jgrpp
# Conflicts:
#	src/ground_vehicle.hpp
8 years ago
HackaLittleBit de24fed9d1 Chunnel: Tunnels are only allowed to cross sea. 8 years ago
peter1138 980871a87b (svn r27787) -Fix: Update scrollbar when rebuilding AI/GS setting list. 8 years ago
peter1138 9a489375e3 (svn r27786) -Fix [FS#6479]: AI configuration changed incorrect parameter when some parameters are hidden. 8 years ago
peter1138 c366425de6 (svn r27785) -Fix [FS#6508]: Buoys not always drawn after being placed depending on zoom level (Samu). 8 years ago
peter1138 7501b7cf7a (svn r27784) -Fix [FS#6505]: Allow rail conversion even if ship is on tile (Samu). 8 years ago
frosch ed63b48e76 (svn r27780) -Update: Numbers 8 years ago
frosch d3de080883 (svn r27778) -Change [FS#6442-ish]: Convenience savegame bump to distinguish 1.7 savegames from 1.6 savegames. 8 years ago
frosch bc61ff380a (svn r27777) -Doc: Yearly increment 8 years ago
frosch ffcdd47321 (svn r27776) -Merge: Documentation updates from 1.6 branch 8 years ago
frosch 51c6ae62d1 (svn r27775) -Fix [FS#6510]: Insufficient thread synchronisation when switching blitters. (JGR) 8 years ago
frosch 5b7a04ca27 (svn r27774) -Fix [FS#5889]: Enabling palette animation for 32bpp blitters while paused skipped initialisation of the palette and resulted in black windows.
-Revert (r23978): No SDL-specific fix required anymore. The new fix applies to all backends.
8 years ago
Jonathan G Rennison d14d5731d8 Fix wrong palette being used when switching to animated blitter.
Fixes black sprites and UI elements when switching on full
animations on win32 and OSX.
8 years ago
frosch 5e28cc4757 (svn r27772) -Fix [FS#5819]: If the intro game had a savegame version which contains a NewGRF configuration, then townname NewGRFs would not be activated in the game options. 8 years ago
Jonathan G Rennison 2d473c05b0 Fix use-after-free when switching blitters in SDL and Win32 modes.
This mostly occurs when disabling pallete animation when fast-forward
is enabled.
8 years ago
translators 4d12cce1c4 (svn r27771) -Update from Eints:
malay: 27 changes by stress_043
8 years ago
Jonathan G Rennison 93a43da809 Chunnel: Prevent chunnels from intersecting with each other. 8 years ago
Jonathan G Rennison 4c9f7b73b3 Chunnel: Add a ground veh flag for (maybe) being in a chunnel
Use this to avoid inclination change code in non-chunnel wormholes.
8 years ago
Jonathan G Rennison ec9f0371e8 Chunnel: Adjust z position of vehicles in chunnels to go "under" the water. 8 years ago
fonsinchen 0d5ee772fc (svn r27770) -Fix [FS#6540]: Initialize variables in station_sl.cpp (JGR) 8 years ago
Jonathan G Rennison 68c280bef8 Ifdef out expensive assert in non-debug mode.
The vehicle slope algorithm goes to pains to avoid GetSlopePixelZ,
but then calls it anyway in the assert...
8 years ago
Jonathan G Rennison 0690dbb8bf Merge branch 'jgrpp' into chunnel 8 years ago
Jonathan G Rennison fa044852d5 Merge branch 'day_length' into jgrpp
# Conflicts:
#	src/saveload/afterload.cpp
8 years ago
Jonathan G Rennison 1f148322fb Reset day length factor to 1 when loading pre day length savegame 8 years ago
Jonathan G Rennison 11906f24c5 Merge branch 'save_ext' into day_length 8 years ago
frosch bc2382af06 (svn r27769) -Change: [NewGRF] Extend the DCxx range to D800-DFFF. 8 years ago
frosch 724f1f3b69 (svn r27768) -Codechange: Use if and IsInsideMM instead of switch-case sequences to test for consecutive values. 8 years ago
frosch f469b0be3e (svn r27767) -Codechange: Industries and houses should just use the default-case in Action 4. 8 years ago
frosch 4180276c81 (svn r27766) -Fix: Obiwan opposed translations for text id D3FF and DCFF in Action 13. 8 years ago
Jonathan G Rennison 500ef49694 Chunnel: Double cost of building and removing chunnels. 8 years ago
Jonathan G Rennison 89a0a9c182 Chunnel: Use hash table for tunnel search, change tunnel fields and savegame format. 8 years ago
Jonathan G Rennison ad15b47f72 Chunnel: Fix setting of tunnel ID in load conversion, add method to set ID. 8 years ago
Jonathan G Rennison afd8c6b867 Chunnel: Increase tunnel pool size, make tunnel IDs 32 bit.
Add lookup mechanism for tunnel IDs which don't fit in 16 bits in M2.
8 years ago
Jonathan G Rennison 87142ed840 Add a PreCleanPool() static method to pool item types. 8 years ago
Jonathan G Rennison 702404dc6a Fix issues with uncleared variables when loading old save games. 8 years ago
Jonathan G Rennison 79439925c8 Clear discardable chunk IDs in SlXvResetState. 8 years ago
translators 3342c5a367 (svn r27765) -Update from Eints:
russian: 4 changes by Lone_Wolf
8 years ago
Jonathan G Rennison 212f6ce6ef Chunnel: Add setting to enable construction, default off. 8 years ago
Jonathan G Rennison 3fde2cb5b1 Remove unused constant from newgrf_config.cpp 8 years ago
Jonathan G Rennison 02b33e7f64 Chunnel: Add error text for too many tunnels. 8 years ago
Jonathan G Rennison ab38623ea6 Chunnel: Adjust documentation and whitespace in tunnel_map.h 8 years ago
Jonathan G Rennison 75410ddae4 Chunnel: Save/load changes 8 years ago
Jonathan G Rennison aac5b2d4ad Chunnel: Adjust struct Tunnel constructor 8 years ago
Jonathan G Rennison ee0d6e2fe6 Chunnel: Remove debug prints from afterload code. 8 years ago
Jonathan G Rennison 04244e7215 Chunnel: Fix typo in name of GetOtherTunnelBridgeEndOld 8 years ago
Jonathan G Rennison 21bbb42d7e Chunnel: Adjust arguments of IsTunnelInWay 8 years ago
Jonathan G Rennison 13a716980a Chunnel: String text adjustments. 8 years ago
HackaLittleBit 7e6215f271 Chunnel patch 28401: Add: Tile description chunnel.
https://www.tt-forums.net/viewtopic.php?p=1183580#p1183580
8 years ago
HackaLittleBit 15c8e67655 Chunnel patch 28400: Codechange: Chunnels can now pass normal tunnels, fixed tile highlighting, fixed ramp detection.
https://www.tt-forums.net/viewtopic.php?p=1183580#p1183580
8 years ago
HackaLittleBit 7808370f86 Chunnel patch 28399: debug [modified]
Don't remove other debug outputs

https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
8 years ago
HackaLittleBit f173b74e81 Chunnel patch 28398: Codechange: Save Tunnel Pool.
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
8 years ago
HackaLittleBit 1ac8f66de1 Chunnel patch 28397: Codechange: Chunnels can't pass oilrigs.
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
8 years ago
HackaLittleBit dfce9cc4c0 Chunnel patch 28396: Codechange: Chunnel portal must have minimal length of 4 tiles.
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
8 years ago
HackaLittleBit dee526c6d6 Chunnel patch 28395: Add: Basic chunnel. Creating tunnels under water.
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
8 years ago
HackaLittleBit f7ced74c22 Chunnel patch 28394: Codechange: Rework IsTunnelInWay proc.
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
8 years ago
HackaLittleBit 67e7d12eb7 Chunnel patch 28393: Codechange: Rework GetOtherTunnelEnd proc.
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
8 years ago
HackaLittleBit ad070b91ea Chunnel patch 28392: Add: Basic tunnel pool. (no save)
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
8 years ago
Jonathan G Rennison 54494a0a7c Merge branch 'send_money_company' into jgrpp 8 years ago
Jonathan G Rennison 9c74da46b1 Change send money to company messages to be broadcasts.
Adjust text formatting depending on whether current client is
the source, destination or neither.
8 years ago
Jonathan G Rennison 63629852f7 Add a second int64 data field to chat arbitrary data field. 8 years ago
Jonathan G Rennison 3001595916 Change chat arbitrary data field from an int64 to a struct. 8 years ago
Jonathan G Rennison c70a60fd18 Add another network broadcast mode. 8 years ago
translators d22b80779b (svn r27764) -Update from Eints:
russian: 3 changes by Lone_Wolf
french: 6 changes by glx
8 years ago
Jonathan G Rennison 49e922daa6 Remove stub HandleOnEditText and now unused global variables. 8 years ago
patch-import f820543391 Import give money to company patch
From: https://www.tt-forums.net/viewtopic.php?p=1183311#p1183311

Fix language files and minor formatting issues
8 years ago
translators a8f9520bbd (svn r27763) -Update from Eints:
korean: 6 changes by telk5093
frisian: 2 changes by Fopper
russian: 5 changes by Lone_Wolf
8 years ago
patch-import 7b88f7a290 Add minimum town distance patch, with minor modifications
Move implicitly added value of 20 to setting default.
Adjust setting texts.

From: https://www.tt-forums.net/viewtopic.php?p=1095146#p1095146
8 years ago
Jonathan G Rennison 7f66d4bc6a Merge branch 'cpp-btree' into jgrpp 8 years ago
Jonathan G Rennison 344f39196f cpp-btree: Remove remaining uses of ssize_t
This is due to issues building on Windows
8 years ago
Jonathan G Rennison deb6a4f5c1 Merge branch 'template_train_replacement' into jgrpp 8 years ago
Jonathan G Rennison 939a350864 TBTR: Assume that virtual vehicles are on a suitably powered railtype. 8 years ago
translators a192fa74a7 (svn r27762) -Update from Eints:
catalan: 5 changes by juanjo
greek: 29 changes by kyrm
croatian: 2 changes by UnderwaterHesus
japanese: 4 changes by nex259
8 years ago
Jonathan G Rennison a6168dd2f0 Merge branch 'master' into jgrpp
# Conflicts:
#	src/saveload/company_sl.cpp
8 years ago
Jonathan G Rennison 8cf0f354d9 Merge branch 'tracerestrict-sx' into jgrpp 8 years ago
translators 9071d5f07f (svn r27761) -Update from Eints:
croatian: 3 changes by VoyagerOne
italian: 5 changes by lorenzodv
english (us): 4 changes by Supercheese
latin: 4 changes by Supercheese
8 years ago
Jonathan G Rennison 87f583fd99 Merge branch 'tracerestrict' into tracerestrict-sx 8 years ago
Jonathan G Rennison b6e001f20e Fix evaluation of PBS entry signal conditional after reserve through. 8 years ago
Jonathan G Rennison 13f8de58c3 Add instruction move up/down buttons to GUI.
Has block and individual instruction move modes, depending on ctrl.
8 years ago
Jonathan G Rennison f10c32de53 Fix removal of double-length conditional instructions (PBS entry signal). 8 years ago
Jonathan G Rennison a2a8f7f7b7 Change goto signal button in GUI to have push-button behaviour. 8 years ago
Jonathan G Rennison f192865c27 Allow shallow-removing conditional blocks by use of ctrl+click. 8 years ago
Jonathan G Rennison 0ebfcc23a5 Implement instruction scroll-to for PBS entry signal conditional in GUI. 8 years ago
frosch 60f7168c22 (svn r27760) -Change: Enable realisitic train and road vehicle acceleration by default. 8 years ago
frosch 40eee1e3a2 (svn r27759) -Fix: strgen compilation 8 years ago
frosch ce32ca4dc6 (svn r27758) -Change: Increase the maximum number of GameScript texts to 64k, and NewGRF texts to 512k. 8 years ago
frosch 0c1fcc02ec (svn r27757) -Change: Make StringID 32bit. 8 years ago
frosch 49b940f69c (svn r27756) -Codechange: Add StringTab enum 8 years ago
frosch b54a79f13e (svn r27755) -Codechange: Move TAB_SIZE to strings_type.h and use it consistently. 8 years ago
frosch 02967c3c08 (svn r27754) -Codechange: Add GetStringTab(), GetStringIndex() and MakeStringID() to access the structure of StringIDs. 8 years ago
translators d5c6760c85 (svn r27753) -Update from Eints: 8 years ago
alberth fa81e20390 (svn r27752) -Cleanup: Remove obsolete strings from other languages as well. 8 years ago
alberth 34ca88c098 (svn r27751) -Feature: Display cargo suffix of accepted cargoes in industry view based on cb37 result type.
Industry-sets that have no stockpiling get better control over the displayed accepted cargo information.
- result 0401 only prints the accepted cargo
- results 0800-0BFF prints the accepted cargo and a string (but not the amount)
8 years ago
alberth 5bcca41ace (svn r27750) -Codechange: Add cb37 result type to the cargo suffix. 8 years ago
alberth c9a8360419 (svn r27749) -Codechange: Fold cb37 cargo suffix text in a structure. 8 years ago
translators 04040a6a6d (svn r27748) -Update from Eints:
polish: 1 change by wojteks86
8 years ago
Jonathan G Rennison bdc5820836 Merge branch 'master' into jgrpp
# Conflicts:
#	src/road_cmd.cpp
8 years ago
Jonathan G Rennison df3c10c523 Merge branch 'infrastructure_sharing' into jgrpp
# Conflicts:
#	src/infrastructure.cpp
#	src/order_cmd.cpp
8 years ago
Jonathan G Rennison f3b1059930 Fix order removal due to shared-infra company deletion.
Order totals were not updated correctly, implicit orders not handled
properly, etc.
Create generic function for vehicle order filtering.
Use for station deletion and infra sharing company deletion.
8 years ago
Jonathan G Rennison 091c30e254 Merge branch 'custom_bridgeheads' into jgrpp 8 years ago
Jonathan G Rennison 3278051913 Fix crash when removing secondary road type from tunnel. 8 years ago
Jonathan G Rennison c6fa52f1f1 Fix wrong calculation of road tunnel infrastructure counts. 8 years ago
Jonathan G Rennison adb4463e5e Add console command to check caches. 8 years ago
Jonathan G Rennison 3813b3ca09 Dump infrastructure totals when mismatch detected in CheckCaches. 8 years ago
Jonathan G Rennison e11f295b29 Change console command to unblock heliports to be unlisted. 8 years ago
Jonathan G Rennison 2fbeb29277 Merge branch 'crashlog_improvements' into jgrpp
# Conflicts:
#	src/misc.cpp
#	src/openttd.cpp
8 years ago
Jonathan G Rennison 349ddd90b7 Maintain a circular buffer of recent commands, add to crashlog.
Add console command to dump command log.
Increase max crashlog size.
8 years ago
Jonathan G Rennison 3884ea5da1 Add option for console commands to be unlisted. 8 years ago
Jonathan G Rennison 3ba859727c Increase verbosity of asserts in OrderList::DebugCheckSanity. 8 years ago
Jonathan G Rennison fe150d097d Merge branches 'cpp-btree' and 'progsig-sx' into jgrpp 8 years ago
Jonathan G Rennison e459ebe2ad Remove assert.h include from progsig, as this overrides OpenTTD's assert 8 years ago
Jonathan G Rennison 418e9f4158 Remove assert.h include from btree.h, as this overrides OpenTTD's assert 8 years ago
Jonathan G Rennison 064a36b319 Merge branch 'crashlog_improvements' into jgrpp 8 years ago
Jonathan G Rennison 102405e082 Fix recursive faults in Window crash logger due to message box event loop. 8 years ago
Jonathan G Rennison 018cc59079 Add scope logging for IndividualRoadVehicleController. 8 years ago
Jonathan G Rennison bac7fe5542 Increase maximum permitted group name length. 8 years ago
translators 9eff17e66b (svn r27747) -Update from Eints:
korean: 7 changes by telk5093
8 years ago
Jonathan G Rennison 987e752cee Fix articulated trams decoupling when turning around
In the case where the front of the tram starts turning due to a
non-waitable dead-end, and before the next vehicle part can turn
the dead-end is removed.
8 years ago
Jonathan G Rennison f89e8b76d6 Fix increased number of NewGRFs support.
Improve error handling if multiplayer limit is exceeded.
8 years ago
Jonathan G Rennison 7e89b9789f Linkgraph: Fix divide by 0 error when total linkgraph cost estimate <= 1. 8 years ago
Jonathan G Rennison e474f3b740 Merge remote-tracking branch 'kiwitreekor/jgrpp' into jgrpp 8 years ago
Jonathan G Rennison fba4268127 Build and refit vehicle test no longer needs to match exec command. 8 years ago
kiwitreekor daa9671aee Translation update for JGRPP 0.17.0
Add String STR_CONFIG_SETTING_ENABLE_ROAD_CUSTOM_BRIDGE_HEADS and STR_CONFIG_SETTING_ENABLE_ROAD_CUSTOM_BRIDGE_HEADS_HELPTEXT
8 years ago
Jonathan G Rennison 4550ac39b9 Merge branch 'signal_tunnels_bridges' into jgrpp 8 years ago
Jonathan G Rennison e1ee952b85 Fix crash when updating infrastructure totals when deleting bridge with signals. 8 years ago
frosch 9d85de4d3e (svn r27746) -Fix [FS#6538]: PR_CLEAR_ROAD refers to cost per roadbit. Removing secondary roadtypes from bridges was too cheap. (JGR) 8 years ago
translators 594b328c7e (svn r27744) -Update from Eints:
basque: 20 changes by Thadah
dutch: 4 changes by habell
8 years ago
Jonathan G Rennison 7f9ce94cbc Change SharesMap form std::map to btree map. 8 years ago
Jonathan G Rennison 117b56caeb Linkgraph: Replace a std::list with a std::vector. 8 years ago
Jonathan G Rennison c86a027e88 Linkgraph: Use an arena allocator for path objects.
Fixes leaks when job is aborted early.
8 years ago
Jonathan G Rennison a67ecb4f6e Merge branch 'cpp-11' into jgrpp 8 years ago
Jonathan G Rennison 3f2c561867 Linkgraph: Add support for aborting MCF passes early. 8 years ago
Jonathan G Rennison 2080daab8d Linkgraph: Refactoring to avoid manual deletes. 8 years ago
Jonathan G Rennison 8f3e0c4fe5 Add a custom arena allocator utility. 8 years ago
Jonathan G Rennison 28211c21fc Linkgraph: Fix a memory leak when aborting job early. 8 years ago
Jonathan G Rennison 9d5f34fea6 Replace various uses of std::set/map with btree containers. 8 years ago
Jonathan G Rennison 76de8f9b13 Merge branch 'cpp-btree' into jgrpp
# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	source.list
8 years ago
Jonathan G Rennison ea11846d5d Merge branch 'master' into jgrpp 8 years ago
Jonathan G Rennison b4cfb1adbc Import cpp-btree library into 3rdparty section.
Repo: https://github.com/JGRennison/cpp-btree
Commmit: 6cabdb40fcbb7e12e6d499f92b898f6ec80ae0f1

Remove test program, build scripts, etc.
8 years ago
Jonathan G Rennison 9d9799a39f Merge branch 'template_train_replacement' into jgrpp 8 years ago
Jonathan G Rennison 120fcf995d TBTR: Remove unused const variable. 8 years ago
Jonathan G Rennison 97d718ecee Merge branch 'lifetime_profit-sx' into jgrpp
# Conflicts:
#	src/vehicle_gui.cpp
8 years ago
Jonathan G Rennison 9d8b1731cf Merge branch 'lifetime_profit' into lifetime_profit-sx 8 years ago
Jonathan G Rennison 6d99162df9 Fix disable mask for sorter drop-down being mis-aligned.
Sort by length was incorrectly available, and crashed for non ground
vehicles.
8 years ago
Jonathan G Rennison 2533210fc9 Fix tunnels underground view merge issue with custom bridgeheads. 8 years ago
Jonathan G Rennison 072915f2c7 Merge branch 'custom_bridgeheads' into jgrpp
# Conflicts:
#	docs/landscape_grid.html
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/tunnelbridge_cmd.cpp
#	src/tunnelbridge_map.h
8 years ago
Jonathan G Rennison 079a5a66da Custom bridge heads: Relax ownership checks to be similar to plain roads. 8 years ago
Jonathan G Rennison da177d063f Custom bridge heads: Initial implementation 8 years ago
Jonathan G Rennison 9782d70c53 Merge branch 'house_placing' into jgrpp
# Conflicts:
#	src/lang/korean.txt
8 years ago
Jonathan G Rennison e97a393a0f Merge branch 'master' into house_placing 8 years ago
Jonathan G Rennison e079fd043f Revert "(svn r27739) -Cleanup/Revert (r12162): Clearing MP_HOUSE with DC_EXEC always fails, so there is no effect in testing for houses first. (adf88)"
This reverts commit 6c573dc3b5.

This is to avoid clashing with the housing pick/place patch
8 years ago
Jonathan G Rennison 1f727e9029 Custom bridge heads: Add savegame version and setting. 8 years ago
frosch 30637d1580 (svn r27743) -Fix [FS#6537]: Extra viewports did not center on the selected tile. (hackalittlebit) 8 years ago
translators 31d4b1e8d6 (svn r27742) -Update from Eints:
spanish (mexican): 1 change by Absay
8 years ago
Jonathan G Rennison 3b45419a16 Merge branch 'master' into save_ext 8 years ago
Jonathan G Rennison 1e5c788541 Merge branch 'signal_tunnels_bridges' into jgrpp
# Conflicts:
#	src/table/settings.ini
#	src/tunnelbridge.h
8 years ago
Jonathan G Rennison d762835903 Signals on tunnel/bridges are now added to infrastructure stats. 8 years ago
Jonathan G Rennison 1e1fcc471b Replace leftover debug print from veh repair fix with scope info fmt.
Fixes c6b1decaf
8 years ago
Jonathan G Rennison cfc04c6408 Merge branch 'lifetime_profit-sx' into jgrpp
# Conflicts:
#	src/vehicle_base.h
8 years ago
Jonathan G Rennison 38bf6ade69 Merge branch 'lifetime_profit' into lifetime_profit-sx 8 years ago
Jonathan G Rennison 529aafd257 Reset overall lifetime profit to 0 when renewing vehicle. 8 years ago
Jonathan G Rennison 55e56cda52 Increase maximum permitted vehicle name length. 8 years ago
translators 0fc88ade9f (svn r27741) -Update from Eints:
luxembourgish: 26 changes by Phreeze
russian: 1 change by Lone_Wolf
8 years ago
translators cd18f2c10c (svn r27740) -Update from Eints:
korean: 1 change by telk5093
8 years ago
Jonathan G Rennison f3bea35fcc Merge branches 'template_train_replacement' and 'infrastructure_sharing' into jgrpp 8 years ago
Jonathan G Rennison 11e4bcee40 Slightly decrease proximity required for trains to crash.
This is to fix trains of different companies being able to crash when
two stations or line-ends are directly against each other.
8 years ago
Jonathan G Rennison f499de6673 TBTR: Fix incorrect cost estimates in GUI for templates. 8 years ago
Jonathan G Rennison 6ec8722258 Minor fixes and refactoring of timetable automation set/clear command. 8 years ago
Jonathan G Rennison 1276f5345d Implement a natural sort function to use if ICU is not usable. 8 years ago
Jonathan G Rennison ea9b28ef8c Merge branch 'cargo_type_order' into jgrpp
# Conflicts:
#	src/order_gui.cpp
8 years ago
Jonathan G Rennison c60bc7be1a Fix refresh/validity issues for cargo type orders GUI.
Handle case where the order disappears/moves, fixes crash if
order list is now too short.
Refresh drop-down when running as a multiplayer client, or
when another player updates the cargo options.
8 years ago
frosch 6c573dc3b5 (svn r27739) -Cleanup/Revert (r12162): Clearing MP_HOUSE with DC_EXEC always fails, so there is no effect in testing for houses first. (adf88) 8 years ago
Jonathan G Rennison da058213e6 Merge branch 'group_collapse' into jgrpp 8 years ago
Jonathan G Rennison a0fe6c3c3f Fix collapse all disable state and functionality when partially collapsed.
Fix being able to collapse empty groups with double-click.
8 years ago
Jonathan G Rennison 24b3424ca3 Merge branch 'template_train_replacement' into jgrpp
# Conflicts:
#	src/economy.cpp
#	src/network/network_command.cpp
#	src/saveload/extended_ver_sl.cpp
8 years ago
Jonathan G Rennison d4157b3662 TBTR: Handle leftover template vehicles without owners in old saves. 8 years ago
Jonathan G Rennison 285ba41699 TBTR: Fix spelling issues in comment and a method name. 8 years ago
Jonathan G Rennison 4800e47270 TBTR: Remove partial implementation of all-group replacement. 8 years ago
Jonathan G Rennison e79541b166 TBTR: Remove/change owner of template vehicles on company buy/deletion. 8 years ago
Jonathan G Rennison d17d2f81dd TBTR: Remove lots of unused/dead code. 8 years ago
Jonathan G Rennison 1b3077bdc9 TBTR: Clean up template replacements when removing company. 8 years ago
Jonathan G Rennison b3f49672ec Change default for cargo recalc interval not scaled by day length, to true. 8 years ago
Jonathan G Rennison 71bda2a4dd Merge branch 'more_cond_orders-sx' into jgrpp 8 years ago
Jonathan G Rennison 03f3ba157b Merge branch 'more_cond_orders' into more_cond_orders-sx 8 years ago
Jonathan G Rennison 15e4174332 Fix inverted condition for cargo waiting conditional order.
Fixes incorrect port in 2d47c47a
8 years ago
translators 3245922407 (svn r27738) -Update from Eints:
croatian: 1 change by VoyagerOne
8 years ago
translators 1d6f3fda80 (svn r27737) -Update from Eints:
czech: 27 changes by djst
8 years ago
Jonathan G Rennison d25daebf2f Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
8 years ago
Jonathan G Rennison 82152d8605 Merge branch 'tracerestrict' into tracerestrict-sx
# Conflicts:
#	src/saveload/saveload.cpp
8 years ago
Jonathan G Rennison f5e4d8e73a Merge branch 'master' into tracerestrict
# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
8 years ago
Jonathan G Rennison 90cd312428 Merge branch 'master' into jgrpp
# Conflicts:
#	src/fios.h
8 years ago
translators 2335acdc16 (svn r27736) -Update from Eints:
italian: 1 change by lorenzodv
8 years ago
translators 140bb8409a (svn r27735) -Update from Eints:
catalan: 1 change by juanjo
8 years ago
frosch 2f5cc263c7 (svn r27734) -Change: Hide the drive-in stops from the tram station picker. 8 years ago
frosch a2e53d5ab4 (svn r27733) -Codechange: Pass NPF user data as void* instead of as array of integers. 8 years ago
Jonathan G Rennison 1ff60c44bf Increase max vehicle-type unit setting limits. 8 years ago
Jonathan G Rennison 42a4bd63e0 Adjust setting texts for pay for repair, and move within settings GUI. 8 years ago
Jonathan G Rennison c6b1decafd Do not pay for repair cost when vehicle is being auto-replaced. 8 years ago
frosch 050271ed2d (svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message. 8 years ago
frosch 79027cbf9d (svn r27730) -Change: Split openttd.grf into openttd.grf and orig_extra.grf
openttd.grf is now always loaded and provides all extra graphics in case the (possibly outdated) baseset does not.
  orig_extra.grf contains graphics specific to the original baseset only.
8 years ago
frosch 8bd3a8a991 (svn r27729) -Codechange: Do not count static NewGRF when checking for the maximum number of NewGRFs in a game.
-Codechange: Remove LAST_GRF_SLOT and MAX_NEWGRFS. Now NETWORK_MAX_GRF_COUNT is the only constant to specify the maximum number of non-static NewGRF.
-Codechange: Increase the number of file slots, effectively increasing the maximum number of static NewGRF and baseset GRFs.
8 years ago
Jonathan G Rennison c600ffe6d5 Fix go to nearest depot and halt orders, not halting. 8 years ago
translators 9f858cefd1 (svn r27728) -Update from Eints:
latin: 1 change by Supercheese
8 years ago
frosch b276dd7c63 (svn r27726) -Fix: Improve error message when trying to build rail track over a depot. (adf88) 8 years ago
frosch a76847f362 (svn r27725) -Codechange: Remove IsOpenTTDBaseGRF and test for GCF_CONFIG instead, which does the same in all use-cases. 8 years ago
frosch dc024f0e3a (svn r27724) -Cleanup: Remove pointless usage of IsOpenTTDBaseGRF. System GRFs are never listed in the NewGRF GUI. 8 years ago
frosch 373a6d3497 (svn r27723) -Codechange: Simplify tests by using GCF_SYSTEM. 8 years ago
frosch ca329cd275 (svn r27722) -Fix (r7490): GCF_SYSTEM was never set correctly. 8 years ago
frosch 4955e71ee0 (svn r27721) -Fix: Testing GRFs for static-safety (when reloading the config) invalidated file slot 62, which may be in use by an active GRF. 8 years ago
translators 43ee8e8d38 (svn r27720) -Update from Eints:
turkish: 25 changes by barisdemirdelen
8 years ago
Jonathan G Rennison d361120fa0 Merge branch 'master' into jgrpp 8 years ago
Jonathan G Rennison 7ecdebddb3 Change and simplify algorithm for vehicle repair cost.
This is due to absurdly high repair costs for old vehicles with
old algorithm, due to implicit exponential increases.
Get rid of variable in vehicle struct.
8 years ago
Jonathan G Rennison a71a6ecec2 Fix Pop() method of SmallStack/StationIDStack.
Fixes 8deac54c
8 years ago
Jonathan G Rennison 51d4a6b14d Merge branch 'improved_breakdowns' into jgrpp 8 years ago
Jonathan G Rennison 5ba666883b Fix double/inconsistent updating of variables when servicing vehicle. 8 years ago
Jonathan G Rennison dcbde21f18 Merge branch 'save_ext' into improved_breakdowns
# Conflicts:
#	src/train_cmd.cpp
8 years ago
translators 12d17ed62b (svn r27719) -Update from Eints:
polish: 25 changes by nouwak
8 years ago
translators a8496153d6 (svn r27718) -Update from Eints:
spanish (mexican): 25 changes by Absay
8 years ago
translators 151956d471 (svn r27717) -Update from Eints:
spanish: 2 changes by SilverSurferZzZ
8 years ago
Jonathan G Rennison 5e30d389af Merge branch 'signal_tunnels_bridges' into jgrpp 8 years ago
Jonathan G Rennison 08062096ab Make back of bridge/tunnel PBS exit a line-end safe waiting point. 8 years ago
Jonathan G Rennison 074555e41d Merge branch 'save_ext' into signal_tunnels_bridges 8 years ago
translators 9bbc6e7ab5 (svn r27716) -Update from Eints:
catalan: 1 change by juanjo
8 years ago
translators db6e65f4f3 (svn r27715) -Update from Eints:
spanish: 2 changes by SilverSurferZzZ
8 years ago
Jonathan G Rennison 5c7f36ef4b Merge branch 'enhanced_viewport_overlay' into jgrpp
Further fixes for viewport lines/marker for multiplayer clients.

# Conflicts:
#	src/lang/russian.txt
8 years ago
Jonathan G Rennison 509da024cc Fix viewport order lines/markers for multiplayer clients. 8 years ago
Jonathan G Rennison 0d1e08ed75 Merge branch 'save_ext' into enhanced_viewport_overlay
# Conflicts:
#	src/clear_cmd.cpp
8 years ago
Jonathan G Rennison 56f173e15e Merge branch 'master' into save_ext 8 years ago
translators 1c7e978b09 (svn r27714) -Update from Eints:
catalan: 2 changes by juanjo
russian: 1 change by Lone_Wolf
8 years ago
frosch d1c64315cd (svn r27713) -Fix [FS#6527]: Setup clipping areas for individual widgets when drawing. (adf88) 8 years ago
frosch dbe969087d (svn r27712) -Codechange: Reduce recursions in DrawOverlappedWindow by limiting the area to the window bounds first. (adf88) 8 years ago
frosch 60a79b599e (svn r27711) -Doc: Fontsizes (adf88) 8 years ago
frosch 14dba9764b (svn r27710) -Change: Limit waypoint area by maximum station spread already when dragging. (adf88) 8 years ago
frosch d8a316d7c5 (svn r27709) -Fix-ish: Silence some warnings. (adf88) 8 years ago
translators c917ed2112 (svn r27708) -Update from Eints:
catalan: 26 changes by juanjo
russian: 9 changes by Lone_Wolf
8 years ago
frosch 2be42dadea (svn r27707) -Fix: Make the result of NewGRF's CARGO_NAME string code reliably print 'Nothing', if an invalid type is provided. 8 years ago
frosch 9145e5d2b5 (svn r27706) -Feature: [NewGRF] String command 9A 1E to print the name of a cargo type. 8 years ago
frosch 124f386fd1 (svn r27705) -Doc: Add the hex codes to the SCC_NEWGRF_ enum entries. 8 years ago
translators 2507487877 (svn r27704) -Update from Eints:
welsh: 29 changes by kazzie
spanish: 2 changes by SilverSurferZzZ
russian: 13 changes by Lone_Wolf
8 years ago
translators 6de1225894 (svn r27702) -Update from Eints:
russian: 16 changes by Lone_Wolf
8 years ago
translators ca65ea003d (svn r27701) -Update from Eints:
russian: 37 changes by Lone_Wolf
8 years ago
frosch 1522558cf7 (svn r27700) -Codechange: Simplify railtype date introduction. A check that is safe to run every day before the last railtype has been introduced, is also safe to run after the last railtype has been introduced. 8 years ago
translators be21109989 (svn r27699) -Update from Eints:
russian: 1 change by Lone_Wolf
8 years ago
translators 2171a56c15 (svn r27698) -Update from Eints:
spanish: 3 changes by SilverSurferZzZ
russian: 3 changes by Lone_Wolf
8 years ago
Jonathan G Rennison 66751457ad Fix train crash on bridge/tunnel with signals leaving red signals.
Update signals on far end of bridge/tunnel.
If clearing the crash results in a clear bridge/tunnel, set all
bridge/tunnel signals green.
8 years ago
Jonathan G Rennison 09188e30f9 Exclude virtual/template vehicles from vehicle ageing and news messages. 8 years ago
Jonathan G Rennison f80bebae7c Scope info: Log whether vehicle pointer is a virtual vehicle. 8 years ago
translators 37b6bd5702 (svn r27697) -Update from Eints:
urdu: 9 changes by siphr
spanish: 3 changes by SilverSurferZzZ
8 years ago
translators 5d5d020103 (svn r27696) -Update from Eints:
urdu: 11 changes by siphr
spanish: 6 changes by SilverSurferZzZ
russian: 10 changes by Lone_Wolf
8 years ago
translators 8a41b36cd8 (svn r27695) -Update from Eints:
spanish: 4 changes by SilverSurferZzZ
french: 26 changes by glx
8 years ago
translators 1808557b45 (svn r27694) -Update from Eints:
spanish: 4 changes by SilverSurferZzZ
8 years ago
Jonathan G Rennison cea0d42548 Merge branch 'master' into jgrpp 8 years ago
translators 01059a7f75 (svn r27693) -Update from Eints:
korean: 2 changes by telk5093
spanish: 21 changes by SilverSurferZzZ
russian: 14 changes by Lone_Wolf
8 years ago
translators 3f78d271b2 (svn r27692) -Update from Eints:
croatian: 25 changes by VoyagerOne
english (us): 2 changes by Supercheese
russian: 1 change by Lone_Wolf
latin: 25 changes by Supercheese
8 years ago
translators 7c7913c986 (svn r27691) -Update from Eints:
italian: 9 changes by lorenzodv
8 years ago
frosch 4e2ecbb5a1 (svn r27690) -Fix: Old compilers do not zero-initialise POD members when explicitly calling implicitly created default constructors. 8 years ago
frosch 1db921bedb (svn r27689) -Fix: MSVC warnings. 8 years ago
frosch 0360e61dae (svn r27688) -Fix-ish: Initialise new railtypes with the original railtype data, though strictly NewGRF could only have modified 'label' and 'alternate_labels' at the time AllocateRailType is called, which are reset anyway. 8 years ago
frosch 00b422712e (svn r27687) -Fix: RailtypeInfo::alternate_labels leaked when reloading NewGRF. (adf88) 8 years ago
Jonathan G Rennison 478ff2538e Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/english.txt
#	src/lang/korean.txt
8 years ago
frosch 4753097c3d (svn r27686) -Change: List railtype of rail tiles explicitly in the tile info window. 8 years ago
frosch f294258b18 (svn r27685) -Change: Preemptively invalidate translation changes of next commit for eints. 8 years ago
translators cf04ca5db3 (svn r27684) -Update from Eints:
italian: 1 change by lorenzodv
8 years ago
Jonathan G Rennison 58381a3ea2 Merge branch 'master' into jgrpp 8 years ago
Jonathan G Rennison 20a090b077 Show warning dialog if NewGRFs use too many string IDs.
Show when reloading/changing NewGRF config, or starting new game.
8 years ago
frosch da76191afc (svn r27683) -Change: Rearrange the autoreplace GUI for trains, and do not filter it by railtype by default. 8 years ago
kiwitreekor a30e15d683 Korean Translation Update 8 years ago
Jonathan G Rennison 8630512810 Merge branch 'master' into jgrpp 8 years ago
fonsinchen cdbb864725 (svn r27682) -Fix: Don't check if links are alive for manually routed cargo 8 years ago
fonsinchen aa26edfa48 (svn r27681) -Fix: When deleting stale links, iterate through order lists before iterating through vehicles 8 years ago
Jonathan G Rennison eae7334ac0 Lang: Korean: Adjust a string/string2 and trailing whitespace. 8 years ago
kiwitreekor dc192be09d Add files via upload 8 years ago
Jonathan G Rennison 55e57fd07d Add shift-clicking on vehicle depot button to select specific depot. 8 years ago
Jonathan G Rennison 1b5c3b4027 Merge branch 'master' into jgrpp 8 years ago
Jonathan G Rennison 1e8de54944 Merge branch 'tracerestrict-sx' into jgrpp 8 years ago
Jonathan G Rennison 15787545a0 Merge branch 'tracerestrict' into tracerestrict-sx 8 years ago
Jonathan G Rennison 78b7223272 Make tracerestrict GUI mouse-wheel scrollable. 8 years ago
Jonathan G Rennison 375dbdbfe1 Linkgraph: Allow job threads to be aborted early when clearing schedule. 8 years ago
Jonathan G Rennison d08d1cbd67 Linkgraph: Avoid attempting to merge/apply job when cleaning schedule.
This can cause crashes when switching savegame.
Move job merge/apply out of destructor into separate function.
8 years ago
Jonathan G Rennison e1a841aa05 Fix loading of signals on bridges/tunnels from SpringPP savegames.
Reg/green states were incorrect.
8 years ago
Jonathan G Rennison ddae95addb Rescale town cargo adj setting by 10x, for finer adjustment.
Use DECIMAL1 instead of an integer.
8 years ago
Jonathan G Rennison 842728bd17 Settings GUI: Add support for DECIMAL1 settings. 8 years ago
Jonathan G Rennison f5212b27e4 Add a DECIMAL1 string code, which is DECIMAL with a fixed param of 1. 8 years ago
Jonathan G Rennison fa261207ae Link graph GUI: Fix poor contrast in graph legend window cargo labels.
Select foreground colour depending on brightness of background.
8 years ago
Jonathan G Rennison 55057110a5 Linkgraph GUI: Add hover tool-tips to graph legend window. 8 years ago
Jonathan G Rennison 37a58fd11d Add setting to increase station catchment radius.
Update acceptance and refresh screen when catchment settings change.
8 years ago
translators fd7852cbdf (svn r27680) -Update from Eints:
romanian: 1 change by kneekoo
8 years ago
Jonathan G Rennison 10ae23d3b9 Merge branch 'departure-boards' into jgrpp
VehicleListIdentifier API changes.

# Conflicts:
#	src/departures.cpp
#	src/vehicle_gui.cpp
8 years ago
Jonathan G Rennison 31b2a39d02 Merge branch 'save_ext' into departure-boards
Adjust calls to GenerateVehicleSortList due to API change.
8 years ago
Jonathan G Rennison dbd99707b6 Merge branch 'master' into save_ext 8 years ago
translators 4ea93bc8ef (svn r27679) -Update from Eints:
romanian: 10 changes by kneekoo
8 years ago
translators 7e2e63094b (svn r27678) -Update from Eints:
romanian: 20 changes by kneekoo
8 years ago
frosch 9d8c04b0cc (svn r27677) -Codechange: Remove implicit VehicleListIdentifier from uint32 constructor, to make conversions more explicit. 8 years ago
frosch 616c02c42e (svn r27676) -Codechange: Rename catenary functions, so that they refer unambiguously to either RoadCatenary or RailCatenary. 8 years ago
Jonathan G Rennison 1cede8431f Linkgraph: Support running multiple jobs per spawned thread. 8 years ago
Jonathan G Rennison 84e61b690a Linkgraph: Changes to job scheduling algorithm.
This is to improve responsiveness of link graph updates, whilst
avoiding being blocked waiting for updates to complete.
Previously, large numbers of cheap jobs resulted in poor responsiveness
as it took a long time for jobs to cycle round.

Add 'linkgraph' debug category.
8 years ago
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
8 years ago
Jonathan G Rennison 92254acf8d TBTR: Savegame and API changes to support multiple sprites per vehicle. 8 years ago
Jonathan G Rennison d204062300 Merge branch 'master' into template_train_replacement 8 years ago
michi_cc 4436f96f9f (svn r27675) -Fix [FS#6502]: [OSX] Building with 10.11 or 10.12 SDKs. 8 years ago
michi_cc 221c84be66 (svn r27674) -Fix (r27673): Mingw... 8 years ago
michi_cc 36cbb54a9d (svn r27673) -Add: [Win32] Thread names for windows debuggers. 8 years ago
frosch a08df612be (svn r27672) -Doc [FS#6489]: Fix comment. (Yho) 8 years ago
frosch 77b790cd5a (svn r27671) -Codechange: Replace magic numbers in the toolbar with the already existing WID_TN_xxx. (Wolf01) 8 years ago
frosch 3f75b8bca2 (svn r27670) -Add: [FS#6471] Assign descriptive names to (GNU pthread) threads. (JGR) 8 years ago
Jonathan G Rennison de26cf78e5 Merge branch 'infrastructure_sharing' into jgrpp 8 years ago
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.
8 years ago
translators f8f2c9d3a5 (svn r27669) -Update from Eints:
thai: 11 changes by angelix
8 years ago
frosch ba566e9126 (svn r27668) -Feature: [NewGRF] Allow composing vehicles from multiple sprites. 8 years ago
frosch a37bb32fd6 (svn r27667) -Codechange: Add VehicleSpriteSeq::GetBounds and Draw. 8 years ago
frosch f36539837e (svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq. 8 years ago
frosch 8321c2d0fa (svn r27665) -Fix: When dragging crashed vehicles, also draw them as crashed at the mouse cursor. 8 years ago
frosch fe12488232 (svn r27664) -Codechange: Deduplicate code for animating effect vehicles. 8 years ago
frosch 2a1e955fee (svn r27663) -Codechange: Deduplicate code when rotating crashed vehicles. 8 years ago
frosch 3b9cc70553 (svn r27662) -Codechange: Deduplicate code using GetSingleVehicleWidth. 8 years ago
Jonathan G Rennison 13694c30cf Merge branch 'master' into jgrpp
# Conflicts:
#	src/clear_cmd.cpp
8 years ago
Jonathan G Rennison 6bac8bbd48 Merge branch 'departure-boards' into jgrpp 8 years ago
Jonathan G Rennison d226495d3b Fix main pane of departure boards window not being mouse-wheel scrollable. 8 years ago
Jonathan G Rennison bebed03c7e Merge branch 'enhanced_viewport_overlay' into jgrpp
# Conflicts:
#	src/viewport.cpp
8 years ago
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.
8 years ago
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.
8 years ago
translators 8c1bf8f16d (svn r27661) -Update from Eints:
portuguese: 1 change by Samu
8 years ago
Jonathan G Rennison 55e98d1182 Merge branch 'cargo_type_order' into jgrpp
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
8 years ago
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.
8 years ago
Jonathan G Rennison 1778fda01e Merge branch 'day_length' into jgrpp 8 years ago
Jonathan G Rennison 6288a67fe1 Fix savegame load check overwriting date tick skip counter. 8 years ago
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.
8 years ago
translators b080b86574 (svn r27660) -Update from Eints:
portuguese: 7 changes by Samu
8 years ago
translators 3ee07f37d8 (svn r27659) -Update from Eints:
portuguese: 25 changes by Samu
8 years ago
translators 169468a857 (svn r27658) -Update from Eints:
danish: 1 change by Knogle
8 years ago
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. 8 years ago
Jonathan G Rennison c83903ddb0 Merge branch 'master' into jgrpp 8 years ago
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
8 years ago
Jonathan G Rennison 675b88b391 Merge branch 'cargo_type_order' into jgrpp 8 years ago
Jonathan G Rennison 08fb60d314 Fix cargo drop-down boxes being too narrow, resulting in variable sizing. 8 years ago
Jonathan G Rennison 2dba3aff72 Add override annotations to classes in order_gui.cpp 8 years ago
Jonathan G Rennison 16ce37ad14 Show vehicle route markers when cargo load by type window focused. 8 years ago
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.
8 years ago
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.
8 years ago
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
8 years ago
Jonathan G Rennison 556594f2f0 Extend bridge signal simulation to support an unlimited no. of signals.
This is instead of the previous limit of 16, all stored in M2.
8 years ago
Jonathan G Rennison 61500b596e Fix tunnel/bridge entrance signal not being refreshed.
When a train left a tunnel or a bridge with no intermediary signals,
when setting the entrance signal to green, the display was not refreshed
with show track reservations was enabled.
8 years ago
Jonathan G Rennison 0d2e9f91bf Adjust signal on bridge/tunnel map bits, rename accessors, add docs.
Use same bit to store red/green state for entrances and exits.
No longer re-use exit bit to store red/green state of entrance.
Avoid modifying the M2 of tunnel entrances/exits.
Rename and rationalise map accessor functions.
Document bits used in landscape HTML docs.
8 years ago
frosch 740534440e (svn r27656) -Fix [FS#6511]: When removing objects of bankrupt companies the tiles may revert to canal. In that case also check the ownership of the canal. 8 years ago
Jonathan G Rennison 161f70eb4a Merge branch 'save_ext' into signal_tunnels_bridges 8 years ago
Jonathan G Rennison 8a59b960d4 Fix missing include in parent commit. 8 years ago
Jonathan G Rennison 021b72490f Mark SpringPP imports as fake extended savegame versions. 8 years ago
Jonathan G Rennison e844b82d9e Use vector instead of list for Station::loading_vehicles. 8 years ago
Jonathan G Rennison 95aad35774 Instead of list use deque in FlowRiver, vector in StationViewWindow. 8 years ago
Jonathan G Rennison a422cb6753 Use a deque instead of list for CargoPacketList and StationCargoPacketMap. 8 years ago
Jonathan G Rennison ae8e19cf9a Merge branch 'save_ext' into jgrpp 8 years ago
Jonathan G Rennison d124089d29 Add extended version tag and feature versions to output of -q. 8 years ago
Jonathan G Rennison 94d3700f79 SaveLoad: Add support for saving/loading from a std::vector<T *> 8 years ago
Jonathan G Rennison c752da3a9e SaveLoad: Add support for saving/loading from a std::deque<T *> 8 years ago
Jonathan G Rennison 27ee2da1f7 Merge branch 'cpp-11' into save_ext 8 years ago
Jonathan G Rennison 13fb737bed Add a template parameter for the inner container of MultiMap. 8 years ago
Jonathan G Rennison 0bd33eff1e Fixes use of builtins in CountBits for small and/or signed input types. 8 years ago
Jonathan G Rennison e85e302a68 Merge branch 'signal_tunnels_bridges' into jgrpp
# Conflicts:
#	src/rail_cmd.cpp
8 years ago