dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,117 Commits 1 Branch 0 Tags
24a85d1c99c308b76cf3aad22b9aca6657bf1eb3
Commit Graph

242 Commits

Author SHA1 Message Date
Jonathan G Rennison
41a06e698f Merge branch 'house_placing' into jgrpp 
# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/town_gui.cpp
 2016-04-08 20:15:08 +01:00
patch-import
0fd34a17a5 Update to v4 of house placing patch. 2016-04-08 19:42:10 +01:00
Jonathan G Rennison
7673436d3a Trace restrict: add train ownership conditional. 
Infra sharing whitespace fix.
 2015-12-15 20:30:20 +00:00
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
 2015-08-05 21:54:11 +01:00
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
patch-import
6de087786c Import and rebase zoning patch 
Fix some of the whitespace issues

http://www.tt-forums.net/viewtopic.php?p=888801#p888801
 2015-08-02 13:17:42 +01:00
frosch
a14b836bf2 (svn r27178) -Fix [FS#5969]: Data race due to lazy initialisation of objects. 2015-03-07 18:27:01 +00:00
frosch
e40c3149de (svn r27150) -Fix (r27146): Forgot scenario toolbar. 2015-02-14 21:22:47 +00:00
frosch
abe22e594d (svn r27146) -Fix: Make statusbar and chat-entry window use the same width as the toolbar. Otherwise they lack a size definition. 2015-02-13 21:13:45 +00:00
frosch
4132e4e7e3 (svn r26986) -Change: Rename 'Advanced Settings' to just 'Settings'. 2014-10-09 21:16:29 +00:00
rubidium
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 2014-04-23 20:13:33 +00:00
frosch
d72905280f (svn r26314) -Fix [FS#5899]: The giant-screenshot confirmation window only triggered for rediculously big screenshots, for ludicrously big ones. 2014-02-06 22:24:02 +00:00
rubidium
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) 2014-01-03 08:51:49 +00:00
rubidium
201b3d8aa2 (svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns 2013-11-24 14:46:26 +00:00
fonsinchen
75cff48a5d (svn r25867) -Fix [FS#5764]: Shift dates on link graphs when using scenario editor date tool. 2013-10-15 17:32:31 +00:00
zuu
028c2d88d6 (svn r25772) -Add: Additional layered main toolbar arrangement 2013-09-14 12:58:58 +00:00
zuu
01af09b830 (svn r25761) -Change: Disable story/goal buttons when there is no content to show instead of when there is zero companies 2013-09-13 12:45:25 +00:00
frosch
303aa2f473 (svn r25412) -Codechange: Make use of Window::OnHotkey 2013-06-15 15:30:44 +00:00
frosch
1565bb32a0 (svn r25410) -Codechange: Put all hotkeys of a window into a static HotkeyList member. 2013-06-15 15:28:09 +00:00
frosch
55154f91b6 (svn r25408) -Codechange: Simplify hotkeys by removing unused stuff. 2013-06-15 15:27:33 +00:00
zuu
189609f8a0 (svn r25383) -Fix (r25376): Remove now redundant menu entries for story book and goals 2013-06-09 15:36:31 +00:00
zuu
34cacb7c81 (svn r25376) -Feature: Allow access to goal list and story book of other companies than your own 2013-06-09 13:37:04 +00:00
zuu
92f25b4f8a (svn r25372) -Add: Allow opening a goal list window specific to a company 2013-06-09 13:23:03 +00:00
zuu
88e4221d5a (svn r25369) -Add: allow opening a story window specific to a company 2013-06-09 13:13:47 +00:00
zuu
7a5cedf078 (svn r25344) -Feature: GUI for viewing story pages 2013-06-09 12:48:27 +00:00
frosch
c60551a9d3 (svn r25335) -Change: Revisit the map menu in scenario editor: Remove linkgraph legend, add industry list. 2013-06-08 16:54:19 +00:00
frosch
24498a5912 (svn r25304) -Change: Move the GS goals window from the subsidies to the league menu. 2013-05-29 18:49:58 +00:00
frosch
16feb5c4e9 (svn r25290) -Add: Assign string names to notable windows. 2013-05-26 19:25:01 +00:00
frosch
aecb5c30ed (svn r25289) -Codechange: Store width of statusbar and main toolbar directly in the WindowDesc. 2013-05-26 19:24:37 +00:00
frosch
25adefca23 (svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction. 2013-05-26 19:23:42 +00:00
rubidium
71ce89c1d0 (svn r25263) -Add: legend for linkgraph overlay (fonsinchen) 2013-05-19 14:43:23 +00:00
frosch
336a93a9d8 (svn r24846) -Add: Advanced settings to disable certain sound effects. 2012-12-23 21:09:09 +00:00
frosch
0f444197c3 (svn r24842) -Remove: News settings window. 2012-12-23 21:06:37 +00:00
frosch
44b1a558d0 (svn r24806) -Feature [FS#3148]: Ask for confirmation before creating giant screenshots. 2012-12-09 16:53:21 +00:00
frosch
5d80d59aa6 (svn r24791) -Remove: Difficulty settings window. 2012-12-05 19:37:15 +00:00
alberth
9f8184e71e (svn r24763) -Feature: Add industry type and cargo dropdown selection for easier navigating in the industry chain window. 2012-11-25 15:24:02 +00:00
frosch
3b06409153 (svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default. 2012-11-11 16:10:43 +00:00
rubidium
484dab34c9 (svn r24065) -Feature-ish [FS#5101]: debug option for showing the redrawn dirty blocks/rectangles 2012-03-25 19:06:59 +00:00
rubidium
fae5d26175 (svn r23985) -Fix [FS#5074]: inconsistent quit/abandon/exit game/scenario/editor strings 2012-02-25 13:58:06 +00:00
rubidium
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 2012-01-28 20:10:49 +00:00
rubidium
d5eeab43b7 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files 2012-01-03 21:32:51 +00:00
rubidium
b49906fa9d (svn r23696) -Fix (r23695): 5 <-> 6... today is not my day 2011-12-31 15:02:14 +00:00
rubidium
7dc6e5b5fc (svn r23695) -Fix/Feature [FS#4916]: make a distinction between fully zoomed in and default zoomed in screenshots 2011-12-31 14:56:39 +00:00
truebrain
ccf9b01f5d (svn r23630) -Add: a Goal GUI to show your current goals 2011-12-19 21:03:17 +00:00
truebrain
f5478b62d1 (svn r23607) -Add: wire GameScript in all the GUIs 2011-12-19 20:56:06 +00:00
frosch
7b9891f086 (svn r23579) -Fix (r23525): Most up/down arrows stopped working. 2011-12-17 20:52:07 +00:00
rubidium
f3f88ffcb3 (svn r23548) -Codechange: unify and document toolbar widgets 2011-12-16 18:23:35 +00:00
truebrain
49e88dcbf0 (svn r23528) -Codechange: move widget enums to widgets/NNN_type.h 2011-12-15 22:22:55 +00:00
truebrain
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
 2011-12-15 19:54:23 +00:00