761463d134
Merge branch 'template_train_replacement-sx' into jgrpp
...
# Conflicts:
# src/window.cpp
8 years ago
ca6493f2e6
(svn r27626) -Codechange: Do not use the cursor sprite as PlaceObject status in the main toolbar.
8 years ago
93d5995bed
(svn r27626) -Codechange: Do not use the cursor sprite as PlaceObject status in the main toolbar.
8 years ago
f6d374ade4
Merge branch 'house_placing' into jgrpp
...
This reverts the house picking/placing patch back to v2.
This is to fix house placement/town growth desync issues introduced in v4.
# Conflicts:
# src/settings_gui.cpp
# src/settings_type.h
# src/town_gui.cpp
8 years ago
95b65163e3
Revert back to v2 of house picking/placing patch.
8 years ago
41a06e698f
Merge branch 'house_placing' into jgrpp
...
# Conflicts:
# src/settings_gui.cpp
# src/settings_type.h
# src/town_gui.cpp
8 years ago
0fd34a17a5
Update to v4 of house placing patch.
8 years ago
7673436d3a
Trace restrict: add train ownership conditional.
...
Infra sharing whitespace fix.
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
6de087786c
Import and rebase zoning patch
...
Fix some of the whitespace issues
http://www.tt-forums.net/viewtopic.php?p=888801#p888801
9 years ago
a14b836bf2
(svn r27178) -Fix [FS#5969]: Data race due to lazy initialisation of objects.
9 years ago
780e595933
(svn r27178) -Fix [FS#5969]: Data race due to lazy initialisation of objects.
9 years ago
e40c3149de
(svn r27150) -Fix (r27146): Forgot scenario toolbar.
10 years ago
64e943d32a
(svn r27150) -Fix (r27146): Forgot scenario toolbar.
10 years ago
abe22e594d
(svn r27146) -Fix: Make statusbar and chat-entry window use the same width as the toolbar. Otherwise they lack a size definition.
10 years ago
e113f5e4a1
(svn r27146) -Fix: Make statusbar and chat-entry window use the same width as the toolbar. Otherwise they lack a size definition.
10 years ago
4132e4e7e3
(svn r26986) -Change: Rename 'Advanced Settings' to just 'Settings'.
10 years ago
33f4f0b464
(svn r26986) -Change: Rename 'Advanced Settings' to just 'Settings'.
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
10 years ago
0463dbdc9e
(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
10 years ago
d72905280f
(svn r26314) -Fix [FS#5899]: The giant-screenshot confirmation window only triggered for rediculously big screenshots, for ludicrously big ones.
11 years ago
167f232623
(svn r26314) -Fix [FS#5899]: The giant-screenshot confirmation window only triggered for rediculously big screenshots, for ludicrously big ones.
11 years ago
59ab35bd4c
(svn r26217) -Change: blitter autoselection based on full animation state, so the non-animated optimizations can actually be used in an easy manner (based on patch by MJP)
11 years ago
f480c5a623
(svn r26217) -Change: blitter autoselection based on full animation state, so the non-animated optimizations can actually be used in an easy manner (based on patch by MJP)
11 years ago
201b3d8aa2
(svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns
11 years ago
83eeba28b7
(svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns
11 years ago
75cff48a5d
(svn r25867) -Fix [FS#5764]: Shift dates on link graphs when using scenario editor date tool.
11 years ago
5ab204c8a1
(svn r25867) -Fix [FS#5764]: Shift dates on link graphs when using scenario editor date tool.
11 years ago
028c2d88d6
(svn r25772) -Add: Additional layered main toolbar arrangement
11 years ago
a8c9322729
(svn r25772) -Add: Additional layered main toolbar arrangement
11 years ago
01af09b830
(svn r25761) -Change: Disable story/goal buttons when there is no content to show instead of when there is zero companies
11 years ago
4e74a4c5cc
(svn r25761) -Change: Disable story/goal buttons when there is no content to show instead of when there is zero companies
11 years ago
303aa2f473
(svn r25412) -Codechange: Make use of Window::OnHotkey
11 years ago
5cb174c6b8
(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
1b8b1f3f6c
(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
d9e9710cb3
(svn r25408) -Codechange: Simplify hotkeys by removing unused stuff.
11 years ago
189609f8a0
(svn r25383) -Fix (r25376): Remove now redundant menu entries for story book and goals
11 years ago
be8645e137
(svn r25383) -Fix (r25376): Remove now redundant menu entries for story book and goals
11 years ago
34cacb7c81
(svn r25376) -Feature: Allow access to goal list and story book of other companies than your own
11 years ago
a724a9924b
(svn r25376) -Feature: Allow access to goal list and story book of other companies than your own
11 years ago
92f25b4f8a
(svn r25372) -Add: Allow opening a goal list window specific to a company
11 years ago
eaede14b8f
(svn r25372) -Add: Allow opening a goal list window specific to a company
11 years ago
88e4221d5a
(svn r25369) -Add: allow opening a story window specific to a company
11 years ago
8980cb427d
(svn r25369) -Add: allow opening a story window specific to a company
11 years ago
7a5cedf078
(svn r25344) -Feature: GUI for viewing story pages
11 years ago
a2d84868e7
(svn r25344) -Feature: GUI for viewing story pages
11 years ago
c60551a9d3
(svn r25335) -Change: Revisit the map menu in scenario editor: Remove linkgraph legend, add industry list.
11 years ago
3ff6d19238
(svn r25335) -Change: Revisit the map menu in scenario editor: Remove linkgraph legend, add industry list.
11 years ago
24498a5912
(svn r25304) -Change: Move the GS goals window from the subsidies to the league menu.
11 years ago
2547523c0f
(svn r25304) -Change: Move the GS goals window from the subsidies to the league menu.
11 years ago
16feb5c4e9
(svn r25290) -Add: Assign string names to notable windows.
11 years ago
8157a8afd8
(svn r25290) -Add: Assign string names to notable windows.
11 years ago
aecb5c30ed
(svn r25289) -Codechange: Store width of statusbar and main toolbar directly in the WindowDesc.
11 years ago
8c4714ad90
(svn r25289) -Codechange: Store width of statusbar and main toolbar directly in the WindowDesc.
11 years ago
25adefca23
(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.
11 years ago
56e4a8c4d6
(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.
11 years ago
71ce89c1d0
(svn r25263) -Add: legend for linkgraph overlay (fonsinchen)
11 years ago
50ae992b47
(svn r25263) -Add: legend for linkgraph overlay (fonsinchen)
11 years ago
336a93a9d8
(svn r24846) -Add: Advanced settings to disable certain sound effects.
12 years ago
3ce8d2ce70
(svn r24846) -Add: Advanced settings to disable certain sound effects.
12 years ago
0f444197c3
(svn r24842) -Remove: News settings window.
12 years ago
647ee0de64
(svn r24842) -Remove: News settings window.
12 years ago
44b1a558d0
(svn r24806) -Feature [FS#3148]: Ask for confirmation before creating giant screenshots.
12 years ago
04a24969ea
(svn r24806) -Feature [FS#3148]: Ask for confirmation before creating giant screenshots.
12 years ago
5d80d59aa6
(svn r24791) -Remove: Difficulty settings window.
12 years ago
ff6880f9dd
(svn r24791) -Remove: Difficulty settings window.
12 years ago
9f8184e71e
(svn r24763) -Feature: Add industry type and cargo dropdown selection for easier navigating in the industry chain window.
12 years ago
fb892f4b20
(svn r24763) -Feature: Add industry type and cargo dropdown selection for easier navigating in the industry chain window.
12 years ago
3b06409153
(svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default.
12 years ago
03736af2ae
(svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default.
12 years ago
484dab34c9
(svn r24065) -Feature-ish [FS#5101]: debug option for showing the redrawn dirty blocks/rectangles
12 years ago
927734e6ce
(svn r24065) -Feature-ish [FS#5101]: debug option for showing the redrawn dirty blocks/rectangles
12 years ago
fae5d26175
(svn r23985) -Fix [FS#5074]: inconsistent quit/abandon/exit game/scenario/editor strings
13 years ago
e3c665a3cb
(svn r23985) -Fix [FS#5074]: inconsistent quit/abandon/exit game/scenario/editor strings
13 years ago
9fff11b183
(svn r23867) -Fix [FS#5020]: make the colour of the dropdown items for opening the vehicle list for which the company has no vehicles looking less horrid
13 years ago
2f49c9af85
(svn r23867) -Fix [FS#5020]: make the colour of the dropdown items for opening the vehicle list for which the company has no vehicles looking less horrid
13 years ago
d5eeab43b7
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
6d6be50ae0
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
b49906fa9d
(svn r23696) -Fix (r23695): 5 <-> 6... today is not my day
13 years ago
167813aded
(svn r23696) -Fix (r23695): 5 <-> 6... today is not my day
13 years ago
7dc6e5b5fc
(svn r23695) -Fix/Feature [FS#4916]: make a distinction between fully zoomed in and default zoomed in screenshots
13 years ago
8b223f0274
(svn r23695) -Fix/Feature [FS#4916]: make a distinction between fully zoomed in and default zoomed in screenshots
13 years ago
ccf9b01f5d
(svn r23630) -Add: a Goal GUI to show your current goals
13 years ago
3ada3b9cc5
(svn r23630) -Add: a Goal GUI to show your current goals
13 years ago
f5478b62d1
(svn r23607) -Add: wire GameScript in all the GUIs
13 years ago
5718c2e2e3
(svn r23607) -Add: wire GameScript in all the GUIs
13 years ago
7b9891f086
(svn r23579) -Fix (r23525): Most up/down arrows stopped working.
13 years ago
4e4a87bd3c
(svn r23579) -Fix (r23525): Most up/down arrows stopped working.
13 years ago
f3f88ffcb3
(svn r23548) -Codechange: unify and document toolbar widgets
13 years ago
1470e41fe4
(svn r23548) -Codechange: unify and document toolbar widgets
13 years ago
49e88dcbf0
(svn r23528) -Codechange: move widget enums to widgets/NNN_type.h
13 years ago
2aa774e831
(svn r23528) -Codechange: move widget enums to widgets/NNN_type.h
13 years ago
da63ce43fa
(svn r23525) -Codechange: make Window::flags4 WindowFlags instead of uint16, with only values known in WindowFlags (and move out 2 timers to their own variable)
...
-Codechange: rename Window::flags4 to Window::flags
-Codechange: move some non-inline functions from .hpp to .cpp
13 years ago
df0afdf0dc
(svn r23525) -Codechange: make Window::flags4 WindowFlags instead of uint16, with only values known in WindowFlags (and move out 2 timers to their own variable)
...
-Codechange: rename Window::flags4 to Window::flags
-Codechange: move some non-inline functions from .hpp to .cpp
13 years ago
c44b47c186
(svn r23019) -Codechange: Support resized company colour icon in dropdown lists that use it.
13 years ago
e11c39b60b
(svn r23019) -Codechange: Support resized company colour icon in dropdown lists that use it.
13 years ago
Jonathan G Rennison
frosch
patch-import
rubidium
fonsinchen
zuu
alberth
truebrain
peter1138