3da991bf9b
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/rail_gui.cpp
9 years ago
34b68c7a82
(svn r27547) -Fix: Use a more appropiate sound effect for convert-rail. (andythenorth)
9 years ago
54b8eb9b4c
Merge branch 'polyline_track_tool' into jgrpp
...
# Conflicts:
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/viewport.cpp
# src/viewport_func.h
9 years ago
01cf154f51
Import polyline rail tool patch v10b
...
http://www.tt-forums.net/viewtopic.php?f=33&t=57080
9 years ago
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.
9 years ago
8d19727c93
Merge branch 'save_ext' into jgrpp
...
Conflicts:
src/pathfinder/follow_track.hpp
9 years ago
ade25fff71
(svn r27427) -Fix: Use the NewGRF railtype sorting order in the infrastructure window.
9 years ago
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
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
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
2bcbeea011
Merge branch 'progsig-sx' into jgrpp
...
Conflicts:
src/command.cpp
src/command_type.h
src/lang/english.txt
src/rail_cmd.cpp
src/rail_gui.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/saveload/saveload.cpp
src/widgets/rail_widget.h
src/window_type.h
9 years ago
fc0efe599e
Port of the programmable signals patch to recent trunk
...
Also add some additional changes from the SpringPP patch,
and make some other minor changes/fixes.
9 years ago
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
6cb930168f
(svn r27163) -Fix [FS#6204]: Toolbars were not invalidated when changing max-vehicles settings. (adf88)
10 years ago
8767a11d60
(svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad().
10 years ago
4f63bbedc1
(svn r26906) -Codechange: Scale depot and station picker buttons by GUI zoom level.
10 years ago
7b3ead329b
(svn r26640) -Cleanup: Remove some pointless STR_JUST_STRING detours.
10 years ago
2be4215f43
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
11 years ago
5c3b3f84d6
(svn r26422) -Fix [FS#5946]: Some road constructions used the rail sound effect. Rename the enum items to properly reflect their purpose.
11 years ago
504bd2a913
(svn r26375) -Fix [FS#5929]: Station sizes > 8 were always allowed. (adf88)
11 years ago
c1cbc05ca7
(svn r26088) -Fix (r26086): Windows compilation
11 years ago
201b3d8aa2
(svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns
11 years ago
34ae6d4b39
(svn r25972) -Fix [FS#5665]: rail laying sounds of others could be heard in multiplayer (adf88)
11 years ago
ee97c8cfdd
(svn r25929) -Fix [FS#5733]: Position signal sprites size-aware in the signal GUI, that is: Center sprites horizontally, and align the vertical reference point at some baseline which centers the tallest sprite.
11 years ago
3c9cfb1678
(svn r25928) -Fix [FS#5733]: Reserve enough space for two digits of signal density. (adf88)
11 years ago
3d34b5c5a2
(svn r25927) -Fix [FS#5733]: Consider size of signal sprites for sizing the signal GUI. (based on patch by adf88)
11 years ago
ac08e89a32
(svn r25854) -Change: Display the cost to upgrade a bridge at the end of bridge that was clicked and not the other end, which could be outside of the screen in some cases (cirdan, LordAro)
11 years ago
538159cb1d
(svn r25537) -Codechange: Optionally make WWT_MATRIX compute the number of rows and columns from the resize step size.
11 years ago
bc4423300d
(svn r25535) -Fix [FS#5584]: Initialise scrollbars before FinishInitNested, so their capacity is set via OnResize.
11 years ago
ac73a5fea6
(svn r25532) -Fix: Do not make the minimal size of matrix or panel widgets depend on their number of rows, since that changes when resizing the window.
11 years ago
f6d27acb51
(svn r25531) -Codechange: Use separate function to set data of WWT_MATRIX widgets.
11 years ago
4a8f47b9a5
(svn r25464) -Fix: Hide default size button in non-newstation rail-station picker since it is not resizeable anyway.
11 years ago
173aed1687
(svn r25414) -Codechange: Move handling of global hotkeys to HotkeyList.
11 years ago
303aa2f473
(svn r25412) -Codechange: Make use of Window::OnHotkey
11 years ago
1565bb32a0
(svn r25410) -Codechange: Put all hotkeys of a window into a static HotkeyList member.
11 years ago
55154f91b6
(svn r25408) -Codechange: Simplify hotkeys by removing unused stuff.
11 years ago
fdd94f7601
(svn r25401) -Fix-ish: Add missing includes with prototypes to functions declared in the cpp file.
11 years ago
01dc8ee620
(svn r25395) -Fix [FS#5596]: The size of station construction windows could oscillate when resizing the window moved the mouse into the window.
11 years ago
13badddd75
(svn r25294) -Feature: Add another button to window title bars to resize the window to its default size.
11 years ago
16feb5c4e9
(svn r25290) -Add: Assign string names to notable windows.
11 years ago
25adefca23
(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.
11 years ago
910dac6311
(svn r25064) -Fix [FS#5472]: Make sizes of the station preview identical list and direction selection identical in the station build window
12 years ago
f00d9976f9
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
336a93a9d8
(svn r24846) -Add: Advanced settings to disable certain sound effects.
12 years ago
3b06409153
(svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default.
12 years ago
facad68514
(svn r24507) -Fix [FS#5285]: The mousewheel did not work in the build waypoint window. (sbr)
12 years ago
bcac892dd7
(svn r24367) -Feature: [NewGRF] Customisable signals for rail types.
12 years ago
97608f0814
(svn r24167) -Codechange: Rename NewGRFClass::GetCount() to NewGRFClass::GetClassCount()
13 years ago
3d7ac6af1a
(svn r24166) -Codechange: Turn NewGRFClass::Get(Tid, uint) and GetCount(Tid) into non-static members GetSpec(uint) and GetSpecCount().
13 years ago
d42bd940b2
(svn r24162) -Codechange: Remove NewGRFClass::GetName() and SetName() in favour of using Get() and direct member access (which is needed anyway for GRF string resolving).
13 years ago
Jonathan G Rennison
frosch
patch-import
keldorkatarn
peter1138
rubidium
zuu
planetmaker
michi_cc